Fix engine-state history.

[ardour.git] / gtk2_ardour / meter_strip.cc

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index c8992ee0b25ba7fa20941aa6fcb38ce069b073ea..c3b08345254ec4dde2a3e5b8d27b7d5a6b03723d 100644 (file)
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -21,6 +21,7 @@
 
 #include <sigc++/bind.h>
 
+#include "ardour/logmeter.h"
 #include "ardour/session.h"
 #include "ardour/route.h"
 #include "ardour/route_group.h"
@@ -34,7 +35,6 @@
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/rgb_macros.h>
 
-#include "logmeter.h"
 #include "gui_thread.h"
 #include "ardour_window.h"
 #include "tooltips.h"
@@ -45,7 +45,7 @@
 #include "meter_strip.h"
 #include "meter_patterns.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
@@ -62,8 +62,7 @@ PBD::Signal0<void> MeterStrip::ConfigurationChanged;
 #define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * UIConfiguration::instance().get_ui_scale()))
 
 MeterStrip::MeterStrip (int metricmode, MeterType mt)
-       : AxisView(0)
-       , RouteUI(0)
+       : RouteUI ((Session*) 0)
 {
        level_meter = 0;
        _strip_type = 0;
@@ -117,7 +116,7 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt)
 }
 
 MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
-       : AxisView(sess)
+       : SessionHandlePtr (sess)
        , RouteUI(0)
        , _route(rt)
        , peak_display()
@@ -143,7 +142,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        level_meter = new LevelMeterHBox(sess);
        level_meter->set_meter (_route->shared_peak_meter().get());
        level_meter->clear_meters();
-       level_meter->set_type (_route->meter_type());
+       level_meter->set_meter_type (_route->meter_type());
        level_meter->setup_meters (220, meter_width, 6);
        level_meter->ButtonPress.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::level_meter_button_press, this, _1));
        level_meter->MeterTypeChanged.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::meter_type_changed, this, _1));
@@ -294,7 +293,6 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        meter_ticks2_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks2_expose));
 
        _route->DropReferences.connect (meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::self_delete, this), gui_context());
-       _route->PropertyChanged.connect (meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::strip_property_changed, this, _1), gui_context());
 
        peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &MeterStrip::peak_button_release), false);
        name_label.signal_button_release_event().connect (sigc::mem_fun(*this, &MeterStrip::name_label_button_release), false);
@@ -389,7 +387,7 @@ MeterStrip::set_button_names()
 }
 
 void
-MeterStrip::strip_property_changed (const PropertyChange& what_changed)
+MeterStrip::route_property_changed (const PropertyChange& what_changed)
 {
        if (!what_changed.contains (ARDOUR::Properties::name)) {
                return;
@@ -806,7 +804,7 @@ MeterStrip::name_changed () {
                        number_label.set_text("-");
                        number_label.hide();
                } else {
-                       number_label.set_text (PBD::to_string (track_number, std::dec));
+                       number_label.set_text (PBD::to_string (track_number));
                        number_label.show();
                }
                const int tnh = 4 + std::max(2u, _session->track_number_decimals()) * 8; // TODO 8 = max_width_of_digit_0_to_9()
@@ -929,7 +927,7 @@ MeterStrip::set_meter_type (MeterType type)
        if (_suspend_menu_callbacks) return;
        if (_route->meter_type() == type) return;
 
-       level_meter->set_type (type);
+       level_meter->set_meter_type (type);
 }
 
 void
@@ -955,15 +953,28 @@ MeterStrip::set_meter_type_multi (int what, RouteGroup* group, MeterType type)
        switch (what) {
                case -1:
                        if (_route && group == _route->route_group()) {
-                               level_meter->set_type (type);
+                               level_meter->set_meter_type (type);
                        }
                        break;
                case 0:
-                       level_meter->set_type (type);
+                       level_meter->set_meter_type (type);
                default:
                        if (what == _strip_type) {
-                               level_meter->set_type (type);
+                               level_meter->set_meter_type (type);
                        }
                        break;
        }
 }
+
+string
+MeterStrip::name () const
+{
+       return _route->name();
+}
+
+Gdk::Color
+MeterStrip::color () const
+{
+       return RouteUI::route_color ();
+}
+