move utility functions into a dedicated namespace

[ardour.git] / gtk2_ardour / meterbridge.cc

diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc
index 4a4f1dd8dd3a81ad3023c1d31db7d13eb7822560..5da4d3fdb55ad1efb3cd5fff5e54abc5ecfa5c79 100644 (file)
--- a/gtk2_ardour/meterbridge.cc
+++ b/gtk2_ardour/meterbridge.cc
@@ -57,6 +57,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using namespace Glib;
@@ -92,7 +93,7 @@ struct SignalOrderRouteSorter {
                        /* everything comes before b */
                        return true;
                }
-               return a->order_key (MixerSort) < b->order_key (MixerSort);
+               return a->order_key () < b->order_key ();
        }
 };
 
@@ -138,7 +139,7 @@ Meterbridge::Meterbridge ()
 
        signal_delete_event().connect (sigc::mem_fun (*this, &Meterbridge::hide_window));
        signal_configure_event().connect (sigc::mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
-       Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Meterbridge::sync_order_keys, this, _1), gui_context());
+       Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Meterbridge::sync_order_keys, this), gui_context());
        MeterStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Meterbridge::remove_strip, this, _1), gui_context());
        MeterStrip::MetricChanged.connect (*this, invalidator (*this), boost::bind(&Meterbridge::resync_order, this), gui_context());
        MeterStrip::ConfigurationChanged.connect (*this, invalidator (*this), boost::bind(&Meterbridge::queue_resize, this), gui_context());
@@ -637,7 +638,7 @@ Meterbridge::remove_strip (MeterStrip* strip)
 }
 
 void
-Meterbridge::sync_order_keys (RouteSortOrderKey)
+Meterbridge::sync_order_keys ()
 {
        Glib::Threads::Mutex::Lock lm (_resync_mutex);
 
@@ -702,11 +703,11 @@ Meterbridge::sync_order_keys (RouteSortOrderKey)
 
                MeterType nmt = (*i).s->meter_type();
                if (nmt == MeterKrms) nmt = MeterPeak; // identical metrics
-               if (pos == 0) {
+               if (vis == 1) {
                        (*i).s->set_tick_bar(1);
                }
 
-               if ((*i).visible && nmt != lmt && pos == 0) {
+               if ((*i).visible && nmt != lmt && vis == 1) {
                        lmt = nmt;
                        metrics_left.set_metric_mode(1, lmt);
                } else if ((*i).visible && nmt != lmt) {
@@ -776,7 +777,7 @@ Meterbridge::sync_order_keys (RouteSortOrderKey)
 void
 Meterbridge::resync_order()
 {
-       sync_order_keys(MixerSort);
+       sync_order_keys();
 }
 
 void