provide mixer-specific bindings for Alt-(up|down) to match editor

[ardour.git] / gtk2_ardour / mixer_ui.cc

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 359feb360c1b4a2e3222e84ad97a989f299be0f2..6f11e59900beeead23a65ccb3f4760125cc6db51 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -375,6 +375,16 @@ Mixer_UI::~Mixer_UI ()
        delete track_menu;
 }
 
+struct MixerStripSorter {
+       bool operator() (const MixerStrip* ms_a, const MixerStrip* ms_b)
+       {
+               boost::shared_ptr<ARDOUR::Stripable> const& a = ms_a->stripable ();
+               boost::shared_ptr<ARDOUR::Stripable> const& b = ms_b->stripable ();
+               return ARDOUR::Stripable::Sorter(true)(a, b);
+       }
+};
+
+
 void
 Mixer_UI::escape ()
 {
@@ -640,16 +650,66 @@ Mixer_UI::deselect_all_strip_processors ()
 }
 
 void
-Mixer_UI::select_all_tracks ()
+Mixer_UI::select_none ()
 {
-       PublicEditor::instance().select_all_tracks ();
+       _selection.clear_routes();
+       deselect_all_strip_processors();
+}
+
+ void
+Mixer_UI::select_next_strip ()
+{
+       deselect_all_strip_processors();
+       strips.sort (MixerStripSorter());
+
+       if (_selection.empty()) {
+               _selection.set (strips.front());
+               return;
+       }
+
+       bool select_me = false;
+
+       for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
+
+               if (select_me) {
+                       _selection.set (*i);
+                       return;
+               }
+
+               if ((*i)->selected()) {
+                       select_me = true;
+               }
+       }
+
+       _selection.set (strips.front());
 }
 
 void
-Mixer_UI::select_none ()
+Mixer_UI::select_prev_strip ()
 {
-       _selection.clear_routes();
        deselect_all_strip_processors();
+       strips.sort (MixerStripSorter());
+
+       if (_selection.empty()) {
+               _selection.set (strips.back());
+               return;
+       }
+
+       bool select_me = false;
+
+       for (list<MixerStrip*>::reverse_iterator i = strips.rbegin(); i != strips.rend(); ++i) {
+
+               if (select_me) {
+                       _selection.set (*i);
+                       return;
+               }
+
+               if ((*i)->selected()) {
+                       select_me = true;
+               }
+       }
+
+       _selection.set (strips.back());
 }
 
 void
@@ -912,15 +972,6 @@ Mixer_UI::axis_view_by_control (boost::shared_ptr<AutomationControl> c) const
        return 0;
 }
 
-struct MixerStripSorter {
-       bool operator() (const MixerStrip* ms_a, const MixerStrip* ms_b)
-       {
-               boost::shared_ptr<ARDOUR::Stripable> const& a = ms_a->stripable ();
-               boost::shared_ptr<ARDOUR::Stripable> const& b = ms_b->stripable ();
-               return ARDOUR::Stripable::Sorter(true)(a, b);
-       }
-};
-
 bool
 Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
 {
@@ -3082,7 +3133,9 @@ Mixer_UI::register_actions ()
        myactions.register_action (group, "toggle-processors", _("Toggle Selected Processors"), sigc::mem_fun (*this, &Mixer_UI::toggle_processors));
        myactions.register_action (group, "ab-plugins", _("Toggle Selected Plugins"), sigc::mem_fun (*this, &Mixer_UI::ab_plugins));
        myactions.register_action (group, "select-none", _("Deselect all strips and processors"), sigc::mem_fun (*this, &Mixer_UI::select_none));
-       myactions.register_action (group, "select-all-tracks", _("Select All Tracks"), sigc::mem_fun (*this, &Mixer_UI::select_all_tracks));
+
+       myactions.register_action (group, "select-next-stripable", _("Select Next Mixer Strip"), sigc::mem_fun (*this, &Mixer_UI::select_next_strip));
+       myactions.register_action (group, "select-prev-stripable", _("Scroll Previous Mixer Strip"), sigc::mem_fun (*this, &Mixer_UI::select_prev_strip));
 
        myactions.register_action (group, "scroll-left", _("Scroll Mixer Window to the left"), sigc::mem_fun (*this, &Mixer_UI::scroll_left));
        myactions.register_action (group, "scroll-right", _("Scroll Mixer Window to the right"), sigc::mem_fun (*this, &Mixer_UI::scroll_right));