don't request redraw of a Canvas item if it marked invisible

[ardour.git] / gtk2_ardour / mixer_ui.cc

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 74556c8edab740aa2aeb708be6ea3636076edf95..8126a81e85837c1abbd96b510ec14f74fd8b0c22 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -83,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,7 +96,7 @@ Mixer_UI::Mixer_UI ()
        /* allow this window to become the key focus window */
        set_flags (CAN_FOCUS);
 
-       Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::sync_treeview_from_order_keys, this, _1), gui_context());
+       Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::sync_treeview_from_order_keys, this), gui_context());
 
        scroller.set_can_default (true);
        set_default (scroller);
@@ -407,7 +408,7 @@ Mixer_UI::remove_strip (MixerStrip* strip)
 void
 Mixer_UI::reset_remote_control_ids ()
 {
-       if (Config->get_remote_model() != MixerOrdered || !_session || _session->deletion_in_progress()) {
+       if (Config->get_remote_model() == UserOrdered || !_session || _session->deletion_in_progress()) {
                return;
        }
 
@@ -433,7 +434,7 @@ Mixer_UI::reset_remote_control_ids ()
                        uint32_t new_rid = (visible ? rid : invisible_key--);
                        
                        if (new_rid != route->remote_control_id()) {
-                               route->set_remote_control_id_from_order_key (MixerSort, new_rid);       
+                               route->set_remote_control_id_explicit (new_rid);        
                                rid_change = true;
                        }
                        
@@ -475,10 +476,10 @@ Mixer_UI::sync_order_keys_from_treeview ()
                boost::shared_ptr<Route> route = (*ri)[track_columns.route];
                bool visible = (*ri)[track_columns.visible];
 
-               uint32_t old_key = route->order_key (MixerSort);
+               uint32_t old_key = route->order_key ();
 
                if (order != old_key) {
-                       route->set_order_key (MixerSort, order);
+                       route->set_order_key (order);
                        changed = true;
                }
 
@@ -487,7 +488,7 @@ Mixer_UI::sync_order_keys_from_treeview ()
                        uint32_t new_rid = (visible ? rid : invisible_key--);
 
                        if (new_rid != route->remote_control_id()) {
-                               route->set_remote_control_id_from_order_key (MixerSort, new_rid);       
+                               route->set_remote_control_id_explicit (new_rid);        
                                rid_change = true;
                        }
                        
@@ -502,7 +503,7 @@ Mixer_UI::sync_order_keys_from_treeview ()
 
        if (changed) {
                /* tell everyone that we changed the mixer sort keys */
-               _session->sync_order_keys (MixerSort);
+               _session->sync_order_keys ();
        }
 
        if (rid_change) {
@@ -512,33 +513,13 @@ Mixer_UI::sync_order_keys_from_treeview ()
 }
 
 void
-Mixer_UI::sync_treeview_from_order_keys (RouteSortOrderKey src)
+Mixer_UI::sync_treeview_from_order_keys ()
 {
        if (!_session || _session->deletion_in_progress()) {
                return;
        }
 
-       DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("mixer sync model from order keys, src = %1\n", enum_2_string (src)));
-
-       if (src == EditorSort) {
-
-               if (!Config->get_sync_all_route_ordering()) {
-                       /* editor sort keys changed - we don't care */
-                       return;
-               }
-
-               DEBUG_TRACE (DEBUG::OrderKeys, "reset mixer order key to match editor\n");
-
-               /* editor sort keys were changed, update the mixer sort
-                * keys since "sync mixer+editor order" is enabled.
-                */
-
-               boost::shared_ptr<RouteList> r = _session->get_routes ();
-               
-               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-                       (*i)->sync_order_keys (src);
-               }
-       }
+       DEBUG_TRACE (DEBUG::OrderKeys, "mixer sync model from order keys.\n");
 
        /* we could get here after either a change in the Mixer or Editor sort
         * order, but either way, the mixer order keys reflect the intended
@@ -558,7 +539,7 @@ Mixer_UI::sync_treeview_from_order_keys (RouteSortOrderKey src)
 
        for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri, ++old_order) {
                boost::shared_ptr<Route> route = (*ri)[track_columns.route];
-               sorted_routes.push_back (RoutePlusOrderKey (route, old_order, route->order_key (MixerSort)));
+               sorted_routes.push_back (RoutePlusOrderKey (route, old_order, route->order_key ()));
        }
 
        SortByNewDisplayOrder cmp;
@@ -1099,7 +1080,7 @@ struct SignalOrderRouteSorter {
                    /* everything comes before b */
                    return true;
            }
-           return a->order_key (MixerSort) < b->order_key (MixerSort);
+           return a->order_key () < b->order_key ();
 
     }
 };
@@ -1121,7 +1102,7 @@ Mixer_UI::initial_track_display ()
                add_strips (copy);
        }
        
-       _session->sync_order_keys (MixerSort);
+       _session->sync_order_keys ();
 
        redisplay_track_list ();
 }
@@ -1476,12 +1457,12 @@ Mixer_UI::strip_scroller_button_release (GdkEventButton* ev)
 }
 
 void
-Mixer_UI::set_strip_width (Width w)
+Mixer_UI::set_strip_width (Width w, bool save)
 {
        _strip_width = w;
 
        for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
-               (*i)->set_width_enum (w, this);
+               (*i)->set_width_enum (w, save ? (*i)->width_owner() : this);
        }
 }
 
@@ -1665,6 +1646,7 @@ Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which)
 void
 Mixer_UI::scroll_left ()
 {
+       if (!scroller.get_hscrollbar()) return;
        Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
        /* stupid GTK: can't rely on clamping across versions */
        scroller.get_hscrollbar()->set_value (max (adj->get_lower(), adj->get_value() - adj->get_step_increment()));
@@ -1673,6 +1655,7 @@ Mixer_UI::scroll_left ()
 void
 Mixer_UI::scroll_right ()
 {
+       if (!scroller.get_hscrollbar()) return;
        Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
        /* stupid GTK: can't rely on clamping across versions */
        scroller.get_hscrollbar()->set_value (min (adj->get_upper(), adj->get_value() + adj->get_step_increment()));
@@ -1923,7 +1906,7 @@ void
 Mixer_UI::toggle_midi_input_active (bool flip_others)
 {
        boost::shared_ptr<RouteList> rl (new RouteList);
-       bool onoff;
+       bool onoff = false;
 
        set_route_targets_for_operation ();