more transport button caironizing.

[ardour.git] / gtk2_ardour / mixer_ui.cc

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index e20f78a61b6424804d7c5d9fe9f959ac97d6452e..d6ed651e48ae4b534dcde47a43e64c842a8e536f 100644 (file)
--- 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"
 
@@ -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),
@@ -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];
 
@@ -884,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;
 }
 
@@ -1289,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());
@@ -1296,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));
 
@@ -1835,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);