#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"
using namespace PBD;
using namespace Gtkmm2ext;
using namespace Gtk;
-using namespace sigc;
using namespace std;
//sigc::signal<void> LevelMeter::ResetAllPeakDisplays;
//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 (mem_fun (*this, &LevelMeter::parameter_changed));
- UI::instance()->theme_changed.connect (mem_fun(*this, &LevelMeter::on_theme_changed));
- ColorsChanged.connect (mem_fun (*this, &LevelMeter::color_handler));
+ 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();
}
}
void
-LevelMeter::set_meter (PeakMeter& meter)
+LevelMeter::set_meter (PeakMeter* meter)
{
_configuration_connection.disconnect();
- _meter = &meter;
- _configuration_connection = _meter->ConfigurationChanged.connect(
- mem_fun(*this, &LevelMeter::configuration_changed));
+ _meter = meter;
+
+ if (_meter) {
+ _meter->ConfigurationChanged.connect (_configuration_connection, invalidator (*this), ui_bind (&LevelMeter::configuration_changed, this, _1, _2), gui_context());
+ }
}
float
vector<MeterInfo>::iterator i;
uint32_t n;
float peak, mpeak;
-
+
+ if (!_meter) {
+ return 0.0f;
+ }
+
for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
if ((*i).packed) {
peak = _meter->peak_power (n);
}
void
-LevelMeter::parameter_changed(const char* parameter_name)
+LevelMeter::parameter_changed (string p)
{
-#define PARAM_IS(x) (!strcmp (parameter_name, (x)))
+ ENSURE_GUI_THREAD (*this, &LevelMeter::parameter_changed, p)
- ENSURE_GUI_THREAD (bind (mem_fun(*this, &LevelMeter::parameter_changed), parameter_name));
+ if (p == "meter-hold") {
- if (PARAM_IS ("meter-hold")) {
-
vector<MeterInfo>::iterator i;
uint32_t n;
-
+
for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
-
+
(*i).meter->set_hold_count ((uint32_t) floor(Config->get_meter_hold()));
}
}
-
-#undef PARAM_IS
}
void
-LevelMeter::configuration_changed(ChanCount in, ChanCount out)
+LevelMeter::configuration_changed (ChanCount /*in*/, ChanCount /*out*/)
{
color_changed = true;
setup_meters (meter_length, regular_meter_width);
void
LevelMeter::setup_meters (int len, int initial_width)
{
+ hide_all_meters ();
+
if (!_meter) {
- return; /* do it later */
+ return; /* do it later or never */
}
-
+
int32_t nmidi = _meter->input_streams().n_midi();
uint32_t nmeters = _meter->input_streams().n_total();
regular_meter_width = initial_width;
guint16 width;
- hide_all_meters ();
-
if (nmeters == 0) {
return;
}
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();
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 (bind (mem_fun(*this, &LevelMeter::meter_button_release), n));
+ meters[n].meter->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &LevelMeter::meter_button_release), n));
}
pack_end (*meters[n].meter, false, false);
}
gint
-LevelMeter::meter_button_release (GdkEventButton* ev, uint32_t which)
+LevelMeter::meter_button_release (GdkEventButton* ev, uint32_t /*which*/)
{
if (ev->button == 1) {
clear_meters();
}
return true;
}
-
+
void LevelMeter::clear_meters ()
{