update meter marks and colors..

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 29e110d1d8258f94276c91150adc5a3ff8b4dd87..dc3a20d5afbdfbe6d4471d6d5750501c26083d31 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -316,22 +316,29 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                                        c[0] = c[1] = c[2] = c[3] = c[4] = c[5] = c[6] = c[7] = c[8] = c[9] = 0xaaaaaaff;
                                        break;
                                case MeterIEC2EBU:
-                                       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);
+                                       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[1] = c[2] = c[3];
+                                       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[1] = c[2] = c[3] = 0x00aa00ff;
+                                       c[4] = c[6];
+                                       c[5] = c[7];
                                        break;
                                case MeterVU:
                                        stp[0] = 115.0 * meter_deflect_vu(-26); // -6

diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc
index cbe07cf1c8a2d859ed805b455b7fb3014a4852a1..dede422b2df651d889cb2d656e802c89f113791f 100644 (file)
--- a/gtk2_ardour/meter_patterns.cc
+++ b/gtk2_ardour/meter_patterns.cc
@@ -138,23 +138,14 @@ static inline float mtr_col_and_fract(
                        }
                        break;
                case MeterIEC2BBC:
-                       fraction = meter_deflect_ppm(val);
-                       cairo_set_source_rgb (cr, c->get_red_p(), c->get_green_p(), c->get_blue_p());
-                       break;
                case MeterIEC2EBU:
                        fraction = meter_deflect_ppm(val);
-                       if (val >= -10.0) {
-                               cairo_set_source_rgb (cr,
-                                               UINT_RGBA_R_FLT(peakcolor),
-                                               UINT_RGBA_G_FLT(peakcolor),
-                                               UINT_RGBA_B_FLT(peakcolor));
-                       } else {
-                               cairo_set_source_rgb (cr, c->get_red_p(), c->get_green_p(), c->get_blue_p());
-                       }
+                       cairo_set_source_rgb (cr, c->get_red_p(), c->get_green_p(), c->get_blue_p());
                        break;
                case MeterIEC1NOR:
                        fraction = meter_deflect_nordic(val);
-                       if (val >= -12.0) {
+#if 0
+                       if (val == -18.0) {
                                cairo_set_source_rgb (cr,
                                                UINT_RGBA_R_FLT(peakcolor),
                                                UINT_RGBA_G_FLT(peakcolor),
@@ -162,10 +153,13 @@ static inline float mtr_col_and_fract(
                        } else {
                                cairo_set_source_rgb (cr, c->get_red_p(), c->get_green_p(), c->get_blue_p());
                        }
+#else
+                       cairo_set_source_rgb (cr, c->get_red_p(), c->get_green_p(), c->get_blue_p());
+#endif
                        break;
                case MeterIEC1DIN:
                        fraction = meter_deflect_din(val);
-                       if (val >= -9.0) {
+                       if (val == -9.0 || val == -15 || val == -18) {
                                cairo_set_source_rgb (cr,
                                                UINT_RGBA_R_FLT(peakcolor),
                                                UINT_RGBA_G_FLT(peakcolor),
@@ -351,7 +345,7 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
                                        points.insert (std::pair<float,float>(-14.0f, 1.0));
                                        points.insert (std::pair<float,float>(-12.0f, 0.5));
                                        points.insert (std::pair<float,float>(-10.0f, 1.0));
-                                       points.insert (std::pair<float,float>( -9.0f, 0.5));
+                                       points.insert (std::pair<float,float>( -9.0f, 0.8));
                                        points.insert (std::pair<float,float>( -8.0f, 0.5));
                                        points.insert (std::pair<float,float>( -6.0f, 1.0));
                                        break;
@@ -375,30 +369,41 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
                                        points.insert (std::pair<float,float>(-39.0f, 0.5));
                                        points.insert (std::pair<float,float>(-36.0f, 1.0));
 
-                                       points.insert (std::pair<float,float>(-33.0f, 1.0));
+                                       points.insert (std::pair<float,float>(-33.0f, 0.5));
                                        points.insert (std::pair<float,float>(-30.0f, 1.0));
-                                       points.insert (std::pair<float,float>(-27.0f, 1.0));
+                                       points.insert (std::pair<float,float>(-27.0f, 0.5));
                                        points.insert (std::pair<float,float>(-24.0f, 1.0));
-                                       points.insert (std::pair<float,float>(-21.0f, 1.0));
+                                       points.insert (std::pair<float,float>(-21.0f, 0.5));
 
                                        points.insert (std::pair<float,float>(-18.0f, 1.0));
-                                       points.insert (std::pair<float,float>(-15.0f, 1.0));
-                                       points.insert (std::pair<float,float>(-12.0f, 1.0));
+                                       points.insert (std::pair<float,float>(-15.0f, 0.5));
+                                       points.insert (std::pair<float,float>(-12.0f, 0.5));
                                        points.insert (std::pair<float,float>( -9.0f, 1.0));
-                                       points.insert (std::pair<float,float>( -6.0f, 1.0));
+                                       points.insert (std::pair<float,float>( -6.0f, 0.5));
                                        break;
                                case MeterIEC1DIN:
                                        points.insert (std::pair<float,float>( -3.0f, 0.5)); // "200%"
-                                       points.insert (std::pair<float,float>( -4.0f, 1.0)); // "100%"
-                                       points.insert (std::pair<float,float>( -9.0f, 1.0));
+                                       points.insert (std::pair<float,float>( -4.0f, 1.0));
+                                       points.insert (std::pair<float,float>( -5.0f, 0.5));
+                                       points.insert (std::pair<float,float>( -6.0f, 0.5));
+                                       points.insert (std::pair<float,float>( -7.0f, 0.5));
+                                       points.insert (std::pair<float,float>( -8.0f, 0.5));
+                                       points.insert (std::pair<float,float>( -9.0f, 1.0)); // "100%"
+                                       points.insert (std::pair<float,float>(-10.0f, 0.5));
+                                       points.insert (std::pair<float,float>(-11.0f, 0.5));
+                                       points.insert (std::pair<float,float>(-12.0f, 0.5));
+                                       points.insert (std::pair<float,float>(-13.0f, 0.5));
                                        points.insert (std::pair<float,float>(-14.0f, 1.0));
-                                       points.insert (std::pair<float,float>(-15.0f, 0.5)); // "50%"
-                                       points.insert (std::pair<float,float>(-18.0f, 0.5)); // "-9"
-                                       points.insert (std::pair<float,float>(-19.0f, 1.0)); // "30%"
-                                       points.insert (std::pair<float,float>(-29.0f, 1.0)); // "10%"
-                                       points.insert (std::pair<float,float>(-35.0f, 0.5)); // "5%" " -20"
-                                       points.insert (std::pair<float,float>(-39.0f, 1.0)); // "3%"
-                                       points.insert (std::pair<float,float>(-49.0f, 0.5)); // "1%"
+                                       points.insert (std::pair<float,float>(-15.0f, 0.8)); // "50%"
+                                       points.insert (std::pair<float,float>(-18.0f, 0.8)); // "-9"
+                                       points.insert (std::pair<float,float>(-19.0f, 1.0));
+                                       points.insert (std::pair<float,float>(-24.0f, 0.5));
+                                       points.insert (std::pair<float,float>(-29.0f, 1.0)); // "-20", "10%"
+                                       points.insert (std::pair<float,float>(-34.0f, 0.5)); // -25
+                                       //points.insert (std::pair<float,float>(-35.0f, 0.5)); // "5%" " -20"
+                                       points.insert (std::pair<float,float>(-39.0f, 1.0));
+                                       points.insert (std::pair<float,float>(-49.0f, 1.0));
+                                       points.insert (std::pair<float,float>(-54.0f, 0.5));
                                        points.insert (std::pair<float,float>(-59.0f, 1.0));
                                        break;
                                case MeterVU:
@@ -685,31 +690,31 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
                                        points.insert (std::pair<float,string>(-42.0f, "-24"));
                                        points.insert (std::pair<float,string>(-36.0f, "-18"));
 
-                                       points.insert (std::pair<float,string>(-33.0f, "-15"));
+                                       //points.insert (std::pair<float,string>(-33.0f, "-15"));
                                        points.insert (std::pair<float,string>(-30.0f, "-12"));
-                                       points.insert (std::pair<float,string>(-27.0f, "-9"));
+                                       //points.insert (std::pair<float,string>(-27.0f, "-9"));
                                        points.insert (std::pair<float,string>(-24.0f, "-6"));
-                                       points.insert (std::pair<float,string>(-21.0f, "-3"));
+                                       //points.insert (std::pair<float,string>(-21.0f, "-3"));
 
                                        points.insert (std::pair<float,string>(-18.0f, "TST"));
-                                       points.insert (std::pair<float,string>(-15.0f, "+3"));
+                                       //points.insert (std::pair<float,string>(-15.0f, "+3"));
                                        points.insert (std::pair<float,string>(-12.0f, "+6"));
                                        points.insert (std::pair<float,string>( -9.0f, "+9"));
-                                       points.insert (std::pair<float,string>( -6.0f, "+12"));
+                                       //points.insert (std::pair<float,string>( -6.0f, "+12"));
                                        break;
 
                                case MeterIEC1DIN:
                                        overlay_midi = 2;
                                        //points.insert (std::pair<float,string>( -3.0f, "200%"));
-                                       points.insert (std::pair<float,string>( -4.0f, "+5")); // "100%"
-                                       points.insert (std::pair<float,string>( -9.0f, "0"));
+                                       points.insert (std::pair<float,string>( -4.0f, "+5"));
+                                       points.insert (std::pair<float,string>( -9.0f, "0")); // "100%";
                                        points.insert (std::pair<float,string>(-14.0f, "-5"));
                                        //points.insert (std::pair<float,string>(-15.0f, "50%"));
                                        //points.insert (std::pair<float,string>(-18.0f, "-9"));
                                        points.insert (std::pair<float,string>(-19.0f, "-10")); // "30%"
                                        points.insert (std::pair<float,string>(-29.0f, "-20")); // "10%"
-                                       //points.insert (std::pair<float,string>(-35.0f, "-20")); // "5%"
-                                       points.insert (std::pair<float,string>(-39.0f, "-30")); // "3%"
+                                       //points.insert (std::pair<float,string>(-35.0f, "5%")); // "5%"
+                                       points.insert (std::pair<float,string>(-39.0f, "-30"));
                                        //points.insert (std::pair<float,string>(-49.0f, "1%"));
                                        points.insert (std::pair<float,string>(-59.0f, "-50"));
                                        break;