fix logic error that prevent input monitoring during slave wait states

[ardour.git] / gtk2_ardour / meter_patterns.h

diff --git a/gtk2_ardour/meter_patterns.h b/gtk2_ardour/meter_patterns.h
index a664f478f221a5693399f80618b4d0f8a1c3b332..a0685bb50d17fe8934e3fd9b3c6f4128954d67c8 100644 (file)
--- a/gtk2_ardour/meter_patterns.h
+++ b/gtk2_ardour/meter_patterns.h
@@ -27,6 +27,14 @@
 #include "gtkmm2ext/cairo_widget.h"
 
 #include <sigc++/signal.h>
+
+namespace ARDOUR {
+       class Route;
+       class RouteGroup;
+}
+
+namespace ArdourMeter {
+
 extern sigc::signal<void> ResetAllPeakDisplays;
 extern sigc::signal<void,ARDOUR::Route*> ResetRoutePeakDisplays;
 extern sigc::signal<void,ARDOUR::RouteGroup*> ResetGroupPeakDisplays;
@@ -34,13 +42,14 @@ extern sigc::signal<void> RedrawMetrics;
 
 extern sigc::signal<void, int, ARDOUR::RouteGroup*, ARDOUR::MeterType> SetMeterTypeMulti;
 
-cairo_pattern_t* meter_render_ticks (Gtk::Widget& w, std::vector<ARDOUR::DataType> types);
-cairo_pattern_t* meter_render_metrics (Gtk::Widget& w, std::vector<ARDOUR::DataType> types);
-
-gint meter_expose_ticks (GdkEventExpose *ev, std::vector<ARDOUR::DataType> types, Gtk::DrawingArea *mta);
-gint meter_expose_metrics (GdkEventExpose *ev, std::vector<ARDOUR::DataType> types, Gtk::DrawingArea *mma);
+gint meter_expose_ticks (GdkEventExpose *ev, ARDOUR::MeterType type, std::vector<ARDOUR::DataType> types, Gtk::DrawingArea *mta);
+gint meter_expose_metrics (GdkEventExpose *ev, ARDOUR::MeterType type, std::vector<ARDOUR::DataType> types, Gtk::DrawingArea *mma);
 
 void meter_clear_pattern_cache(int which=7);
 
+const std::string meter_type_string (ARDOUR::MeterType);
+
+}
+
 #endif