fix incorrect accumulation of export video options each time the dialog is used

[ardour.git] / gtk2_ardour / meter_strip.cc

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index 82acd1dad579dc57de0c66eafbe8b59e47e9d5f1..094d5170db19f468f2470d333c72b555731e2382 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"
@@ -29,15 +30,15 @@
 #include "ardour/audio_track.h"
 #include "ardour/midi_track.h"
 
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/keyboard.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/rgb_macros.h>
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/keyboard.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/rgb_macros.h"
+
+#include "widgets/tooltips.h"
 
-#include "logmeter.h"
 #include "gui_thread.h"
 #include "ardour_window.h"
-#include "tooltips.h"
 #include "ui_config.h"
 #include "utils.h"
 
@@ -45,9 +46,10 @@
 #include "meter_strip.h"
 #include "meter_patterns.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
+using namespace ArdourWidgets;
 using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
@@ -62,8 +64,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 +118,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 +144,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));
@@ -183,8 +184,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        name_label.set_layout_ellipsize_width(48 * PANGO_SCALE);
        name_label.set_size_request(PX_SCALE(18, 18), PX_SCALE(50, 50));
        name_label.set_alignment(-1.0, .5);
-       set_tooltip (name_label, _route->name());
-       set_tooltip (*level_meter, _route->name());
+       set_tooltip (name_label, Gtkmm2ext::markup_escape_text (_route->name()));
+       set_tooltip (*level_meter, Gtkmm2ext::markup_escape_text (_route->name()));
 
        number_label.set_corner_radius(2);
        number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
@@ -294,7 +295,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);
@@ -366,7 +366,7 @@ MeterStrip::set_button_names()
 {
        mute_button->set_text (S_("Mute|M"));
 
-       if (_route && _route->solo_safe()) {
+       if (_route && _route->solo_safe_control()->solo_safe()) {
                solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
        } else {
                solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
@@ -389,7 +389,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;
@@ -488,7 +488,7 @@ MeterStrip::set_tick_bar (int m)
        } else {
                n = meter_ticks1_area.get_name();
                if (n.substr(0,3) == "Bar") {
-                       meter_ticks1_area.set_name(n.substr(3,-1));
+                       meter_ticks1_area.set_name (n.substr (3));
                }
        }
        if (_tick_bar & 2) {
@@ -499,7 +499,7 @@ MeterStrip::set_tick_bar (int m)
        } else {
                n = meter_ticks2_area.get_name();
                if (n.substr(0,3) == "Bar") {
-                       meter_ticks2_area.set_name(n.substr(3,-1));
+                       meter_ticks2_area.set_name (n.substr (3));
                }
        }
 }
@@ -801,12 +801,12 @@ MeterStrip::name_changed () {
        }
        name_label.set_text(_route->name ());
        if (_session && _session->config.get_track_name_number()) {
-               const int64_t track_number = _route->track_number ();
+               const uint64_t track_number = _route->track_number();
                if (track_number == 0) {
                        number_label.set_text("-");
                        number_label.hide();
                } else {
-                       number_label.set_text (PBD::to_string (abs(_route->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 +929,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 +955,29 @@ 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);
+                       break;
                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 ();
+}
+