#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"
{
set_session (s);
set_spacing (1);
- Config->ParameterChanged.connect (_parameter_connection, invalidator (*this), ui_bind (&LevelMeter::parameter_changed, this, _1), gui_context());
+ Config->ParameterChanged.connect (_parameter_connection, invalidator (*this), boost::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();
_meter = meter;
if (_meter) {
- _meter->ConfigurationChanged.connect (_configuration_connection, invalidator (*this), ui_bind (&LevelMeter::configuration_changed, this, _1, _2), gui_context());
+ _meter->ConfigurationChanged.connect (_configuration_connection, invalidator (*this), boost::bind (&LevelMeter::configuration_changed, this, _1, _2), gui_context());
}
}
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();
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);
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;
}