X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.cc;h=d6ed651e48ae4b534dcde47a43e64c842a8e536f;hb=c9f9bb263fc3f96e383216d515c62ac6706b56da;hp=626d2f68a84ef818fde41c706b945f5a2a4c85de;hpb=bd5713f009a2dcc669e98a85063fecdf95bf409f;p=ardour.git

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 626d2f68a8..d6ed651e48 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -57,6 +57,7 @@
 #include "actions.h"
 #include "gui_thread.h"
 #include "mixer_group_tabs.h"
+#include "timers.h"
 
 #include "i18n.h"
 
@@ -91,7 +92,7 @@ Mixer_UI::Mixer_UI ()
 	, in_group_row_change (false)
 	, track_menu (0)
 	, _monitor_section (0)
-	, _strip_width (Config->get_default_narrow_ms() ? Narrow : Wide)
+	, _strip_width (ARDOUR_UI::config()->get_default_narrow_ms() ? Narrow : Wide)
 	, ignore_reorder (false)
         , _in_group_rebuild_or_clear (false)
         , _route_deletion_in_progress (false)
@@ -200,7 +201,7 @@ Mixer_UI::Mixer_UI ()
 #else
 	global_hpacker.pack_start (out_packer, false, false, 12);
 #endif
-	list_hpane.pack1(list_vpacker, true, true);
+	list_hpane.pack1(list_vpacker, false, false);
 	list_hpane.pack2(global_hpacker, true, false);
 
 	rhs_pane1.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::pane_allocation_handler),
@@ -368,7 +369,7 @@ Mixer_UI::add_strips (RouteList& routes)
 			strip = new MixerStrip (*this, _session, route);
 			strips.push_back (strip);
 
-			Config->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
+			ARDOUR_UI::config()->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
 			
 			if (strip->width_owner() != strip) {
 				strip->set_width_enum (_strip_width, this);
@@ -472,6 +473,17 @@ Mixer_UI::reset_remote_control_ids ()
 	uint32_t invisible_key = UINT32_MAX;
 
 	for (ri = rows.begin(); ri != rows.end(); ++ri) {
+
+		/* skip two special values */
+		
+		if (rid == Route::MasterBusRemoteControlID) {
+			rid++;
+		}
+		
+		if (rid == Route::MonitorBusRemoteControlID) {
+			rid++;
+		}
+
 		boost::shared_ptr<Route> route = (*ri)[track_columns.route];
 		bool visible = (*ri)[track_columns.visible];
 
@@ -618,7 +630,7 @@ Mixer_UI::sync_treeview_from_order_keys ()
 void
 Mixer_UI::follow_editor_selection ()
 {
-	if (!Config->get_link_editor_and_mixer_selection() || _following_editor_selection) {
+	if (!ARDOUR_UI::config()->get_link_editor_and_mixer_selection() || _following_editor_selection) {
 		return;
 	}
 
@@ -676,6 +688,7 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
 					
 					vector<MixerStrip*> tmp;
 					bool accumulate = false;
+					bool found_another = false;
 					
 					tmp.push_back (strip);
 
@@ -694,6 +707,7 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
 							/* hit selected strip. if currently accumulating others,
 							   we're done. if not accumulating others, start doing so.
 							*/
+							found_another = true;
 							if (accumulate) {
 								/* done */
 								break;
@@ -707,9 +721,12 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
 						}
 					}
 
-					for (vector<MixerStrip*>::iterator i = tmp.begin(); i != tmp.end(); ++i) {
-						_selection.add (*i);
-					}
+					if (found_another) {
+						for (vector<MixerStrip*>::iterator i = tmp.begin(); i != tmp.end(); ++i) {
+							_selection.add (*i);
+						}
+					} else
+						_selection.set (strip);  //user wants to start a range selection, but there aren't any others selected yet
 				}
 
 			} else {
@@ -879,7 +896,7 @@ Mixer_UI::hide_strip (MixerStrip* ms)
 gint
 Mixer_UI::start_updating ()
 {
-    fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (sigc::mem_fun(*this, &Mixer_UI::fast_update_strips));
+    fast_screen_update_connection = Timers::super_rapid_connect (sigc::mem_fun(*this, &Mixer_UI::fast_update_strips));
     return 0;
 }
 
@@ -1284,6 +1301,14 @@ Mixer_UI::route_groups_changed ()
 
 	group_model->clear ();
 
+#if 0
+	/* this is currently not used,
+	 * Mixer_UI::group_display_button_press() has a case for it,
+	 * and a commented edit_route_group() but that's n/a since 2011.
+	 *
+	 * This code is left as reminder that
+	 * row[group_columns.group] = 0 has special meaning.
+	 */
 	{
 		TreeModel::Row row;
 		row = *(group_model->append());
@@ -1291,6 +1316,7 @@ Mixer_UI::route_groups_changed ()
 		row[group_columns.text] = (_("-all-"));
 		row[group_columns.group] = 0;
 	}
+#endif
 
 	_session->foreach_route_group (sigc::mem_fun (*this, &Mixer_UI::add_route_group));
 
@@ -1793,7 +1819,7 @@ Mixer_UI::parameter_changed (string const & p)
 			_group_tabs->hide ();
 		}
 	} else if (p == "default-narrow_ms") {
-		bool const s = Config->get_default_narrow_ms ();
+		bool const s = ARDOUR_UI::config()->get_default_narrow_ms ();
 		for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
 			(*i)->set_width_enum (s ? Narrow : Wide, this);
 		}
@@ -1830,6 +1856,7 @@ Mixer_UI::setup_track_display ()
 	track_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
 	track_display.get_column (0)->set_expand(true);
 	track_display.get_column (1)->set_expand(false);
+	track_display.get_column (0)->set_sizing (Gtk::TREE_VIEW_COLUMN_FIXED);
 	track_display.set_name (X_("EditGroupList"));
 	track_display.get_selection()->set_mode (Gtk::SELECTION_NONE);
 	track_display.set_reorderable (true);