#include "mixer_strip.h"
#include "mixer_ui.h"
#include "selection.h"
+#include "ui_config.h"
#include "i18n.h"
show_editor_mixer_when_tracks_arrive = false;
if (yn) {
- Glib::RefPtr<Gdk::Window> win = get_window ();
+ Gtk::Window* toplevel = current_toplevel();
+ Glib::RefPtr<Gdk::Window> win;
Glib::RefPtr<Gdk::Screen> screen;
-
+
+ if (toplevel) {
+ win = toplevel->get_window();
+ }
+
if (win) {
- screen = win->get_screen();
+ screen = win->get_screen();
} else {
screen = Gdk::Screen::get_default();
}
}
}
-#ifdef GTKOSX
+#ifdef __APPLE__
/* XXX gtk problem here */
ensure_all_elements_drawn();
#endif
}
-#ifdef GTKOSX
+#ifdef __APPLE__
void
Editor::ensure_all_elements_drawn ()
{
void
Editor::create_editor_mixer ()
{
- current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
- _session,
- false);
+ current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(), _session, false);
current_mixer_strip->Hiding.connect (sigc::mem_fun(*this, &Editor::current_mixer_strip_hidden));
current_mixer_strip->WidthChanged.connect (sigc::mem_fun (*this, &Editor::mixer_strip_width_changed));
-#ifdef GTKOSX
+#ifdef __APPLE__
current_mixer_strip->WidthChanged.connect (sigc::mem_fun(*this, &Editor::ensure_all_elements_drawn));
#endif
current_mixer_strip->set_embedded (true);
-
- current_mixer_strip->signal_enter_notify_event().connect (sigc::mem_fun(*this, &Editor::mixer_strip_enter_event ));
- current_mixer_strip->signal_leave_notify_event().connect (sigc::mem_fun(*this, &Editor::mixer_strip_leave_event ));
-
-}
-bool
-Editor::mixer_strip_enter_event (GdkEventCrossing *ev)
-{
- current_mixer_strip->set_selected(true);
- return false;
-}
-
-bool
-Editor::mixer_strip_leave_event (GdkEventCrossing *ev)
-{
- //if we have moved outside our strip, but not into a child view, then deselect ourselves
- if ( !(ev->detail == GDK_NOTIFY_INFERIOR) ) {
- current_mixer_strip->set_selected(false);
- }
-
- return false;
}
void
return;
}
- Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer"));
-
- if (act) {
- Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(act);
- if (!tact || !tact->get_active()) {
- /* not showing mixer strip presently */
- return;
- }
- }
-
- if (current_mixer_strip == 0) {
- create_editor_mixer ();
- }
-
-
// if this is an automation track, then we shold the mixer strip should
// show the parent
}
}
+ _session->set_editor_mixer (route);
+
+ Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer"));
+
+ if (act) {
+ Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(act);
+ if (!tact || !tact->get_active()) {
+ /* not showing mixer strip presently */
+ return;
+ }
+ }
+
+ if (current_mixer_strip == 0) {
+ create_editor_mixer ();
+ }
+
if (current_mixer_strip->route() == route) {
return;
}
void
Editor::mixer_strip_width_changed ()
{
-#ifdef GTKOSX
+#ifdef __APPLE__
ensure_all_elements_drawn ();
#endif
void
Editor::follow_mixer_selection ()
{
- if (!ARDOUR::Config->get_link_editor_and_mixer_selection() || _following_mixer_selection) {
+ if (_following_mixer_selection) {
return;
}