X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flevel_meter.cc;h=4a658640502b8af06badfb76da667b26fb968c40;hb=153ee4e441eeebc9aceaa3121e4a785c6011a962;hp=cd7308cfa26111205f4bbdf39167dacc3ef1e9b8;hpb=3be16e8afbd891c0bfe7227158384ed0d127597f;p=ardour.git diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index cd7308cfa2..4a65864050 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -19,22 +19,19 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "ardour/session.h" +#include "ardour/session_route.h" +#include "ardour/dB.h" +#include "ardour/meter.h" #include #include -#include #include -#include -#include +#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" @@ -42,8 +39,7 @@ #include "keyboard.h" #include "public_editor.h" -#include -#include +#include "ardour/session.h" #include "i18n.h" @@ -51,21 +47,21 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; -using namespace sigc; using namespace std; //sigc::signal LevelMeter::ResetAllPeakDisplays; //sigc::signal LevelMeter::ResetGroupPeakDisplays; -LevelMeter::LevelMeter (Session& s) - : _session (s) - +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(); } @@ -78,16 +74,19 @@ LevelMeter::on_theme_changed() LevelMeter::~LevelMeter () { for (vector::iterator i = meters.begin(); i != meters.end(); i++) { - if ((*i).meter) { - delete (*i).meter; - } + delete (*i).meter; } } void -LevelMeter::set_io (boost::shared_ptr io) +LevelMeter::set_meter (PeakMeter* meter) { - _io = io; + _configuration_connection.disconnect(); + _meter = meter; + + if (_meter) { + _meter->ConfigurationChanged.connect (_configuration_connection, invalidator (*this), ui_bind (&LevelMeter::configuration_changed, this, _1, _2), gui_context()); + } } float @@ -96,12 +95,16 @@ LevelMeter::update_meters () vector::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 = _io->peak_meter().peak_power (n); + peak = _meter->peak_power (n); (*i).meter->set (log_meter (peak)); - mpeak = _io->peak_meter().max_peak_power(n); + mpeak = _meter->max_peak_power(n); if (mpeak > max_peak) { max_peak = mpeak; } @@ -114,30 +117,32 @@ LevelMeter::update_meters () } 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::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*/) +{ + color_changed = true; + setup_meters (meter_length, regular_meter_width); } void LevelMeter::hide_all_meters () { - for (vector::iterator i = meters.begin(); i != meters.end(); ++i) { if ((*i).packed) { remove (*((*i).meter)); @@ -149,36 +154,18 @@ LevelMeter::hide_all_meters () void LevelMeter::setup_meters (int len, int initial_width) { - if (!_io) { - return; /* do it later */ - } - - uint32_t nmeters = _io->n_outputs().n_total(); - regular_meter_width = initial_width; - - guint16 width; - hide_all_meters (); - Route* r; - - if ((r = dynamic_cast (_io.get())) != 0) { - - switch (r->meter_point()) { - case MeterPreFader: - case MeterInput: - nmeters = r->n_inputs().n_total(); - break; - case MeterPostFader: - nmeters = r->n_outputs().n_total(); - break; - } - - } else { + if (!_meter) { + return; /* do it later or never */ + } - nmeters = _io->n_outputs().n_total(); + int32_t nmidi = _meter->input_streams().n_midi(); + uint32_t nmeters = _meter->input_streams().n_total(); + regular_meter_width = initial_width; + meter_length = len; - } + guint16 width; if (nmeters == 0) { return; @@ -194,23 +181,28 @@ LevelMeter::setup_meters (int len, int initial_width) meters.push_back (MeterInfo()); } - - int b = ARDOUR_UI::config()->canvasvar_MeterColorBase.get(); - int m = ARDOUR_UI::config()->canvasvar_MeterColorMid.get(); - int t = ARDOUR_UI::config()->canvasvar_MeterColorTop.get(); - int c = ARDOUR_UI::config()->canvasvar_MeterColorClip.get(); - //cerr << "LevelMeter::setup_meters() called color_changed = " << color_changed << " colors: " << endl;//DEBUG for (int32_t n = nmeters-1; nmeters && n >= 0 ; --n) { + uint32_t b, m, t, c; + if (n < nmidi) { + 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(); + m = ARDOUR_UI::config()->canvasvar_MeterColorMid.get(); + t = ARDOUR_UI::config()->canvasvar_MeterColorTop.get(); + c = ARDOUR_UI::config()->canvasvar_MeterColorClip.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 (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); @@ -222,14 +214,14 @@ LevelMeter::setup_meters (int len, int initial_width) } 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 () {