Only show user-presets in favorite sidebar

[ardour.git] / gtk2_ardour / editor_mixer.cc

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index cfd832385f3656763305689b1e0e384a872a0d0b..28f8f60fa783144264b368e514e92cc665df3128 100644 (file)
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -30,6 +30,8 @@
 
 #include "ardour/rc_configuration.h"
 
+#include "control_protocol/control_protocol.h"
+
 #include "actions.h"
 #include "ardour_ui.h"
 #include "audio_time_axis.h"
@@ -37,13 +39,15 @@
 #include "editor.h"
 #include "editor_route_groups.h"
 #include "editor_regions.h"
+#include "enums_convert.h"
 #include "gui_thread.h"
 #include "midi_time_axis.h"
 #include "mixer_strip.h"
 #include "mixer_ui.h"
 #include "selection.h"
+#include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtkmm2ext;
@@ -77,11 +81,16 @@ Editor::show_editor_mixer (bool yn)
        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();
                }
@@ -137,7 +146,7 @@ Editor::show_editor_mixer (bool yn)
 
                if (current_mixer_strip && current_mixer_strip->get_parent() == 0) {
                        global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK );
-                       global_hpacker.reorder_child (*current_mixer_strip, 0);
+                       global_hpacker.reorder_child (*current_mixer_strip, 0);
                        current_mixer_strip->show ();
                }
 
@@ -155,13 +164,13 @@ Editor::show_editor_mixer (bool yn)
                }
        }
 
-#ifdef GTKOSX
+#ifdef __APPLE__
        /* XXX gtk problem here */
        ensure_all_elements_drawn();
 #endif
 }
 
-#ifdef GTKOSX
+#ifdef __APPLE__
 void
 Editor::ensure_all_elements_drawn ()
 {
@@ -173,16 +182,15 @@ 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);
+
 }
 
 void
@@ -192,49 +200,45 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
                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
 
-       boost::shared_ptr<ARDOUR::Route> route;
+       boost::shared_ptr<ARDOUR::Stripable> stripable;
        AutomationTimeAxisView* atv;
 
        if ((atv = dynamic_cast<AutomationTimeAxisView*>(&view)) != 0) {
-
                AudioTimeAxisView *parent = dynamic_cast<AudioTimeAxisView*>(view.get_parent());
-
                if (parent) {
-                       route = parent->route ();
+                       stripable = parent->stripable ();
                }
-
        } else {
+               StripableTimeAxisView* stav = dynamic_cast<StripableTimeAxisView*> (&view);
+               if (stav) {
+                       stripable = stav->stripable();
+               }
+       }
 
-               AudioTimeAxisView* at = dynamic_cast<AudioTimeAxisView*> (&view);
+       /* Typically this is set by changing the TAV selection but if for any
+        * reason we decide to show a different strip for some reason, make
+        * sure that control surfaces can find it.
+        */
+       ARDOUR::ControlProtocol::set_first_selected_stripable (stripable);
 
-               if (at) {
-                       route = at->route();
-               } else {
-                       MidiTimeAxisView* mt = dynamic_cast<MidiTimeAxisView*> (&view);
-                       if (mt) {
-                               route = mt->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 ();
+       }
+
+       boost::shared_ptr<ARDOUR::Route> route = boost::dynamic_pointer_cast<ARDOUR::Route> (stripable);
        if (current_mixer_strip->route() == route) {
                return;
        }
@@ -259,48 +263,16 @@ void
 Editor::maybe_add_mixer_strip_width (XMLNode& node)
 {
        if (current_mixer_strip) {
-               node.add_property ("mixer-width", enum_2_string (editor_mixer_strip_width));
+               node.set_property ("mixer-width", editor_mixer_strip_width);
        }
 }
 
 void
 Editor::mixer_strip_width_changed ()
 {
-#ifdef GTKOSX
+#ifdef __APPLE__
        ensure_all_elements_drawn ();
 #endif
 
        editor_mixer_strip_width = current_mixer_strip->get_width_enum ();
 }
-
-void
-Editor::track_mixer_selection ()
-{
-       Mixer_UI::instance()->selection().RoutesChanged.connect (sigc::mem_fun (*this, &Editor::follow_mixer_selection));
-}
-
-void
-Editor::follow_mixer_selection ()
-{
-       if (!ARDOUR::Config->get_link_editor_and_mixer_selection() || _following_mixer_selection) {
-               return;
-       }
-
-       _following_mixer_selection = true;
-       selection->block_tracks_changed (true);
-
-       RouteUISelection& s (Mixer_UI::instance()->selection().routes);
-
-       selection->clear_tracks ();
-
-       for (RouteUISelection::iterator i = s.begin(); i != s.end(); ++i) {
-               TimeAxisView* tav = get_route_view_by_route_id ((*i)->route()->id());
-               if (tav) {
-                       selection->add (tav);
-               }
-       }
-
-       _following_mixer_selection = false;
-       selection->block_tracks_changed (false);
-       selection->TracksChanged (); /* EMIT SIGNAL */
-}