summaryrefslogtreecommitdiff
path: root/gtk2_ardour/meter_patterns.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-07-28 20:32:52 +0200
committerRobin Gareus <robin@gareus.org>2013-07-28 20:32:52 +0200
commitcd28d62b26214770cfc269aafe666ec2fb3f2607 (patch)
tree40a8562aa2c5fb72c82c78084f31ac7799105524 /gtk2_ardour/meter_patterns.cc
parentd1c2d53afe71bfd4fb870b7ed179e8a77a801622 (diff)
fix compiler warnings.
Diffstat (limited to 'gtk2_ardour/meter_patterns.cc')
-rw-r--r--gtk2_ardour/meter_patterns.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc
index 92d4078441..2166cc03ae 100644
--- 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:
@@ -812,7 +812,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;
@@ -850,6 +850,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;