From 3ff2396b4acf00dc8a092de5c5d5c2a8465efdad Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 5 Apr 2010 20:08:37 +0000 Subject: [PATCH] Add solo safe control to editor route list, as per #3063. git-svn-id: svn://localhost/ardour2/branches/3.0@6861 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_routes.cc | 54 ++++++++++++++++++++++++++++++++---- gtk2_ardour/editor_routes.h | 4 +++ gtk2_ardour/route_ui.cc | 16 ++++++++++- gtk2_ardour/route_ui.h | 1 + 4 files changed, 69 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index ed04643959..b9ed2a935f 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -123,7 +123,7 @@ EditorRoutes::EditorRoutes (Editor* e) solo_iso_renderer->set_pixbuf (1, ::get_icon("solo-isolated")); solo_iso_renderer->signal_changed().connect (sigc::mem_fun (*this, &EditorRoutes::on_tv_solo_isolate_toggled)); - TreeViewColumn* solo_isolate_state_column = manage (new TreeViewColumn("I", *solo_iso_renderer)); + 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->set_sizing(TREE_VIEW_COLUMN_FIXED); @@ -131,10 +131,25 @@ EditorRoutes::EditorRoutes (Editor* e) solo_isolate_state_column->set_expand(false); solo_isolate_state_column->set_fixed_width(15); + // Solo safe toggle + CellRendererPixbufMulti* solo_safe_renderer = manage (new CellRendererPixbufMulti ()); + + solo_safe_renderer->set_pixbuf (0, ::get_icon("act-disabled")); + solo_safe_renderer->set_pixbuf (1, ::get_icon("solo-enabled")); + solo_safe_renderer->signal_changed().connect (sigc::mem_fun (*this, &EditorRoutes::on_tv_solo_safe_toggled)); + + 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->set_sizing(TREE_VIEW_COLUMN_FIXED); + solo_safe_state_column->set_alignment(ALIGN_CENTER); + solo_safe_state_column->set_expand(false); + solo_safe_state_column->set_fixed_width(22); + _display.append_column (*rec_state_column); _display.append_column (*mute_state_column); _display.append_column (*solo_state_column); _display.append_column (*solo_isolate_state_column); + _display.append_column (*solo_safe_state_column); _display.append_column (_("Name"), _columns.text); _display.append_column (_("V"), _columns.visible); @@ -147,11 +162,11 @@ EditorRoutes::EditorRoutes (Editor* e) _display.set_size_request (100, -1); _display.add_object_drag (_columns.route.index(), "routes"); - CellRendererText* name_cell = dynamic_cast (_display.get_column_cell_renderer (4)); + CellRendererText* name_cell = dynamic_cast (_display.get_column_cell_renderer (5)); assert (name_cell); - TreeViewColumn* name_column = _display.get_column (4); + TreeViewColumn* name_column = _display.get_column (5); assert (name_column); @@ -164,13 +179,13 @@ EditorRoutes::EditorRoutes (Editor* e) name_cell->signal_edited().connect (sigc::mem_fun (*this, &EditorRoutes::name_edit)); // Set the visible column cell renderer to radio toggle - CellRendererToggle* visible_cell = dynamic_cast (_display.get_column_cell_renderer (5)); + CellRendererToggle* visible_cell = dynamic_cast (_display.get_column_cell_renderer (6)); visible_cell->property_activatable() = true; visible_cell->property_radio() = false; visible_cell->signal_toggled().connect (sigc::mem_fun (*this, &EditorRoutes::visible_changed)); - TreeViewColumn* visible_col = dynamic_cast (_display.get_column (5)); + TreeViewColumn* visible_col = dynamic_cast (_display.get_column (6)); visible_col->set_expand(false); visible_col->set_sizing(TREE_VIEW_COLUMN_FIXED); visible_col->set_fixed_width(30); @@ -258,6 +273,20 @@ EditorRoutes::on_tv_solo_isolate_toggled (Glib::ustring const & path_string) } } +void +EditorRoutes::on_tv_solo_safe_toggled (Glib::ustring const & path_string) +{ + // Get the model row that has been toggled. + Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); + + TimeAxisView *tv = row[_columns.tv]; + AudioTimeAxisView *atv = dynamic_cast (tv); + + if (atv != 0) { + atv->route()->set_solo_safe (!atv->route()->solo_safe(), this); + } +} + void EditorRoutes::build_menu () { @@ -410,6 +439,7 @@ EditorRoutes::routes_added (list routes) row[_columns.mute_state] = (*x)->route()->muted(); row[_columns.solo_state] = (*x)->route()->soloed(); row[_columns.solo_isolate_state] = (*x)->route()->solo_isolated(); + row[_columns.solo_safe_state] = (*x)->route()->solo_safe(); row[_columns.name_editable] = true; _ignore_reorder = true; @@ -434,12 +464,14 @@ EditorRoutes::routes_added (list 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), 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()); } update_rec_display (); update_mute_display (); update_solo_display (); update_solo_isolate_display (); + update_solo_safe_display (); resume_redisplay (); _redisplay_does_not_sync_order_keys = false; } @@ -1018,6 +1050,18 @@ EditorRoutes::update_solo_isolate_display () } } +void +EditorRoutes::update_solo_safe_display () +{ + TreeModel::Children rows = _model->children(); + TreeModel::Children::iterator i; + + for (i = rows.begin(); i != rows.end(); ++i) { + boost::shared_ptr route = (*i)[_columns.route]; + (*i)[_columns.solo_safe_state] = RouteUI::solo_safe_visual_state (route) > 0 ? 1 : 0; + } +} + list EditorRoutes::views () const { diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h index 7489cbf7d8..b37607aad9 100644 --- a/gtk2_ardour/editor_routes.h +++ b/gtk2_ardour/editor_routes.h @@ -63,6 +63,7 @@ private: void on_tv_mute_enable_toggled (Glib::ustring const &); void on_tv_solo_enable_toggled (Glib::ustring const &); void on_tv_solo_isolate_toggled (Glib::ustring const &); + void on_tv_solo_safe_toggled (Glib::ustring const &); void build_menu (); void show_menu (); void route_deleted (Gtk::TreeModel::Path const &); @@ -75,6 +76,7 @@ private: void update_mute_display (); void update_solo_display (); void update_solo_isolate_display (); + void update_solo_safe_display (); void set_all_tracks_visibility (bool); void set_all_audio_visibility (int, bool); void show_all_routes (); @@ -102,6 +104,7 @@ private: add (mute_state); add (solo_state); add (solo_isolate_state); + add (solo_safe_state); add (is_track); add (tv); add (route); @@ -114,6 +117,7 @@ private: Gtk::TreeModelColumn mute_state; Gtk::TreeModelColumn solo_state; Gtk::TreeModelColumn solo_isolate_state; + Gtk::TreeModelColumn solo_safe_state; Gtk::TreeModelColumn is_track; Gtk::TreeModelColumn tv; Gtk::TreeModelColumn > route; diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 99b8b24a4b..284925d06a 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -766,7 +766,21 @@ RouteUI::solo_isolate_visual_state (boost::shared_ptr r) } if (r->solo_isolated()) { - return 1; + return 1; + } else { + return 0; + } +} + +int +RouteUI::solo_safe_visual_state (boost::shared_ptr r) +{ + if (r->is_master() || r->is_monitor()) { + return 0; + } + + if (r->solo_safe()) { + return 1; } else { return 0; } diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h index 43dc45d321..5741687040 100644 --- a/gtk2_ardour/route_ui.h +++ b/gtk2_ardour/route_ui.h @@ -196,6 +196,7 @@ class RouteUI : public virtual AxisView static int solo_visual_state (boost::shared_ptr); static int solo_visual_state_with_isolate (boost::shared_ptr); static int solo_isolate_visual_state (boost::shared_ptr); + static int solo_safe_visual_state (boost::shared_ptr); static int mute_visual_state (ARDOUR::Session*, boost::shared_ptr); protected: