OSC: Changed gainVCA to gainfader as VCA is already used.

[ardour.git] / gtk2_ardour / editor_routes.cc

diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index 8ab17897d784188f0b7501e24fa74b0b29926ea3..8d35a4a6a8ba600ccd227dd20a6307e533afa929 100644 (file)
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -47,6 +47,7 @@
 #include "midi_time_axis.h"
 #include "mixer_strip.h"
 #include "route_sorter.h"
+#include "tooltips.h"
 #include "utils.h"
 
 #include "i18n.h"
@@ -72,13 +73,13 @@ EditorRoutes::EditorRoutes (Editor* e)
        , _no_redisplay (false)
        , _adding_routes (false)
        , _route_deletion_in_progress (false)
+       , _redisplay_on_resume (false)
        , _redisplay_active (0)
        , _queue_tv_update (0)
        , _menu (0)
        , old_focus (0)
        , selection_countdown (0)
        , name_editable (0)
-       , _redisplay_on_resume (false)
 {
        static const int column_width = 22;
 
@@ -219,7 +220,7 @@ EditorRoutes::EditorRoutes (Editor* e)
        for (int i = 0; ci[i].index >= 0; ++i) {
                col = _display.get_column (ci[i].index);
                l = manage (new Label (ci[i].label));
-               ARDOUR_UI::instance()->set_tip (*l, ci[i].tooltip);
+               set_tooltip (*l, ci[i].tooltip);
                col->set_widget (*l);
                l->show ();
        }
@@ -452,7 +453,7 @@ EditorRoutes::on_tv_solo_isolate_toggled (std::string const & path_string)
        RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tv);
 
        if (rtv) {
-               rtv->route()->set_solo_isolated (!rtv->route()->solo_isolated(), this);
+               rtv->route()->set_solo_isolated (!rtv->route()->solo_isolated(), Controllable::UseGroup);
        }
 }
 
@@ -466,7 +467,7 @@ EditorRoutes::on_tv_solo_safe_toggled (std::string const & path_string)
        RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tv);
 
        if (rtv) {
-               rtv->route()->set_solo_safe (!rtv->route()->solo_safe(), this);
+               rtv->route()->set_solo_safe (!rtv->route()->solo_safe(), Controllable::UseGroup);
        }
 }
 
@@ -489,7 +490,7 @@ EditorRoutes::build_menu ()
        items.push_back (MenuElem (_("Hide All Audio Busses"), sigc::mem_fun (*this, &EditorRoutes::hide_all_audiobus)));
        items.push_back (MenuElem (_("Show All Midi Tracks"), sigc::mem_fun (*this, &EditorRoutes::show_all_miditracks)));
        items.push_back (MenuElem (_("Hide All Midi Tracks"), sigc::mem_fun (*this, &EditorRoutes::hide_all_miditracks)));
-       items.push_back (MenuElem (_("Show Tracks With Regions Under Playhead"), sigc::mem_fun (*this, &EditorRoutes::show_tracks_with_regions_at_playhead)));
+       items.push_back (MenuElem (_("Only Show Tracks with Regions Under Playhead"), sigc::mem_fun (*this, &EditorRoutes::show_tracks_with_regions_at_playhead)));
 }
 
 void
@@ -524,7 +525,7 @@ EditorRoutes::redisplay_real ()
                }
 
                bool visible = tv->marked_for_display ();
-               
+
                /* show or hide the TimeAxisView */
                if (visible) {
                        position += tv->show_at (position, n, &_editor->edit_controls_vbox);
@@ -567,15 +568,15 @@ EditorRoutes::redisplay ()
        }
 
        // model deprecated g_atomic_int_exchange_and_add(, 1)
-       g_atomic_int_inc(&_redisplay_active);
-       if (!g_atomic_int_compare_and_exchange (&_redisplay_active, 1, 1)) {
+       g_atomic_int_inc(const_cast<gint*>(&_redisplay_active));
+       if (!g_atomic_int_compare_and_exchange (const_cast<gint*>(&_redisplay_active), 1, 1)) {
                return;
        }
 
        redisplay_real ();
 
-       while (!g_atomic_int_compare_and_exchange (&_redisplay_active, 1, 0)) {
-               g_atomic_int_set(&_redisplay_active, 1);
+       while (!g_atomic_int_compare_and_exchange (const_cast<gint*>(&_redisplay_active), 1, 0)) {
+               g_atomic_int_set(const_cast<gint*>(&_redisplay_active), 1);
                redisplay_real ();
        }
 }
@@ -710,8 +711,8 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes)
                }
 
                (*x)->route()->mute_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_mute_display, this), gui_context());
-               (*x)->route()->solo_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_display, this, _1), gui_context());
-               (*x)->route()->listen_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_display, this, _1), gui_context());
+               (*x)->route()->solo_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_display, this), gui_context());
+               (*x)->route()->listen_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_display, this), gui_context());
                (*x)->route()->solo_isolated_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_isolate_display, this), gui_context());
                (*x)->route()->solo_safe_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_safe_display, this), gui_context());
                (*x)->route()->active_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_active_display, this), gui_context ());
@@ -720,7 +721,7 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes)
 
        update_rec_display ();
        update_mute_display ();
-       update_solo_display (true);
+       update_solo_display ();
        update_solo_isolate_display ();
        update_solo_safe_display ();
        update_input_active_display ();
@@ -804,7 +805,7 @@ EditorRoutes::route_property_changed (const PropertyChange& what_changed, boost:
 void
 EditorRoutes::update_active_display ()
 {
-       if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) {
+       if (g_atomic_int_compare_and_exchange (const_cast<gint*>(&_queue_tv_update), 0, 1)) {
                Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc));
        }
 }
@@ -885,11 +886,11 @@ EditorRoutes::reset_remote_control_ids ()
        for (ri = rows.begin(); ri != rows.end(); ++ri) {
 
                /* skip two special values */
-               
+
                if (rid == Route::MasterBusRemoteControlID) {
                        rid++;
                }
-               
+
                if (rid == Route::MonitorBusRemoteControlID) {
                        rid++;
                }
@@ -1117,17 +1118,20 @@ EditorRoutes::set_all_audio_midi_visibility (int tracks, bool yn)
                if ((atv = dynamic_cast<AudioTimeAxisView*>(tv)) != 0) {
                        switch (tracks) {
                        case 0:
+                               atv->set_marked_for_display (yn);
                                (*i)[_columns.visible] = yn;
                                break;
 
                        case 1:
                                if (atv->is_audio_track()) {
+                                       atv->set_marked_for_display (yn);
                                        (*i)[_columns.visible] = yn;
                                }
                                break;
 
                        case 2:
                                if (!atv->is_audio_track()) {
+                                       atv->set_marked_for_display (yn);
                                        (*i)[_columns.visible] = yn;
                                }
                                break;
@@ -1136,11 +1140,13 @@ EditorRoutes::set_all_audio_midi_visibility (int tracks, bool yn)
                else if ((mtv = dynamic_cast<MidiTimeAxisView*>(tv)) != 0) {
                        switch (tracks) {
                        case 0:
+                               mtv->set_marked_for_display (yn);
                                (*i)[_columns.visible] = yn;
                                break;
 
                        case 3:
                                if (mtv->is_midi_track()) {
+                                       mtv->set_marked_for_display (yn);
                                        (*i)[_columns.visible] = yn;
                                }
                                break;
@@ -1408,7 +1414,7 @@ EditorRoutes::initial_display ()
        }
 
        RouteList r (*_session->get_routes());
-               
+
        r.sort (EditorOrderRouteSorter ());
        _editor->add_routes (r);
 }
@@ -1575,7 +1581,7 @@ EditorRoutes::update_input_active_display ()
 void
 EditorRoutes::update_rec_display ()
 {
-       if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) {
+       if (g_atomic_int_compare_and_exchange (const_cast<gint*>(&_queue_tv_update), 0, 1)) {
                Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc));
        }
 }
@@ -1583,7 +1589,7 @@ EditorRoutes::update_rec_display ()
 bool
 EditorRoutes::idle_update_mute_rec_solo_etc()
 {
-       g_atomic_int_set (&_queue_tv_update, 0);
+       g_atomic_int_set (const_cast<gint*>(&_queue_tv_update), 0);
        TreeModel::Children rows = _model->children();
        TreeModel::Children::iterator i;
 
@@ -1596,7 +1602,7 @@ EditorRoutes::idle_update_mute_rec_solo_etc()
                (*i)[_columns.active] = route->active ();
                if (boost::dynamic_pointer_cast<Track> (route)) {
                        boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (route);
-                       
+
                        if (route->record_enabled()) {
                                if (_session->record_status() == Session::Recording) {
                                        (*i)[_columns.rec_state] = 1;
@@ -1608,7 +1614,7 @@ EditorRoutes::idle_update_mute_rec_solo_etc()
                        } else {
                                (*i)[_columns.rec_state] = 0;
                        }
-                       
+
                        (*i)[_columns.name_editable] = !route->record_enabled ();
                }
        }
@@ -1620,15 +1626,15 @@ EditorRoutes::idle_update_mute_rec_solo_etc()
 void
 EditorRoutes::update_mute_display ()
 {
-       if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) {
+       if (g_atomic_int_compare_and_exchange (const_cast<gint*>(&_queue_tv_update), 0, 1)) {
                Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc));
        }
 }
 
 void
-EditorRoutes::update_solo_display (bool /* selfsoloed */)
+EditorRoutes::update_solo_display ()
 {
-       if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) {
+       if (g_atomic_int_compare_and_exchange (const_cast<gint*>(&_queue_tv_update), 0, 1)) {
                Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc));
        }
 }
@@ -1636,7 +1642,7 @@ EditorRoutes::update_solo_display (bool /* selfsoloed */)
 void
 EditorRoutes::update_solo_isolate_display ()
 {
-       if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) {
+       if (g_atomic_int_compare_and_exchange (const_cast<gint*>(&_queue_tv_update), 0, 1)) {
                Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc));
        }
 }
@@ -1644,7 +1650,7 @@ EditorRoutes::update_solo_isolate_display ()
 void
 EditorRoutes::update_solo_safe_display ()
 {
-       if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) {
+       if (g_atomic_int_compare_and_exchange (const_cast<gint*>(&_queue_tv_update), 0, 1)) {
                Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc));
        }
 }
@@ -1724,6 +1730,14 @@ EditorRoutes::show_tracks_with_regions_at_playhead ()
        TreeModel::Children rows = _model->children ();
        for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) {
                TimeAxisView* tv = (*i)[_columns.tv];
-               (*i)[_columns.visible] = (show.find (tv) != show.end());
+               bool to_show = (show.find (tv) != show.end());
+
+               tv->set_marked_for_display (to_show);
+               (*i)[_columns.visible] = to_show;
        }
+
+       /* force route order keys catch up with visibility changes
+        */
+
+       sync_order_keys_from_treeview ();
 }