projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mechanism to allow Track (or other Route-derived type) to add its own processors...
[ardour.git] / gtk2_ardour / editor_routes.cc
diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index d21113b8b522446cdc6e1ac7a945b65c4ec99914..809dfd267f962aa719f59c0acdb70ed699d503f1 100644 (file)
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -42,6 +42,8 @@
 #include "gtkmm2ext/cell_renderer_pixbuf_toggle.h"
 #include "gtkmm2ext/treeutils.h"
 
+#include "widgets/tooltips.h"
+
 #include "actions.h"
 #include "ardour_ui.h"
 #include "audio_time_axis.h"
@@ -54,7 +56,6 @@
 #include "mixer_strip.h"
 #include "plugin_setup_dialog.h"
 #include "route_sorter.h"
-#include "tooltips.h"
 #include "vca_time_axis.h"
 #include "utils.h"
 
@@ -62,6 +63,7 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace ArdourWidgets;
 using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
@@ -87,7 +89,6 @@ EditorRoutes::EditorRoutes (Editor* e)
        , _queue_tv_update (0)
        , _menu (0)
        , old_focus (0)
-       , selection_countdown (0)
        , name_editable (0)
 {
        static const int column_width = 22;
@@ -194,7 +195,7 @@ EditorRoutes::EditorRoutes (Editor* e)
        TreeViewColumn* solo_isolate_state_column = manage (new TreeViewColumn("SI", *solo_iso_renderer));
 
        solo_isolate_state_column->add_attribute(solo_iso_renderer->property_state(), _columns.solo_isolate_state);
-       solo_isolate_state_column->add_attribute(solo_iso_renderer->property_visible(), _columns.solo_visible);
+       solo_isolate_state_column->add_attribute(solo_iso_renderer->property_visible(), _columns.solo_lock_iso_visible);
        solo_isolate_state_column->set_sizing(TREE_VIEW_COLUMN_FIXED);
        solo_isolate_state_column->set_alignment(ALIGN_CENTER);
        solo_isolate_state_column->set_expand(false);
@@ -209,7 +210,7 @@ EditorRoutes::EditorRoutes (Editor* e)
 
        TreeViewColumn* solo_safe_state_column = manage (new TreeViewColumn(_("SS"), *solo_safe_renderer));
        solo_safe_state_column->add_attribute(solo_safe_renderer->property_state(), _columns.solo_safe_state);
-       solo_safe_state_column->add_attribute(solo_safe_renderer->property_visible(), _columns.solo_visible);
+       solo_safe_state_column->add_attribute(solo_safe_renderer->property_visible(), _columns.solo_lock_iso_visible);
        solo_safe_state_column->set_sizing(TREE_VIEW_COLUMN_FIXED);
        solo_safe_state_column->set_alignment(ALIGN_CENTER);
        solo_safe_state_column->set_expand(false);
@@ -303,6 +304,7 @@ EditorRoutes::EditorRoutes (Editor* e)
        active_col->set_sizing (TREE_VIEW_COLUMN_FIXED);
        active_col->set_fixed_width (30);
        active_col->set_alignment (ALIGN_CENTER);
+       active_col->add_attribute (active_cell->property_visible(), _columns.no_vca);
 
        _model->signal_row_deleted().connect (sigc::mem_fun (*this, &EditorRoutes::row_deleted));
        _model->signal_rows_reordered().connect (sigc::mem_fun (*this, &EditorRoutes::reordered));
@@ -359,7 +361,6 @@ EditorRoutes::enter_notify (GdkEventCrossing*)
        /* arm counter so that ::selection_filter() will deny selecting anything for the
         * next two attempts to change selection status.
         */
-       selection_countdown = 2;
        _scroller.grab_focus ();
        Keyboard::magic_widget_grab_focus ();
        return false;
@@ -368,8 +369,6 @@ EditorRoutes::enter_notify (GdkEventCrossing*)
 bool
 EditorRoutes::leave_notify (GdkEventCrossing*)
 {
-       selection_countdown = 0;
-
        if (old_focus) {
                old_focus->grab_focus ();
                old_focus = 0;
@@ -424,13 +423,13 @@ EditorRoutes::on_tv_rec_enable_changed (std::string const & path_string)
        Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string));
 
        TimeAxisView* tv = row[_columns.tv];
-       RouteTimeAxisView *rtv = dynamic_cast<RouteTimeAxisView*> (tv);
+       StripableTimeAxisView* stv = dynamic_cast<StripableTimeAxisView*> (tv);
 
-       if (!rtv) {
+       if (!stv || !stv->stripable()) {
                return;
        }
 
-       boost::shared_ptr<AutomationControl> ac = rtv->route()->rec_enable_control();
+       boost::shared_ptr<AutomationControl> ac = stv->stripable()->rec_enable_control();
 
        if (ac) {
                ac->set_value (!ac->get_value(), Controllable::UseGroup);
@@ -442,13 +441,13 @@ EditorRoutes::on_tv_rec_safe_toggled (std::string const & path_string)
 {
        Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string));
        TimeAxisView* tv = row[_columns.tv];
-       RouteTimeAxisView *rtv = dynamic_cast<RouteTimeAxisView*> (tv);
+       StripableTimeAxisView* stv = dynamic_cast<StripableTimeAxisView*> (tv);
 
-       if (!rtv) {
+       if (!stv || !stv->stripable()) {
                return;
        }
 
-       boost::shared_ptr<AutomationControl> ac (rtv->route()->rec_safe_control());
+       boost::shared_ptr<AutomationControl> ac (stv->stripable()->rec_safe_control());
 
        if (ac) {
                ac->set_value (!ac->get_value(), Controllable::UseGroup);
@@ -462,13 +461,13 @@ EditorRoutes::on_tv_mute_enable_toggled (std::string const & path_string)
        Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string));
 
        TimeAxisView *tv = row[_columns.tv];
-       RouteTimeAxisView *rtv = dynamic_cast<RouteTimeAxisView*> (tv);
+       StripableTimeAxisView* stv = dynamic_cast<StripableTimeAxisView*> (tv);
 
-       if (!rtv) {
+       if (!stv || !stv->stripable()) {
                return;
        }
 
-       boost::shared_ptr<AutomationControl> ac (rtv->route()->mute_control());
+       boost::shared_ptr<AutomationControl> ac (stv->stripable()->mute_control());
 
        if (ac) {
                ac->set_value (!ac->get_value(), Controllable::UseGroup);
@@ -482,13 +481,13 @@ EditorRoutes::on_tv_solo_enable_toggled (std::string const & path_string)
        Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string));
 
        TimeAxisView *tv = row[_columns.tv];
-       RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tv);
+       StripableTimeAxisView* stv = dynamic_cast<StripableTimeAxisView*> (tv);
 
-       if (!rtv) {
+       if (!stv || !stv->stripable()) {
                return;
        }
 
-       boost::shared_ptr<AutomationControl> ac (rtv->route()->solo_control());
+       boost::shared_ptr<AutomationControl> ac (stv->stripable()->solo_control());
 
        if (ac) {
                ac->set_value (!ac->get_value(), Controllable::UseGroup);
@@ -502,13 +501,13 @@ EditorRoutes::on_tv_solo_isolate_toggled (std::string const & path_string)
        Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string));
 
        TimeAxisView *tv = row[_columns.tv];
-       RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tv);
+       StripableTimeAxisView* stv = dynamic_cast<StripableTimeAxisView*> (tv);
 
-       if (!rtv) {
+       if (!stv || !stv->stripable()) {
                return;
        }
 
-       boost::shared_ptr<AutomationControl> ac (rtv->route()->solo_isolate_control());
+       boost::shared_ptr<AutomationControl> ac (stv->stripable()->solo_isolate_control());
 
        if (ac) {
                ac->set_value (!ac->get_value(), Controllable::UseGroup);
@@ -522,13 +521,13 @@ EditorRoutes::on_tv_solo_safe_toggled (std::string const & path_string)
        Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string));
 
        TimeAxisView *tv = row[_columns.tv];
-       RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tv);
+       StripableTimeAxisView* stv = dynamic_cast<StripableTimeAxisView*> (tv);
 
-       if (!rtv) {
+       if (!stv || !stv->stripable()) {
                return;
        }
 
-       boost::shared_ptr<AutomationControl> ac (rtv->route()->solo_safe_control());
+       boost::shared_ptr<AutomationControl> ac (stv->stripable()->solo_safe_control());
 
        if (ac) {
                ac->set_value (!ac->get_value(), Controllable::UseGroup);
@@ -748,6 +747,7 @@ EditorRoutes::time_axis_views_added (list<TimeAxisView*> tavs)
                        row[_columns.is_track] = false;
                        row[_columns.is_input_active] = false;
                        row[_columns.is_midi] = false;
+                       row[_columns.no_vca] = false;
 
                } else if (rtav) {
 
@@ -755,6 +755,7 @@ EditorRoutes::time_axis_views_added (list<TimeAxisView*> tavs)
                        midi_trk= boost::dynamic_pointer_cast<MidiTrack> (stripable);
 
                        row[_columns.is_track] = (boost::dynamic_pointer_cast<Track> (stripable) != 0);
+                       row[_columns.no_vca] = true;
 
                        if (midi_trk) {
                                row[_columns.is_input_active] = midi_trk->input_active ();
@@ -776,7 +777,8 @@ EditorRoutes::time_axis_views_added (list<TimeAxisView*> tavs)
                row[_columns.stripable] = stripable;
                row[_columns.mute_state] = RouteUI::mute_active_state (_session, stripable);
                row[_columns.solo_state] = RouteUI::solo_active_state (stripable);
-               row[_columns.solo_visible] = true;
+               row[_columns.solo_visible] = !stripable->is_master ();
+               row[_columns.solo_lock_iso_visible] = row[_columns.solo_visible] && row[_columns.no_vca];
                row[_columns.solo_isolate_state] = RouteUI::solo_isolate_active_state (stripable);
                row[_columns.solo_safe_state] = RouteUI::solo_safe_active_state (stripable);
                row[_columns.name_editable] = true;
@@ -948,8 +950,7 @@ EditorRoutes::update_visibility ()
                (*i)[_columns.visible] = tv->marked_for_display ();
        }
 
-       /* force route order keys catch up with visibility changes
-        */
+       /* force route order keys catch up with visibility changes */
 
        sync_presentation_info_from_treeview ();
 }
@@ -1002,17 +1003,17 @@ EditorRoutes::sync_presentation_info_from_treeview ()
 
        DEBUG_TRACE (DEBUG::OrderKeys, "editor sync presentation info from treeview\n");
 
-       TreeModel::Children::iterator ri;
        bool change = false;
        PresentationInfo::order_t order = 0;
 
        PresentationInfo::ChangeSuspender cs;
 
-       for (ri = rows.begin(); ri != rows.end(); ++ri) {
+       for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri) {
                boost::shared_ptr<Stripable> stripable = (*ri)[_columns.stripable];
                bool visible = (*ri)[_columns.visible];
 
 #ifndef NDEBUG // these should not exist in the treeview
+               assert (stripable);
                if (stripable->is_monitor() || stripable->is_auditioner()) {
                        assert (0);
                        continue;
@@ -1054,11 +1055,11 @@ EditorRoutes::sync_treeview_from_presentation_info (PropertyChange const & what_
 
        TreeModel::Children rows = _model->children();
 
-       if (what_changed.contains (hidden_or_order)) {
+       bool changed = false;
 
+       if (what_changed.contains (hidden_or_order)) {
                vector<int> neworder;
                uint32_t old_order = 0;
-               bool changed = false;
 
                if (rows.empty()) {
                        return;
@@ -1105,15 +1106,13 @@ EditorRoutes::sync_treeview_from_presentation_info (PropertyChange const & what_
                }
        }
 
-       if (what_changed.contains (Properties::selected)) {
-
+       if (changed || what_changed.contains (Properties::selected)) {
                /* by the time this is invoked, the GUI Selection model has
                 * already updated itself.
                 */
-
                PBD::Unwinder<bool> uw (_ignore_selection_change, true);
-               /* set the treeview model selection state */
 
+               /* set the treeview model selection state */
                for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri) {
                        boost::shared_ptr<Stripable> stripable = (*ri)[_columns.stripable];
                        if (stripable && stripable->is_selected()) {
@@ -1465,21 +1464,9 @@ EditorRoutes::selection_changed ()
 bool
 EditorRoutes::selection_filter (Glib::RefPtr<TreeModel> const& model, TreeModel::Path const& path, bool /*selected*/)
 {
-       if (selection_countdown) {
-               if (--selection_countdown == 0) {
-                       return true;
-               } else {
-                       /* no selection yet ... */
-                       return false;
-               }
-       }
-
        TreeModel::iterator iter = model->get_iter (path);
        if (iter) {
                boost::shared_ptr<Stripable> stripable = (*iter)[_columns.stripable];
-               if (boost::dynamic_pointer_cast<VCA> (stripable)) {
-                       return false;
-               }
        }
 
        return true;
Unnamed repository; edit this file 'description' to name the repository.