Working Soundcloud export

[ardour.git] / gtk2_ardour / meter_patterns.cc

diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc
index a557c6211511968d480fe13179839422875bbc60..f392dc08725e76f716706b7a403063d379fc8892 100644 (file)
--- a/gtk2_ardour/meter_patterns.cc
+++ b/gtk2_ardour/meter_patterns.cc
@@ -243,7 +243,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 +281,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;
@@ -335,10 +341,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 +355,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));
@@ -810,7 +818,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;
@@ -848,6 +856,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;