#include "ardour/meter.h"
#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/barcontroller.h>
-#include "midi++/manager.h"
#include "pbd/fastlog.h"
#include "ardour_ui.h"
#include "i18n.h"
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
using namespace PBD;
using namespace Gtkmm2ext;
using namespace Gtk;
using namespace std;
-LevelMeter::LevelMeter (Session* s)
- : _meter (0)
+LevelMeterBase::LevelMeterBase (Session* s, PBD::EventLoop::InvalidationRecord* ir, FastMeter::Orientation o)
+ : parent_invalidator(ir)
+ , _meter (0)
+ , _meter_orientation(o)
+ , regular_meter_width (6)
, meter_length (0)
, thin_meter_width(2)
{
set_session (s);
- set_spacing (1);
- 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));
+ Config->ParameterChanged.connect (_parameter_connection, parent_invalidator, boost::bind (&LevelMeterBase::parameter_changed, this, _1), gui_context());
+ UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &LevelMeterBase::on_theme_changed));
+ ColorsChanged.connect (sigc::mem_fun (*this, &LevelMeterBase::color_handler));
max_peak = minus_infinity();
meter_type = MeterPeak;
}
void
-LevelMeter::on_theme_changed()
+LevelMeterBase::on_theme_changed()
{
style_changed = true;
}
-LevelMeter::~LevelMeter ()
+LevelMeterBase::~LevelMeterBase ()
{
+ _configuration_connection.disconnect();
+ _meter_type_connection.disconnect();
+ _parameter_connection.disconnect();
for (vector<MeterInfo>::iterator i = meters.begin(); i != meters.end(); i++) {
delete (*i).meter;
}
+ meters.clear();
}
void
-LevelMeter::set_meter (PeakMeter* meter)
+LevelMeterBase::set_meter (PeakMeter* meter)
{
_configuration_connection.disconnect();
_meter_type_connection.disconnect();
_meter = meter;
+ color_changed = true;
if (_meter) {
- _meter->ConfigurationChanged.connect (_configuration_connection, invalidator (*this), boost::bind (&LevelMeter::configuration_changed, this, _1, _2), gui_context());
- _meter->TypeChanged.connect (_meter_type_connection, invalidator (*this), boost::bind (&LevelMeter::meter_type_changed, this, _1), gui_context());
+ _meter->ConfigurationChanged.connect (_configuration_connection, parent_invalidator, boost::bind (&LevelMeterBase::configuration_changed, this, _1, _2), gui_context());
+ _meter->TypeChanged.connect (_meter_type_connection, parent_invalidator, boost::bind (&LevelMeterBase::meter_type_changed, this, _1), gui_context());
}
}
-static float meter_lineup(float offset) {
- switch (Config->get_meter_line_up_level()) {
+static float meter_lineup_cfg(MeterLineUp lul, float offset) {
+ switch (lul) {
case MeteringLineUp24:
return offset + 6.0;
case MeteringLineUp20:
return offset;
}
+static float meter_lineup(float offset) {
+ return meter_lineup_cfg(Config->get_meter_line_up_level(), offset);
+}
+
static float vu_standard() {
// note - default meter config is +2dB (france)
switch (Config->get_meter_vu_standard()) {
}
float
-LevelMeter::update_meters ()
+LevelMeterBase::update_meters ()
{
vector<MeterInfo>::iterator i;
uint32_t n;
const float mpeak = _meter->meter_level(n, MeterMaxPeak);
if (mpeak > (*i).max_peak) {
(*i).max_peak = mpeak;
- (*i).meter->set_highlight(mpeak > Config->get_meter_peak());
+ (*i).meter->set_highlight(mpeak >= Config->get_meter_peak());
}
if (mpeak > max_peak) {
max_peak = mpeak;
} else if (meter_type == MeterIEC1NOR) {
(*i).meter->set (meter_deflect_nordic (peak + meter_lineup(0)));
} else if (meter_type == MeterIEC1DIN) {
- (*i).meter->set (meter_deflect_din (peak + meter_lineup(3.0)));
+ (*i).meter->set (meter_deflect_din (peak + meter_lineup_cfg(Config->get_meter_line_up_din(), 3.0)));
} else if (meter_type == MeterIEC2BBC || meter_type == MeterIEC2EBU) {
(*i).meter->set (meter_deflect_ppm (peak + meter_lineup(0)));
} else if (meter_type == MeterVU) {
(*i).meter->set (meter_deflect_vu (peak + vu_standard() + meter_lineup(0)));
+ } else if (meter_type == MeterK12) {
+ (*i).meter->set (meter_deflect_k (peak, 12), meter_deflect_k(_meter->meter_level(n, MeterPeak), 12));
} else if (meter_type == MeterK14) {
(*i).meter->set (meter_deflect_k (peak, 14), meter_deflect_k(_meter->meter_level(n, MeterPeak), 14));
} else if (meter_type == MeterK20) {
}
void
-LevelMeter::parameter_changed (string p)
+LevelMeterBase::parameter_changed (string p)
{
- ENSURE_GUI_THREAD (*this, &LevelMeter::parameter_changed, p)
+ ENSURE_GUI_THREAD (*this, &LevelMeterBase::parameter_changed, p)
if (p == "meter-hold") {
vector<MeterInfo>::iterator i;
color_changed = true;
setup_meters (meter_length, regular_meter_width, thin_meter_width);
}
+ else if (p == "meter-style-led") {
+ color_changed = true;
+ setup_meters (meter_length, regular_meter_width, thin_meter_width);
+ }
else if (p == "meter-peak") {
vector<MeterInfo>::iterator i;
uint32_t n;
}
void
-LevelMeter::configuration_changed (ChanCount /*in*/, ChanCount /*out*/)
+LevelMeterBase::configuration_changed (ChanCount /*in*/, ChanCount /*out*/)
{
color_changed = true;
setup_meters (meter_length, regular_meter_width, thin_meter_width);
}
void
-LevelMeter::meter_type_changed (MeterType t)
+LevelMeterBase::meter_type_changed (MeterType t)
{
meter_type = t;
color_changed = true;
}
void
-LevelMeter::hide_all_meters ()
+LevelMeterBase::hide_all_meters ()
{
for (vector<MeterInfo>::iterator i = meters.begin(); i != meters.end(); ++i) {
if ((*i).packed) {
- remove (*((*i).meter));
+ mtr_remove (*((*i).meter));
(*i).packed = false;
}
}
}
void
-LevelMeter::setup_meters (int len, int initial_width, int thin_width)
+LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
{
hide_all_meters ();
meters.push_back (MeterInfo());
}
- //cerr << "LevelMeter::setup_meters() called color_changed = " << color_changed << " colors: " << endl;//DEBUG
+ //cerr << "LevelMeterBase::setup_meters() called color_changed = " << color_changed << " colors: " << endl;//DEBUG
for (int32_t n = nmeters-1; nmeters && n >= 0 ; --n) {
uint32_t c[10];
uint32_t b[4];
float stp[4];
- b[0] = ARDOUR_UI::config()->canvasvar_MeterBackgroundBot.get();
- b[1] = ARDOUR_UI::config()->canvasvar_MeterBackgroundTop.get();
+ int styleflags = Config->get_meter_style_led() ? 3 : 1;
+ b[0] = ARDOUR_UI::config()->get_MeterBackgroundBot();
+ b[1] = ARDOUR_UI::config()->get_MeterBackgroundTop();
b[2] = 0x991122ff; // red highlight gradient Bot
b[3] = 0x551111ff; // red highlight gradient Top
if (n < nmidi) {
- c[0] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor0();
- c[1] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor1();
- c[2] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor2();
- c[3] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor3();
- c[4] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor4();
- c[5] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor5();
- c[6] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor6();
- c[7] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor7();
- c[8] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor8();
- c[9] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor9();
+ c[0] = ARDOUR_UI::config()->get_MidiMeterColor0();
+ c[1] = ARDOUR_UI::config()->get_MidiMeterColor1();
+ c[2] = ARDOUR_UI::config()->get_MidiMeterColor2();
+ c[3] = ARDOUR_UI::config()->get_MidiMeterColor3();
+ c[4] = ARDOUR_UI::config()->get_MidiMeterColor4();
+ c[5] = ARDOUR_UI::config()->get_MidiMeterColor5();
+ c[6] = ARDOUR_UI::config()->get_MidiMeterColor6();
+ c[7] = ARDOUR_UI::config()->get_MidiMeterColor7();
+ c[8] = ARDOUR_UI::config()->get_MidiMeterColor8();
+ c[9] = ARDOUR_UI::config()->get_MidiMeterColor9();
stp[0] = 115.0 * 32.0 / 128.0;
stp[1] = 115.0 * 64.0 / 128.0;
stp[2] = 115.0 * 100.0 / 128.0;
stp[3] = 115.0 * 112.0 / 128.0;
} else {
- c[0] = ARDOUR_UI::config()->get_canvasvar_MeterColor0();
- c[1] = ARDOUR_UI::config()->get_canvasvar_MeterColor1();
- c[2] = ARDOUR_UI::config()->get_canvasvar_MeterColor2();
- c[3] = ARDOUR_UI::config()->get_canvasvar_MeterColor3();
- c[4] = ARDOUR_UI::config()->get_canvasvar_MeterColor4();
- c[5] = ARDOUR_UI::config()->get_canvasvar_MeterColor5();
- c[6] = ARDOUR_UI::config()->get_canvasvar_MeterColor6();
- c[7] = ARDOUR_UI::config()->get_canvasvar_MeterColor7();
- c[8] = ARDOUR_UI::config()->get_canvasvar_MeterColor8();
- c[9] = ARDOUR_UI::config()->get_canvasvar_MeterColor9();
+ c[0] = ARDOUR_UI::config()->get_MeterColor0();
+ c[1] = ARDOUR_UI::config()->get_MeterColor1();
+ c[2] = ARDOUR_UI::config()->get_MeterColor2();
+ c[3] = ARDOUR_UI::config()->get_MeterColor3();
+ c[4] = ARDOUR_UI::config()->get_MeterColor4();
+ c[5] = ARDOUR_UI::config()->get_MeterColor5();
+ c[6] = ARDOUR_UI::config()->get_MeterColor6();
+ c[7] = ARDOUR_UI::config()->get_MeterColor7();
+ c[8] = ARDOUR_UI::config()->get_MeterColor8();
+ c[9] = ARDOUR_UI::config()->get_MeterColor9();
switch (meter_type) {
case MeterK20:
c[6] = c[7] = 0xffff00ff;
c[8] = c[9] = 0xff0000ff;
break;
- case MeterIEC2EBU:
+ case MeterK12:
+ stp[0] = 115.0 * meter_deflect_k(-32, 12); //-20
+ stp[1] = 115.0 * meter_deflect_k(-12, 12); // 0
+ stp[2] = 115.0 * meter_deflect_k(-10, 12); // +2
+ stp[3] = 115.0 * meter_deflect_k( -8, 12); // +4
+ c[0] = c[1] = 0x008800ff;
+ c[2] = c[3] = 0x00ff00ff;
+ c[4] = c[5] = 0xffff00ff;
+ c[6] = c[7] = 0xffff00ff;
+ c[8] = c[9] = 0xff0000ff;
+ break;
case MeterIEC2BBC:
- stp[0] = 115.0 * meter_deflect_ppm(-18);
- stp[1] = 115.0 * meter_deflect_ppm(-14);
- stp[2] = 115.0 * meter_deflect_ppm(-10);
- stp[3] = 115.0 * meter_deflect_ppm( -8);
+ c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = c[6] = c[7] = c[8] = c[9] =
+ ARDOUR_UI::config()->color ("meter color BBC");
+ stp[0] = stp[1] = stp[2] = stp[3] = 115.0;
+ break;
+ case MeterIEC2EBU:
+ stp[0] = 115.0 * meter_deflect_ppm(-24); // ignored
+ stp[1] = 115.0 * meter_deflect_ppm(-18);
+ stp[2] = 115.0 * meter_deflect_ppm( -9);
+ stp[3] = 115.0 * meter_deflect_ppm( 0); // ignored
+ c[3] = c[2] = c[1];
+ c[6] = c[7] = c[8] = c[9];
break;
case MeterIEC1NOR:
- stp[0] = 115.0 * meter_deflect_nordic(-18);
- stp[1] = 115.0 * meter_deflect_nordic(-15);
+ stp[0] = 115.0 * meter_deflect_nordic(-30); // ignored
+ stp[1] = 115.0 * meter_deflect_nordic(-18);
stp[2] = 115.0 * meter_deflect_nordic(-12);
- stp[3] = 115.0 * meter_deflect_nordic( -9);
+ stp[3] = 115.0 * meter_deflect_nordic( -9); // ignored
+ c[0] = c[1] = c[2]; // bright-green
+ c[6] = c[7] = c[8] = c[9];
break;
case MeterIEC1DIN:
- stp[0] = 115.0 * meter_deflect_din(-29);
+ stp[0] = 115.0 * meter_deflect_din(-29); // ignored
stp[1] = 115.0 * meter_deflect_din(-18);
- stp[2] = 115.0 * meter_deflect_din(-15);
+ stp[2] = 115.0 * meter_deflect_din(-15); // ignored
stp[3] = 115.0 * meter_deflect_din( -9);
+ c[0] = c[2] = c[3] = c[1];
+ c[4] = c[6];
+ c[5] = c[7];
break;
case MeterVU:
stp[0] = 115.0 * meter_deflect_vu(-26); // -6
stp[1] = 115.0 * meter_deflect_vu(-23); // -3
stp[2] = 115.0 * meter_deflect_vu(-20); // 0
stp[3] = 115.0 * meter_deflect_vu(-18); // +2
- b[0] = 0x80806dff;
- b[1] = 0xc0c0a3ff;
+ c[0] = c[2] = c[3] = c[4] = c[5] = c[1];
+ c[7] = c[8] = c[9] = c[6];
break;
default: // PEAK, RMS
stp[1] = 77.5; // 115 * log_meter(-10)
}
}
}
- if (meters[n].width != width || meters[n].length != len || color_changed) {
+ if (meters[n].width != width || meters[n].length != len || color_changed || meter_type != visible_meter_type) {
+ bool hl = meters[n].meter ? meters[n].meter->get_highlight() : false;
+ meters[n].packed = false;
delete meters[n].meter;
- meters[n].meter = new FastMeter ((uint32_t) floor (Config->get_meter_hold()), width, FastMeter::Vertical, len,
+ meters[n].meter = new FastMeter ((uint32_t) floor (Config->get_meter_hold()), width, _meter_orientation, len,
c[0], c[1], c[2], c[3], c[4],
c[5], c[6], c[7], c[8], c[9],
b[0], b[1], b[2], b[3],
- stp[0], stp[1], stp[2], stp[3]
+ stp[0], stp[1], stp[2], stp[3],
+ styleflags
);
+ meters[n].meter->set_highlight(hl);
meters[n].width = width;
meters[n].length = len;
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));
+ meters[n].meter->signal_button_press_event().connect (sigc::mem_fun (*this, &LevelMeterBase::meter_button_press), false);
+ meters[n].meter->signal_button_release_event().connect (sigc::mem_fun (*this, &LevelMeterBase::meter_button_release), false);
}
- pack_end (*meters[n].meter, false, false);
+ //pack_end (*meters[n].meter, false, false);
+ mtr_pack (*meters[n].meter);
meters[n].meter->show_all ();
meters[n].packed = true;
}
- show();
+ //show();
color_changed = false;
+ visible_meter_type = meter_type;
}
void
-LevelMeter::set_type(MeterType t)
+LevelMeterBase::set_type(MeterType t)
{
meter_type = t;
_meter->set_type(t);
}
bool
-LevelMeter::meter_button_press (GdkEventButton* ev)
+LevelMeterBase::meter_button_press (GdkEventButton* ev)
{
- return ButtonPress (ev); /* EMIT SIGNAL */
+ return !!ButtonPress (ev); /* EMIT SIGNAL */
}
bool
-LevelMeter::meter_button_release (GdkEventButton* ev)
+LevelMeterBase::meter_button_release (GdkEventButton* ev)
{
if (ev->button == 1) {
clear_meters (false);
}
+ ButtonRelease(ev);
return true;
}
-void LevelMeter::clear_meters (bool reset_highlight)
+void LevelMeterBase::clear_meters (bool reset_highlight)
{
for (vector<MeterInfo>::iterator i = meters.begin(); i < meters.end(); i++) {
(*i).meter->clear();
max_peak = minus_infinity();
}
-void LevelMeter::hide_meters ()
+void LevelMeterBase::hide_meters ()
{
hide_all_meters();
}
void
-LevelMeter::color_handler ()
+LevelMeterBase::color_handler ()
{
color_changed = true;
+ setup_meters (meter_length, regular_meter_width, thin_meter_width);
}
+LevelMeterHBox::LevelMeterHBox(Session* s)
+ : LevelMeterBase(s, invalidator(*this))
+{
+ set_spacing(1);
+ show();
+}
+
+
+LevelMeterHBox::~LevelMeterHBox() {}
+
+void
+LevelMeterHBox::mtr_pack(Gtk::Widget &w) {
+ pack_end (w, false, false);
+}
+
+void
+LevelMeterHBox::mtr_remove(Gtk::Widget &w) {
+ remove (w);
+}
+
+
+LevelMeterVBox::LevelMeterVBox(Session* s)
+ : LevelMeterBase(s, invalidator(*this), FastMeter::Horizontal)
+{
+ set_spacing(1);
+ show();
+}
+LevelMeterVBox::~LevelMeterVBox() {}
+
+void
+LevelMeterVBox::mtr_pack(Gtk::Widget &w) {
+ pack_end (w, false, false);
+}
+
+void
+LevelMeterVBox::mtr_remove(Gtk::Widget &w) {
+ remove (w);
+}