Fix autoscroll fudge calculations. Remove some unused

[ardour.git] / gtk2_ardour / level_meter.cc

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 3ddc9d2f9429da460541ed6e9a60e12652cd2ca7..b073d54a7a62db765039f5619fa1b59b9a33bee9 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -26,12 +26,12 @@
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/barcontroller.h>
 #include "midi++/manager.h"
 #include "pbd/fastlog.h"
 
 #include "ardour_ui.h"
+#include "global_signals.h"
 #include "level_meter.h"
 #include "utils.h"
 #include "logmeter.h"
@@ -53,13 +53,13 @@ using namespace std;
 //sigc::signal<void,RouteGroup*> LevelMeter::ResetGroupPeakDisplays;
 
 
-LevelMeter::LevelMeter (Session& s)
-       : _session (s)
-       , _meter (0)
+LevelMeter::LevelMeter (Session* s)
+       : _meter (0)
        , meter_length (0)
 {
+       set_session (s);
        set_spacing (1);
-       Config->ParameterChanged.connect (sigc::mem_fun (*this, &LevelMeter::parameter_changed));
+       Config->ParameterChanged.connect (_parameter_connection, invalidator (*this), ui_bind (&LevelMeter::parameter_changed, this, _1), gui_context());
        UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &LevelMeter::on_theme_changed));
        ColorsChanged.connect (sigc::mem_fun (*this, &LevelMeter::color_handler));
        max_peak = minus_infinity();
@@ -83,9 +83,9 @@ LevelMeter::set_meter (PeakMeter* meter)
 {
        _configuration_connection.disconnect();
        _meter = meter;
+
        if (_meter) {
-               _configuration_connection = _meter->ConfigurationChanged.connect(
-                       sigc::mem_fun(*this, &LevelMeter::configuration_changed));
+               _meter->ConfigurationChanged.connect (_configuration_connection, invalidator (*this), ui_bind (&LevelMeter::configuration_changed, this, _1, _2), gui_context());
        }
 }
 
@@ -186,9 +186,9 @@ LevelMeter::setup_meters (int len, int initial_width)
        for (int32_t n = nmeters-1; nmeters && n >= 0 ; --n) {
                uint32_t b, m, t, c;
                if (n < nmidi) {
-                       b = ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorBase.get();
-                       m = ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorMid.get();
-                       t = ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorTop.get();
+                       b = ARDOUR_UI::config()->canvasvar_MidiMeterColorBase.get();
+                       m = ARDOUR_UI::config()->canvasvar_MidiMeterColorMid.get();
+                       t = ARDOUR_UI::config()->canvasvar_MidiMeterColorTop.get();
                        c = ARDOUR_UI::config()->canvasvar_MeterColorClip.get();
                } else {
                        b = ARDOUR_UI::config()->canvasvar_MeterColorBase.get();
@@ -199,11 +199,11 @@ LevelMeter::setup_meters (int len, int initial_width)
                if (meters[n].width != width || meters[n].length != len || color_changed) {
                        delete meters[n].meter;
                        meters[n].meter = new FastMeter ((uint32_t) floor (Config->get_meter_hold()), width, FastMeter::Vertical, len, b, m, t, c);
-                       //cerr << "LevelMeter::setup_meters() w:l = " << width << ":" << len << endl;//DEBUG
                        meters[n].width = width;
                        meters[n].length = len;
-                       meters[n].meter->add_events (Gdk::BUTTON_RELEASE_MASK);
-                       meters[n].meter->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &LevelMeter::meter_button_release), n));
+                       meters[n].meter->add_events (Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK);
+                       meters[n].meter->signal_button_press_event().connect (sigc::mem_fun (*this, &LevelMeter::meter_button_press));
+                       meters[n].meter->signal_button_release_event().connect (sigc::mem_fun (*this, &LevelMeter::meter_button_release));
                }
 
                pack_end (*meters[n].meter, false, false);
@@ -214,12 +214,19 @@ LevelMeter::setup_meters (int len, int initial_width)
        color_changed = false;
 }
 
-gint
-LevelMeter::meter_button_release (GdkEventButton* ev, uint32_t /*which*/)
+bool
+LevelMeter::meter_button_press (GdkEventButton* ev)
+{
+       return ButtonPress (ev); /* EMIT SIGNAL */
+}
+
+bool
+LevelMeter::meter_button_release (GdkEventButton* ev)
 {
        if (ev->button == 1) {
-               clear_meters();
+               clear_meters ();
        }
+
        return true;
 }