X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_route_groups.cc;h=64dc1e414b876d3e497ae47580c19362735bf355;hb=0038820f473664a9a4fb524537cd846a9e024661;hp=3f6a84980aa7c18966685a9426d218a18f055d55;hpb=790d9042c644843f8105c714fad641dd17b7d722;p=ardour.git

diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index 3f6a84980a..64dc1e414b 100644
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -24,31 +24,34 @@
 #include <cstdlib>
 #include <cmath>
 
+#include "fix_carbon.h"
+
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/cell_renderer_color_selector.h"
 
 #include "ardour/route_group.h"
+#include "ardour/route.h"
+#include "ardour/session.h"
 
+#include "ardour_ui.h"
 #include "editor.h"
+#include "editor_group_tabs.h"
+#include "editor_route_groups.h"
+#include "editor_routes.h"
+#include "gui_thread.h"
 #include "keyboard.h"
 #include "marker.h"
-#include "time_axis_view.h"
 #include "prompter.h"
-#include "gui_thread.h"
-#include "editor_group_tabs.h"
 #include "route_group_dialog.h"
 #include "route_time_axis.h"
-#include "editor_routes.h"
-#include "editor_route_groups.h"
-#include "ardour_ui.h"
-
-#include "ardour/route.h"
-#include "ardour/session.h"
+#include "time_axis_view.h"
+#include "utils.h"
 
 #include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using Gtkmm2ext::Keyboard;
@@ -61,7 +64,6 @@ struct ColumnInfo {
 
 EditorRouteGroups::EditorRouteGroups (Editor* e)
 	: EditorComponent (e)
-	, _all_group_active_button (_("No Selection = All Tracks?"))
 	, _in_row_change (false)
 	, _in_rebuild (false)
 {
@@ -70,11 +72,14 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
 
 	Gtkmm2ext::CellRendererColorSelector* color_renderer = manage (new Gtkmm2ext::CellRendererColorSelector);
 	TreeViewColumn* color_column = manage (new TreeViewColumn ("", *color_renderer));
+
 	color_column->add_attribute (color_renderer->property_color(), _columns.gdkcolor);
 	
 	_display.append_column (*color_column);
 
 	_display.append_column ("", _columns.text);
+	_display.append_column ("", _columns.is_visible);
+	_display.append_column ("", _columns.active_state);
 	_display.append_column ("", _columns.gain);
 	_display.append_column ("", _columns.gain_relative);
 	_display.append_column ("", _columns.mute);
@@ -82,26 +87,24 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
 	_display.append_column ("", _columns.record);
 	_display.append_column ("", _columns.monitoring);
 	_display.append_column ("", _columns.select);
-	_display.append_column ("", _columns.edits);
-	_display.append_column ("", _columns.active_state);
-	_display.append_column ("", _columns.is_visible);
+	_display.append_column ("", _columns.active_shared);
 
 	TreeViewColumn* col;
 	Gtk::Label* l;
 
 	ColumnInfo ci[] = {
-		{ 0, _("Col"), _("Group Tab Color") },
-		{ 1, _("Name"), _("Name of Group") },
-		{ 2, S_("group|G"), _("Sharing Gain?") },
-		{ 3, S_("relative|Rel"), _("Relevative Gain Changes?") },
-		{ 4, S_("mute|M"), _("Sharing Mute?") },
-		{ 5, S_("solo|S"), _("Sharing Solo?") },
-		{ 6, _("Rec"), _("Sharing Record-enable Status?") },
-		{ 7, S_("monitoring|Mon"), _("Sharing Monitoring Choice?") },
-		{ 8, S_("selection|Sel"), _("Sharing Selected Status?") },
-		{ 9, S_("editing|E"), _("Sharing Editing?") },
-		{ 10, S_("active|A"), _("Sharing Active Status?") },
-		{ 11, _("Show"), _("Group is visible?") },
+		{ 0,   _("Col"),            _("Group Tab Color") },
+		{ 1,   _("Name"),           _("Name of Group") },
+		{ 2,  S_("Visible|V"),      _("Group is visible?") },
+		{ 3,   _("On"),             _("Group is enabled?") },
+		{ 4,  S_("Group|G"),        _("Sharing Gain?") },
+		{ 5,  S_("Relative|Rel"),   _("Relative Gain Changes?") },
+		{ 6,  S_("Mute|M"),         _("Sharing Mute?") },
+		{ 7,  S_("Solo|S"),         _("Sharing Solo?") },
+		{ 8,   _("Rec"),            _("Sharing Record-enable Status?") },
+		{ 9,  S_("Monitoring|Mon"), _("Sharing Monitoring Choice?") },
+		{ 10, S_("Selection|Sel"),  _("Sharing Selected/Editing Status?") },
+		{ 11, S_("Active|A"),       _("Sharing Active Status?") },
 		{ -1, 0, 0 }
 	};
 
@@ -184,15 +187,8 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
 	button_box->pack_start (*add_button);
 	button_box->pack_start (*remove_button);
 
-	_all_group_active_button.show ();
-
 	_display_packer.pack_start (_scroller, true, true);
-	_display_packer.pack_start (_all_group_active_button, false, false);
 	_display_packer.pack_start (*button_box, false, false);
-
-	_all_group_active_button.signal_toggled().connect (sigc::mem_fun (*this, &EditorRouteGroups::all_group_toggled));
-	_all_group_active_button.set_name (X_("EditorRouteGroupsAllGroupButton"));
-	ARDOUR_UI::instance()->set_tip (_all_group_active_button, _("Activate this button to operate on all tracks when none are selected."));
 }
 
 void
@@ -201,7 +197,7 @@ EditorRouteGroups::remove_selected ()
 	Glib::RefPtr<TreeSelection> selection = _display.get_selection();
 	TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows ();
 
-	if (rows.empty()) {
+	if (rows.empty() || _session->deletion_in_progress()) {
 		return;
 	}
 
@@ -237,6 +233,7 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
 	int celly;
 	bool ret = false;
 	Gdk::Color c;
+	bool val;
 
 	bool const p = _display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly);
 
@@ -261,10 +258,11 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
 		return true;
 	}
 
+	group = (*iter)[_columns.routegroup];
+
 	switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) {
 	case 0: 
-		c = (*iter)[_columns.gdkcolor];
-
+		c =  (*iter)[_columns.gdkcolor];
 		color_dialog.get_colorsel()->set_previous_color (c);
 		color_dialog.get_colorsel()->set_current_color (c);
 
@@ -273,9 +271,7 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
 			break;
 		case RESPONSE_ACCEPT:
 			c = color_dialog.get_colorsel()->get_current_color();
-			(*iter)[_columns.gdkcolor] = c;
-			GroupTabs::set_group_color ((*iter)[_columns.routegroup], c);
-			ARDOUR_UI::config()->set_dirty ();
+			GroupTabs::set_group_color (group, gdk_color_to_rgba (c));
 			break;
 			
 		default:
@@ -288,107 +284,81 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
 		break;
 
 	case 1:
-		if (Keyboard::is_edit_event (ev)) {
-			if ((iter = _model->get_iter (path))) {
-				if ((group = (*iter)[_columns.routegroup]) != 0) {
-					ret = true;
-				}
-			}
-
+		if (Keyboard::is_edit_event (ev) && group) {
+			/* we'll be editing now ... */
+			ret = true;
 		}
 		break;
 
 	case 2:
-		if ((iter = _model->get_iter (path))) {
-			bool gain = (*iter)[_columns.gain];
-			(*iter)[_columns.gain] = !gain;
-			ret = true;
-		}
+		val = (*iter)[_columns.is_visible];
+		/* note subtle logic inverse here: we set the new value with
+		   "val", rather than !val, because we're using ::set_hidden()
+		   not a (non-existent) ::set_visible() call.
+		*/
+		group->set_hidden (val, this);
+		ret = true;
 		break;
 
+		
 	case 3:
-		if ((iter = _model->get_iter (path))) {
-			bool gain_relative = (*iter)[_columns.gain_relative];
-			(*iter)[_columns.gain_relative] = !gain_relative;
-			ret = true;
-		}
+		val = (*iter)[_columns.active_state];
+		group->set_active (!val, this);
+		ret = true;
 		break;
 
 	case 4:
-		if ((iter = _model->get_iter (path))) {
-			bool mute = (*iter)[_columns.mute];
-			(*iter)[_columns.mute] = !mute;
-			ret = true;
-		}
+		val = (*iter)[_columns.gain];
+		group->set_gain (!val);
+		ret = true;
 		break;
 
 	case 5:
-		if ((iter = _model->get_iter (path))) {
-			bool solo = (*iter)[_columns.solo];
-			(*iter)[_columns.solo] = !solo;
-			ret = true;
-		}
+		val = (*iter)[_columns.gain_relative];
+		group->set_relative (!val, this);
+		ret = true;
 		break;
 
 	case 6:
-		if ((iter = _model->get_iter (path))) {
-			bool record = (*iter)[_columns.record];
-			(*iter)[_columns.record] = !record;
-			ret = true;
-		}
+		val = (*iter)[_columns.mute];
+		group->set_mute (!val);
+		ret = true;
 		break;
 
 	case 7:
-		if ((iter = _model->get_iter (path))) {
-			bool monitoring = (*iter)[_columns.monitoring];
-			(*iter)[_columns.monitoring] = !monitoring;
-			ret = true;
-		}
+		val = (*iter)[_columns.solo];
+		group->set_solo (!val);
+		ret = true;
 		break;
 
 	case 8:
-		if ((iter = _model->get_iter (path))) {
-			bool select = (*iter)[_columns.select];
-			(*iter)[_columns.select] = !select;
-			ret = true;
-		}
+		val = (*iter)[_columns.record];
+		group->set_recenable (!val);
+		ret = true;
 		break;
 
 	case 9:
-		if ((iter = _model->get_iter (path))) {
-			bool edits = (*iter)[_columns.edits];
-			(*iter)[_columns.edits] = !edits;
-			ret = true;
-		}
+		val = (*iter)[_columns.monitoring];
+		group->set_monitoring (!val);
+		ret = true;
 		break;
 
 	case 10:
-		if ((iter = _model->get_iter (path))) {
-			bool active_state = (*iter)[_columns.active_state];
-			(*iter)[_columns.active_state] = !active_state;
-			ret = true;
-		}
+		val = (*iter)[_columns.select];
+		group->set_select (!val);
+		ret = true;
 		break;
 
 	case 11:
-		if ((iter = _model->get_iter (path))) {
-			bool is_visible = (*iter)[_columns.is_visible];
-			(*iter)[_columns.is_visible] = !is_visible;
-			ret = true;
-		}
+		val = (*iter)[_columns.active_shared];
+		group->set_route_active (!val);
+		ret = true;
 		break;
 
-		
 	default:
 		break;
 	}
 
-#ifdef GTKOSX
-	if (ret) {
-		_display.queue_draw();
-	}
-#endif
-
 	return ret;
 }
 
@@ -407,7 +377,7 @@ EditorRouteGroups::row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel
 
 	PropertyList plist;
 	plist.add (Properties::name, string ((*iter)[_columns.text]));
-	
+
 	bool val = (*iter)[_columns.gain];
 	plist.add (Properties::gain, val);
 	val = (*iter)[_columns.gain_relative];
@@ -422,18 +392,16 @@ EditorRouteGroups::row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel
 	plist.add (Properties::monitoring, val);
 	val = (*iter)[_columns.select];
 	plist.add (Properties::select, val);
-	val = (*iter)[_columns.edits];
-	plist.add (Properties::edit, val);
-	val = (*iter)[_columns.active_state];
+	val = (*iter)[_columns.active_shared];
 	plist.add (Properties::route_active, val);
-
-	GroupTabs::set_group_color ((*iter)[_columns.routegroup], (*iter)[_columns.gdkcolor]);
-	
-	group->set_hidden (!(*iter)[_columns.is_visible], this);
-
-	/* XXX set color here */
+	val = (*iter)[_columns.active_state];
+	plist.add (Properties::active, val);
+	val = (*iter)[_columns.is_visible];
+	plist.add (Properties::hidden, !val);
 
 	group->apply_changes (plist);
+
+	GroupTabs::set_group_color ((*iter)[_columns.routegroup], gdk_color_to_rgba ((*iter)[_columns.gdkcolor]));
 }
 
 void
@@ -451,10 +419,13 @@ EditorRouteGroups::add (RouteGroup* group)
 	row[_columns.record] = group->is_recenable();
 	row[_columns.monitoring] = group->is_monitoring();
 	row[_columns.select] = group->is_select ();
-	row[_columns.edits] = group->is_edit ();
-	row[_columns.active_state] = group->is_route_active ();
+	row[_columns.active_shared] = group->is_route_active ();
+	row[_columns.active_state] = group->is_active ();
 	row[_columns.is_visible] = !group->is_hidden();
-	row[_columns.gdkcolor] = GroupTabs::group_color (group);
+	
+	Gdk::Color c;
+	set_color_from_rgba (c, GroupTabs::group_color (group));
+	row[_columns.gdkcolor] = c;
 	
 	_in_row_change = true;
 
@@ -467,11 +438,11 @@ EditorRouteGroups::add (RouteGroup* group)
 		focus = true;
 	}
 
-	group->PropertyChanged.connect (_property_changed_connections, MISSING_INVALIDATOR, ui_bind (&EditorRouteGroups::property_changed, this, group, _1), gui_context());
+	group->PropertyChanged.connect (_property_changed_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::property_changed, this, group, _1), gui_context());
 
 	if (focus) {
 		TreeViewColumn* col = _display.get_column (0);
-		CellRendererText* name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (0));
+		CellRendererText* name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (1));
 		_display.set_cursor (_model->get_path (row), *col, *name_cell, true);
 	}
 
@@ -499,14 +470,21 @@ EditorRouteGroups::groups_changed ()
 }
 
 void
-EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange& change)
+EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&)
 {
+	assert(group);
 	_in_row_change = true;
 
 	Gtk::TreeModel::Children children = _model->children();
 
 	for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
 		if (group == (*iter)[_columns.routegroup]) {
+
+			/* we could check the PropertyChange and only set
+			 * appropriate fields. but the amount of saved by doing
+			 * that is pretty minimal, and this is nice and simple.
+			 */
+
 			(*iter)[_columns.text] = group->name();
 			(*iter)[_columns.gain] = group->is_gain ();
 			(*iter)[_columns.gain_relative] = group->is_relative ();
@@ -515,18 +493,19 @@ EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange& ch
 			(*iter)[_columns.record] = group->is_recenable ();
 			(*iter)[_columns.monitoring] = group->is_monitoring ();
 			(*iter)[_columns.select] = group->is_select ();
-			(*iter)[_columns.edits] = group->is_edit ();
-			(*iter)[_columns.active_state] = group->is_route_active ();
+			(*iter)[_columns.active_shared] = group->is_route_active ();
+			(*iter)[_columns.active_state] = group->is_active ();
 			(*iter)[_columns.is_visible] = !group->is_hidden();
-			(*iter)[_columns.gdkcolor] = GroupTabs::group_color (group);
-		}
-	}
 
-	_in_row_change = false;
+			Gdk::Color c;
+			set_color_from_rgba (c, GroupTabs::group_color (group));
+			(*iter)[_columns.gdkcolor] = c;
 
-	if (change.contains (Properties::name) || change.contains (Properties::color) || change.contains (Properties::active)) {
-		_editor->_group_tabs->set_dirty ();
+			break;
+		}
 	}
+	
+	_in_row_change = false;
 
 	for (TrackViewList::const_iterator i = _editor->get_track_views().begin(); i != _editor->get_track_views().end(); ++i) {
 		if ((*i)->route_group() == group) {
@@ -572,11 +551,7 @@ EditorRouteGroups::set_session (Session* s)
 
 	if (_session) {
 
-		RouteGroup& arg (_session->all_route_group());
-
-		arg.PropertyChanged.connect (all_route_groups_changed_connection, MISSING_INVALIDATOR, ui_bind (&EditorRouteGroups::all_group_changed, this, _1), gui_context());
-
-		_session->route_group_added.connect (_session_connections, MISSING_INVALIDATOR, ui_bind (&EditorRouteGroups::add, this, _1), gui_context());
+		_session->route_group_added.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::add, this, _1), gui_context());
 		_session->route_group_removed.connect (
 			_session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::groups_changed, this), gui_context()
 			);
@@ -588,7 +563,6 @@ EditorRouteGroups::set_session (Session* s)
 	PBD::PropertyChange pc;
 	pc.add (Properties::select);
 	pc.add (Properties::active);
-	all_group_changed (pc);
 
 	groups_changed ();
 }
@@ -601,25 +575,6 @@ EditorRouteGroups::run_new_group_dialog ()
 	return _editor->_group_tabs->run_new_group_dialog (rl);
 }
 
-void
-EditorRouteGroups::all_group_toggled ()
-{
-	if (_session) {
-		_session->all_route_group().set_select (_all_group_active_button.get_active());
-	}
-}
-
-void
-EditorRouteGroups::all_group_changed (const PropertyChange&)
-{
-	if (_session) {
-		RouteGroup& arg (_session->all_route_group());
-		_all_group_active_button.set_active (arg.is_active() && arg.is_select());
-	} else {
-		_all_group_active_button.set_active (false);
-	}
-}
-
 /** Called when a model row is deleted, but also when the model is
  *  reordered by a user drag-and-drop; the latter is what we are
  *  interested in here.
@@ -627,7 +582,7 @@ EditorRouteGroups::all_group_changed (const PropertyChange&)
 void
 EditorRouteGroups::row_deleted (Gtk::TreeModel::Path const &)
 {
-	if (_in_rebuild) {
+	if (_in_rebuild || !_session || _session->deletion_in_progress()) {
 		/* We need to ignore this in cases where we're not doing a drag-and-drop
 		   re-order.
 		*/