more waveform drawing/coloring changes

[ardour.git] / gtk2_ardour / mixer_ui.cc

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 1babbca55696edb5542810939dd5f411b4ace2b9..e3a97daa6f98431e465a29b1f0a192b24536504f 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -30,7 +30,7 @@
 #include "pbd/convert.h"
 #include "pbd/unwind.h"
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
@@ -38,6 +38,7 @@
 #include <gtkmm2ext/window_title.h>
 
 #include "ardour/debug.h"
+#include "ardour/midi_track.h"
 #include "ardour/plugin_manager.h"
 #include "ardour/route_group.h"
 #include "ardour/session.h"
@@ -51,6 +52,7 @@
 #include "ardour_ui.h"
 #include "prompter.h"
 #include "utils.h"
+#include "route_sorter.h"
 #include "actions.h"
 #include "gui_thread.h"
 #include "mixer_group_tabs.h"
@@ -81,6 +83,7 @@ Mixer_UI::instance ()
 
 Mixer_UI::Mixer_UI ()
        : Window (Gtk::WINDOW_TOPLEVEL)
+       , VisibilityTracker (*((Gtk::Window*) this))
        , _visible (false)
        , no_track_list_redisplay (false)
        , in_group_row_change (false)
@@ -95,6 +98,9 @@ Mixer_UI::Mixer_UI ()
 
        Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::sync_treeview_from_order_keys, this, _1), gui_context());
 
+       scroller.set_can_default (true);
+       set_default (scroller);
+
        scroller_base.set_flags (Gtk::CAN_FOCUS);
        scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
        scroller_base.set_name ("MixerWindow");
@@ -121,7 +127,7 @@ Mixer_UI::Mixer_UI ()
        group_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
        group_display.get_column (0)->set_expand(true);
        group_display.get_column (1)->set_expand(false);
-       group_display.set_name ("LHSList");
+       group_display.set_name ("EditGroupList");
        group_display.get_selection()->set_mode (Gtk::SELECTION_SINGLE);
        group_display.set_reorderable (true);
        group_display.set_headers_visible (true);
@@ -309,13 +315,14 @@ Mixer_UI::add_strips (RouteList& routes)
 {
        MixerStrip* strip;
 
-       {
-               Unwinder<bool> uw (no_track_list_redisplay, true);
-               
+       try {
+               no_track_list_redisplay = true;
+               track_display.set_model (Glib::RefPtr<ListStore>());
+
                for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
                        boost::shared_ptr<Route> route = (*x);
                        
-                       if (route->is_hidden()) {
+                       if (route->is_auditioner()) {
                                continue;
                        }
                        
@@ -343,7 +350,7 @@ Mixer_UI::add_strips (RouteList& routes)
                        
                        strip = new MixerStrip (*this, _session, route);
                        strips.push_back (strip);
-                       
+
                        Config->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
                        
                        if (strip->width_owner() != strip) {
@@ -363,8 +370,13 @@ Mixer_UI::add_strips (RouteList& routes)
                        strip->WidthChanged.connect (sigc::mem_fun(*this, &Mixer_UI::strip_width_changed));
                        strip->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
                }
+
+       } catch (...) {
        }
 
+       no_track_list_redisplay = false;
+       track_display.set_model (track_model);
+       
        sync_order_keys_from_treeview ();
        redisplay_track_list ();
 }
@@ -543,20 +555,30 @@ Mixer_UI::sync_treeview_from_order_keys (RouteSortOrderKey src)
                return;
        }
 
-       neworder.assign (rows.size(), 0);
-       
+       OrderKeySortedRoutes sorted_routes;
+
        for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri, ++old_order) {
                boost::shared_ptr<Route> route = (*ri)[track_columns.route];
-               uint32_t new_order = route->order_key (MixerSort);
+               sorted_routes.push_back (RoutePlusOrderKey (route, old_order, route->order_key (MixerSort)));
+       }
+
+       SortByNewDisplayOrder cmp;
 
-               neworder[new_order] = old_order;
+       sort (sorted_routes.begin(), sorted_routes.end(), cmp);
+       neworder.assign (sorted_routes.size(), 0);
 
-               if (old_order != new_order) {
+       uint32_t n = 0;
+       
+       for (OrderKeySortedRoutes::iterator sr = sorted_routes.begin(); sr != sorted_routes.end(); ++sr, ++n) {
+
+               neworder[n] = sr->old_display_order;
+
+               if (sr->old_display_order != n) {
                        changed = true;
                }
 
                DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("MIXER change order for %1 from %2 to %3\n",
-                                                              route->name(), old_order, new_order));
+                                                              sr->route->name(), sr->old_display_order, n));
        }
 
        if (changed) {
@@ -1773,7 +1795,7 @@ Mixer_UI::setup_track_display ()
        track_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
        track_display.get_column (0)->set_expand(true);
        track_display.get_column (1)->set_expand(false);
-       track_display.set_name (X_("LHSList"));
+       track_display.set_name (X_("EditGroupList"));
        track_display.get_selection()->set_mode (Gtk::SELECTION_NONE);
        track_display.set_reorderable (true);
        track_display.set_headers_visible (true);
@@ -1877,7 +1899,7 @@ Mixer_UI::set_route_targets_for_operation ()
                return;
        }
 
-       /* try to get mixer strip at mouse */
+       /* nothing selected ... try to get mixer strip at mouse */
 
        int x, y;
        get_pointer (x, y);
@@ -1897,3 +1919,24 @@ Mixer_UI::monitor_section_going_away ()
                _monitor_section->set_session (0);
        }
 }
+
+void
+Mixer_UI::toggle_midi_input_active (bool flip_others)
+{
+       boost::shared_ptr<RouteList> rl (new RouteList);
+       bool onoff;
+
+       set_route_targets_for_operation ();
+
+       for (RouteUISelection::iterator r = _route_targets.begin(); r != _route_targets.end(); ++r) {
+               boost::shared_ptr<MidiTrack> mt = (*r)->midi_track();
+
+               if (mt) {
+                       rl->push_back ((*r)->route());
+                       onoff = !mt->input_active();
+               }
+       }
+       
+       _session->set_exclusive_input_active (rl, onoff, flip_others);
+}
+