projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'export-dialog' into cairocanvas
[ardour.git] / gtk2_ardour / level_meter.cc
diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 8c3242d889cb6e8961957122602718ed473e50c1..94b8d63d7f3290f7cf6c622815d684ac614209c0 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"
@@ -44,9 +43,10 @@ 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)
 {
@@ -78,6 +78,7 @@ LevelMeterBase::set_meter (PeakMeter* meter)
        _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());
@@ -137,7 +138,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;
@@ -157,6 +158,8 @@ LevelMeterBase::update_meters ()
                                        (*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) {
@@ -266,36 +269,36 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                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_canvasvar_MeterBackgroundBot();
+               b[1] = ARDOUR_UI::config()->get_canvasvar_MeterBackgroundTop();
                b[2] = 0x991122ff; // red highlight gradient Bot
                b[3] = 0x551111ff; // red highlight gradient Top
                if (n < nmidi) {
-                       c[0] = ARDOUR_UI::config()->canvasvar_MidiMeterColor0.get();
-                       c[1] = ARDOUR_UI::config()->canvasvar_MidiMeterColor1.get();
-                       c[2] = ARDOUR_UI::config()->canvasvar_MidiMeterColor2.get();
-                       c[3] = ARDOUR_UI::config()->canvasvar_MidiMeterColor3.get();
-                       c[4] = ARDOUR_UI::config()->canvasvar_MidiMeterColor4.get();
-                       c[5] = ARDOUR_UI::config()->canvasvar_MidiMeterColor5.get();
-                       c[6] = ARDOUR_UI::config()->canvasvar_MidiMeterColor6.get();
-                       c[7] = ARDOUR_UI::config()->canvasvar_MidiMeterColor7.get();
-                       c[8] = ARDOUR_UI::config()->canvasvar_MidiMeterColor8.get();
-                       c[9] = ARDOUR_UI::config()->canvasvar_MidiMeterColor9.get();
+                       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();
                        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()->canvasvar_MeterColor0.get();
-                       c[1] = ARDOUR_UI::config()->canvasvar_MeterColor1.get();
-                       c[2] = ARDOUR_UI::config()->canvasvar_MeterColor2.get();
-                       c[3] = ARDOUR_UI::config()->canvasvar_MeterColor3.get();
-                       c[4] = ARDOUR_UI::config()->canvasvar_MeterColor4.get();
-                       c[5] = ARDOUR_UI::config()->canvasvar_MeterColor5.get();
-                       c[6] = ARDOUR_UI::config()->canvasvar_MeterColor6.get();
-                       c[7] = ARDOUR_UI::config()->canvasvar_MeterColor7.get();
-                       c[8] = ARDOUR_UI::config()->canvasvar_MeterColor8.get();
-                       c[9] = ARDOUR_UI::config()->canvasvar_MeterColor9.get();
+                       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();
 
                        switch (meter_type) {
                                case MeterK20:
@@ -320,6 +323,17 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                                        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");
@@ -382,6 +396,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],
@@ -427,6 +442,7 @@ LevelMeterBase::meter_button_release (GdkEventButton* ev)
        if (ev->button == 1) {
                clear_meters (false);
        }
+       ButtonRelease(ev);
 
        return true;
 }
@@ -452,6 +468,7 @@ void
 LevelMeterBase::color_handler ()
 {
        color_changed = true;
+       setup_meters (meter_length, regular_meter_width, thin_meter_width);
 }
 
 LevelMeterHBox::LevelMeterHBox(Session* s)
Unnamed repository; edit this file 'description' to name the repository.