packaging tweaks for OS X

[ardour.git] / gtk2_ardour / editor_mixer.cc

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index ae045d7a45fbcf5648acadea81b82ff5e7983ca2..12b5ff3f305b7c2a1e02d2fb9993e2d7a635c5f9 100644 (file)
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -27,17 +27,19 @@
 
 #include "pbd/enumwriter.h"
 
+#include "ardour/rc_configuration.h"
+
 #include "actions.h"
 #include "ardour_ui.h"
 #include "audio_time_axis.h"
 #include "automation_time_axis.h"
 #include "editor.h"
-#include "editor_routes.h"
 #include "editor_route_groups.h"
 #include "editor_regions.h"
 #include "gui_thread.h"
 #include "midi_time_axis.h"
 #include "mixer_strip.h"
+#include "mixer_ui.h"
 #include "selection.h"
 
 #include "i18n.h"
@@ -97,7 +99,7 @@ Editor::show_editor_mixer (bool yn)
                        }
 
                } else {
-                       sort_track_selection ();
+                       sort_track_selection (selection->tracks);
 
                        for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
                                RouteTimeAxisView* atv;
@@ -191,7 +193,7 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 
        boost::shared_ptr<ARDOUR::Route> route;
        AutomationTimeAxisView* atv;
-        
+
        if ((atv = dynamic_cast<AutomationTimeAxisView*>(&view)) != 0) {
 
                AudioTimeAxisView *parent = dynamic_cast<AudioTimeAxisView*>(view.get_parent());
@@ -213,7 +215,7 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
                        }
                }
        }
-                
+
        if (current_mixer_strip->route() == route) {
                return;
        }
@@ -251,3 +253,35 @@ Editor::mixer_strip_width_changed ()
 
        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 */
+}