move JACK audio backend to its own folder and adjust build system to reflect that...

[ardour.git] / gtk2_ardour / level_meter.cc

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 3c8527bede3e4db95d6d1d5e2c5ec8b18295652d..bf9823518b7264a893d806f19d384903306419c8 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -23,7 +23,6 @@
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/barcontroller.h>
-#include "midi++/manager.h"
 #include "pbd/fastlog.h"
 
 #include "ardour_ui.h"
@@ -43,15 +42,16 @@ using namespace Gtkmm2ext;
 using namespace Gtk;
 using namespace std;
 
-LevelMeterBase::LevelMeterBase (Session* s, FastMeter::Orientation o)
-       : _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 (&LevelMeterBase::parameter_changed, this, _1), gui_context());
+       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();
@@ -80,13 +80,13 @@ LevelMeterBase::set_meter (PeakMeter* meter)
        _meter = meter;
 
        if (_meter) {
-               _meter->ConfigurationChanged.connect (_configuration_connection, invalidator (*this), boost::bind (&LevelMeterBase::configuration_changed, this, _1, _2), gui_context());
-               _meter->TypeChanged.connect (_meter_type_connection, invalidator (*this), boost::bind (&LevelMeterBase::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:
@@ -101,6 +101,10 @@ static float meter_lineup(float offset) {
        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()) {
@@ -133,7 +137,7 @@ LevelMeterBase::update_meters ()
                        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;
@@ -148,7 +152,7 @@ LevelMeterBase::update_meters ()
                                } 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) {
@@ -317,7 +321,9 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                                        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] = 0xaaaaaaff;
+                                       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");
+                                       stp[0] = stp[1] = stp[2] = stp[3] = 115.0;
                                        break;
                                case MeterIEC2EBU:
                                        stp[0] = 115.0 * meter_deflect_ppm(-24); // ignored
@@ -376,6 +382,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                }
                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],
@@ -421,6 +428,7 @@ LevelMeterBase::meter_button_release (GdkEventButton* ev)
        if (ev->button == 1) {
                clear_meters (false);
        }
+       ButtonRelease(ev);
 
        return true;
 }
@@ -446,10 +454,11 @@ void
 LevelMeterBase::color_handler ()
 {
        color_changed = true;
+       setup_meters (meter_length, regular_meter_width, thin_meter_width);
 }
 
 LevelMeterHBox::LevelMeterHBox(Session* s)
-       : LevelMeterBase(s)
+       : LevelMeterBase(s, invalidator(*this))
 {
        set_spacing(1);
        show();
@@ -470,7 +479,7 @@ LevelMeterHBox::mtr_remove(Gtk::Widget &w) {
 
 
 LevelMeterVBox::LevelMeterVBox(Session* s)
-       : LevelMeterBase(s, FastMeter::Horizontal)
+       : LevelMeterBase(s, invalidator(*this), FastMeter::Horizontal)
 {
        set_spacing(1);
        show();