Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / meter_patterns.cc

diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc
index a557c6211511968d480fe13179839422875bbc60..2fa1d7356577fa6d174cc7f4c5ba6fe64557e1d7 100644 (file)
--- a/gtk2_ardour/meter_patterns.cc
+++ b/gtk2_ardour/meter_patterns.cc
@@ -101,6 +101,9 @@ ArdourMeter::meter_type_string (ARDOUR::MeterType mt)
                case MeterK14:
                        return _("K14");
                        break;
+               case MeterK12:
+                       return _("K12");
+                       break;
                case MeterVU:
                        return _("VU");
                        break;
@@ -199,6 +202,16 @@ static inline float mtr_col_and_fract(
                        }
                        fraction = meter_deflect_k (val, 14);
                        break;
+               case MeterK12:
+                       if (val >= -8.0) {
+                               cairo_set_source_rgb (cr, 1.0, 0.0, 0.0); // red
+                       } else if (val >= -12.0) {
+                               cairo_set_source_rgb (cr, 0.8, 0.8, 0.0); // yellow
+                       } else {
+                               cairo_set_source_rgb (cr, 0.0, 1.0, 0.0); // green
+                       }
+                       fraction = meter_deflect_k (val, 12);
+                       break;
        }
        return fraction;
 }
@@ -226,6 +239,7 @@ static void set_bg_color(Gtk::Widget& w, cairo_t* cr, MeterType type) {
                case MeterIEC1NOR:
                case MeterIEC2BBC:
                case MeterIEC2EBU:
+               case MeterK12:
                case MeterK14:
                case MeterK20:
                        if (rgba_p_from_style("meterstripPPM", &r, &g, &b, "bg")) {
@@ -243,7 +257,7 @@ static void set_bg_color(Gtk::Widget& w, cairo_t* cr, MeterType type) {
        }
 }
 
-static void set_fg_color(Gtk::Widget& w, MeterType type, Gdk::Color * c) {
+static void set_fg_color(Gtk::Widget&, MeterType type, Gdk::Color * c) {
        float r,g,b;
        switch(type) {
                case MeterVU:
@@ -281,10 +295,16 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
        if (tickleft) {
                if (w.get_name().substr(0, 3) == "Bar") {
                        box_l = width-2; box_w = 2;
+               } else if (w.get_name().substr(0, 4) == "Mark") {
+                       box_l = width-2; box_w = 2;
+                       background = false;
                }
        } else if (tickright) {
                if (w.get_name().substr(0, 3) == "Bar") {
                        box_l = 0; box_w = 2;
+               } else if (w.get_name().substr(0, 4) == "Mark") {
+                       box_l = 0; box_w = 2;
+                       background = false;
                }
        } else {
                box_l = 0; box_w = 3;
@@ -328,6 +348,20 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
                case DataType::AUDIO:
 
                        switch (type) {
+                               case MeterK12:
+                                       points.insert (std::pair<float,float>(-52.0f, 1.0));
+                                       points.insert (std::pair<float,float>(-42.0f, 1.0));
+                                       points.insert (std::pair<float,float>(-32.0f, 1.0));
+                                       points.insert (std::pair<float,float>(-22.0f, 1.0));
+                                       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>( -9.0f, 1.0));
+                                       points.insert (std::pair<float,float>( -8.0f, 0.8));
+                                       points.insert (std::pair<float,float>( -6.0f, 1.0));
+                                       points.insert (std::pair<float,float>( -3.0f, 1.0));
+                                       points.insert (std::pair<float,float>(  0.0f, 1.0));
+                                       break;
                                case MeterK14:
                                        points.insert (std::pair<float,float>(-54.0f, 1.0));
                                        points.insert (std::pair<float,float>(-44.0f, 1.0));
@@ -335,10 +369,11 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
                                        points.insert (std::pair<float,float>(-24.0f, 1.0));
                                        points.insert (std::pair<float,float>(-20.0f, 1.0));
                                        points.insert (std::pair<float,float>(-17.0f, 1.0));
-                                       points.insert (std::pair<float,float>(-14.0f, 1.0));
-                                       points.insert (std::pair<float,float>(-11.0f, 1.0));
-                                       points.insert (std::pair<float,float>( -8.0f, 1.0));
-                                       points.insert (std::pair<float,float>( -4.0f, 1.0));
+                                       points.insert (std::pair<float,float>(-14.0f, 1.0)); //   0
+                                       points.insert (std::pair<float,float>(-11.0f, 1.0)); //  +3
+                                       points.insert (std::pair<float,float>(-10.0f, 0.8)); //  +4
+                                       points.insert (std::pair<float,float>( -8.0f, 1.0)); //  +6
+                                       points.insert (std::pair<float,float>( -4.0f, 1.0)); // +10
                                        points.insert (std::pair<float,float>(  0.0f, 1.0));
                                        break;
                                case MeterK20:
@@ -348,12 +383,13 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ
                                        points.insert (std::pair<float,float>(-30.0f, 1.0));
                                        points.insert (std::pair<float,float>(-26.0f, 1.0));
                                        points.insert (std::pair<float,float>(-23.0f, 1.0));
-                                       points.insert (std::pair<float,float>(-20.0f, 1.0));
+                                       points.insert (std::pair<float,float>(-20.0f, 1.0)); //  0
                                        points.insert (std::pair<float,float>(-17.0f, 1.0));
-                                       points.insert (std::pair<float,float>(-14.0f, 1.0));
+                                       points.insert (std::pair<float,float>(-16.0f, 0.8));
+                                       points.insert (std::pair<float,float>(-14.0f, 1.0)); // +6
                                        points.insert (std::pair<float,float>(-10.0f, 1.0));
                                        points.insert (std::pair<float,float>( -5.0f, 1.0));
-                                       points.insert (std::pair<float,float>(  0.0f, 1.0));
+                                       points.insert (std::pair<float,float>(  0.0f, 1.0)); //+20
                                        break;
                                case MeterIEC2EBU:
                                        points.insert (std::pair<float,float>(-30.0f, 1.0));
@@ -637,6 +673,20 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
                case DataType::AUDIO:
                        layout->set_attributes (audio_font_attributes);
                        switch (type) {
+                               case MeterK12:
+                                       overlay_midi = 0;
+                                       points.insert (std::pair<float,string>(-52.0f, "-40"));
+                                       points.insert (std::pair<float,string>(-42.0f, "-30"));
+                                       points.insert (std::pair<float,string>(-32.0f, "-20"));
+                                       points.insert (std::pair<float,string>(-22.0f, "-10"));
+                                       points.insert (std::pair<float,string>(-18.0f,  "-6"));
+                                       points.insert (std::pair<float,string>(-15.0f,  "-3"));
+                                       points.insert (std::pair<float,string>(-12.0f,  " 0"));
+                                       points.insert (std::pair<float,string>( -9.0f,  "+3"));
+                                       points.insert (std::pair<float,string>( -6.0f,  "+6"));
+                                       points.insert (std::pair<float,string>( -3.0f,  "+9"));
+                                       points.insert (std::pair<float,string>(  0.0f, "+12"));
+                                       break;
                                case MeterK14:
                                        overlay_midi = 0;
                                        points.insert (std::pair<float,string>(-54.0f, "-40"));
@@ -810,7 +860,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
                        break;
                }
 
-               gint pos;
+               gint pos = -1;
 
                for (std::map<float,string>::const_iterator j = points.begin(); j != points.end(); ++j) {
                        float fraction = 0;
@@ -835,7 +885,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
                                case DataType::MIDI:
                                        align_center = false; // don't bleed into legend
                                        fraction = (j->first) / 127.0;
-                                       pos = 1 + height - (gint) rintf (height * fraction);
+                                       pos = 1 + height - (gint) lrintf (height * fraction);
                                        pos = min (pos, height);
                                        cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
                                        if (tickleft) {
@@ -848,6 +898,8 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
                                        break;
                        }
 
+                       if (pos < 0) continue;
+
                        layout->set_text(j->second.c_str());
 
                        int tw, th;
@@ -893,6 +945,9 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
                                        case MeterK14:
                                                layout->set_text("K14");
                                                break;
+                                       case MeterK12:
+                                               layout->set_text("K12");
+                                               break;
                                        default:
                                        case MeterPeak:
                                        case MeterKrms: