#include "ardour/meter.h"
#include <gtkmm2ext/utils.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;
LevelMeterBase::LevelMeterBase (Session* s, PBD::EventLoop::InvalidationRecord* ir, FastMeter::Orientation o)
- : _meter (0)
- , parent_invalidator(ir)
+ : parent_invalidator(ir)
+ , _meter (0)
, _meter_orientation(o)
+ , regular_meter_width (6)
, meter_length (0)
, thin_meter_width(2)
{
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
_meter_type_connection.disconnect();
_meter = meter;
+ color_changed = true;
if (_meter) {
_meter->ConfigurationChanged.connect (_configuration_connection, parent_invalidator, boost::bind (&LevelMeterBase::configuration_changed, this, _1, _2), gui_context());
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;
(*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) {
uint32_t b[4];
float stp[4];
int styleflags = Config->get_meter_style_led() ? 3 : 1;
- b[0] = ARDOUR_UI::config()->canvasvar_MeterBackgroundBot.get();
- b[1] = ARDOUR_UI::config()->canvasvar_MeterBackgroundTop.get();
+ 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 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:
c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = c[6] = c[7] = c[8] = c[9] =
- ARDOUR_UI::config()->color_by_name ("meter color BBC");
+ ARDOUR_UI::config()->color ("meter color BBC");
stp[0] = stp[1] = stp[2] = stp[3] = 115.0;
break;
case MeterIEC2EBU:
stp[1] = 115.0 * meter_deflect_nordic(-18);
stp[2] = 115.0 * meter_deflect_nordic(-12);
stp[3] = 115.0 * meter_deflect_nordic( -9); // ignored
- //c[2] = c[3] = c[1]; // dark-green
c[0] = c[1] = c[2]; // bright-green
c[6] = c[7] = c[8] = c[9];
break;
stp[1] = 115.0 * meter_deflect_din(-18);
stp[2] = 115.0 * meter_deflect_din(-15); // ignored
stp[3] = 115.0 * meter_deflect_din( -9);
- c[0] = c[1] = c[2] = c[3] = 0x00aa00ff;
+ c[0] = c[2] = c[3] = c[1];
c[4] = c[6];
c[5] = c[7];
break;
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
- c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = 0x00aa00ff;
- c[6] = c[7] = c[8] = c[9] = 0xff8800ff;
+ 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 || 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, _meter_orientation, len,
c[0], c[1], c[2], c[3], c[4],
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, &LevelMeterBase::meter_button_press));
- meters[n].meter->signal_button_release_event().connect (sigc::mem_fun (*this, &LevelMeterBase::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);
bool
LevelMeterBase::meter_button_press (GdkEventButton* ev)
{
- return ButtonPress (ev); /* EMIT SIGNAL */
+ return !!ButtonPress (ev); /* EMIT SIGNAL */
}
bool
if (ev->button == 1) {
clear_meters (false);
}
+ ButtonRelease(ev);
return true;
}
LevelMeterBase::color_handler ()
{
color_changed = true;
+ setup_meters (meter_length, regular_meter_width, thin_meter_width);
}
LevelMeterHBox::LevelMeterHBox(Session* s)