move ardour meter globals into dedicated namespace (TODO meter_patters typedef)

6 files changed, 32 insertions, 20 deletions

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 36ed5e918e..1148c6b889 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -60,6 +60,7 @@ using namespace Gtkmm2ext;
 using namespace Gtk;
 using namespace std;
 using Gtkmm2ext::Keyboard;
+using namespace ArdourMeter;
 
 GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int fader_girth)
 	: gain_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0.0, 1.0, 0.01, 0.1)
diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc
index f749927e9a..cb5209d8ea 100644
--- a/gtk2_ardour/meter_patterns.cc
+++ b/gtk2_ardour/meter_patterns.cc
@@ -35,18 +35,27 @@ using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace std;
-
+using namespace ArdourMeter;
 
 static const int max_pattern_metric_size = 1026;
 
-sigc::signal<void> ResetAllPeakDisplays;
-sigc::signal<void,ARDOUR::Route*> ResetRoutePeakDisplays;
-sigc::signal<void,ARDOUR::RouteGroup*> ResetGroupPeakDisplays;
-sigc::signal<void> RedrawMetrics;
+sigc::signal<void> ArdourMeter::ResetAllPeakDisplays;
+sigc::signal<void,ARDOUR::Route*> ArdourMeter::ResetRoutePeakDisplays;
+sigc::signal<void,ARDOUR::RouteGroup*> ArdourMeter::ResetGroupPeakDisplays;
+sigc::signal<void> ArdourMeter::RedrawMetrics;
+
+sigc::signal<void, int, ARDOUR::RouteGroup*, ARDOUR::MeterType> ArdourMeter::SetMeterTypeMulti;
+
+namespace ArdourMeter {
+	typedef std::map<std::string,cairo_pattern_t*> TickPatterns;
+	typedef std::map<std::string,cairo_pattern_t*> MetricPatterns;
+}
 
-sigc::signal<void, int, ARDOUR::RouteGroup*, ARDOUR::MeterType> SetMeterTypeMulti;
+static ArdourMeter::TickPatterns ticks_patterns;
+static ArdourMeter::MetricPatterns metric_patterns;
 
-cairo_pattern_t*
+
+static cairo_pattern_t*
 meter_render_ticks (Gtk::Widget& w, vector<ARDOUR::DataType> types)
 {
 	Glib::RefPtr<Gdk::Window> win (w.get_window());
@@ -195,7 +204,7 @@ meter_render_ticks (Gtk::Widget& w, vector<ARDOUR::DataType> types)
 }
 
 
-cairo_pattern_t*
+static cairo_pattern_t*
 meter_render_metrics (Gtk::Widget& w, vector<DataType> types)
 {
 	Glib::RefPtr<Gdk::Window> win (w.get_window());
@@ -407,10 +416,8 @@ meter_render_metrics (Gtk::Widget& w, vector<DataType> types)
 }
 
 
-typedef std::map<std::string,cairo_pattern_t*> TickPatterns;
-static  TickPatterns ticks_patterns;
-
-gint meter_expose_ticks (GdkEventExpose *ev, std::vector<ARDOUR::DataType> types, Gtk::DrawingArea *mta)
+gint
+ArdourMeter::meter_expose_ticks (GdkEventExpose *ev, std::vector<ARDOUR::DataType> types, Gtk::DrawingArea *mta)
 {
 	Glib::RefPtr<Gdk::Window> win (mta->get_window());
 	cairo_t* cr;
@@ -446,10 +453,8 @@ gint meter_expose_ticks (GdkEventExpose *ev, std::vector<ARDOUR::DataType> types
 	return true;
 }
 
-typedef std::map<std::string,cairo_pattern_t*> MetricPatterns;
-static  MetricPatterns metric_patterns;
-
-gint meter_expose_metrics (GdkEventExpose *ev, std::vector<ARDOUR::DataType> types, Gtk::DrawingArea *mma)
+gint
+ArdourMeter::meter_expose_metrics (GdkEventExpose *ev, std::vector<ARDOUR::DataType> types, Gtk::DrawingArea *mma)
 {
 	Glib::RefPtr<Gdk::Window> win (mma->get_window());
 	cairo_t* cr;
@@ -485,7 +490,8 @@ gint meter_expose_metrics (GdkEventExpose *ev, std::vector<ARDOUR::DataType> typ
 	return true;
 }
 
-void meter_clear_pattern_cache(int which) {
+void
+ArdourMeter::meter_clear_pattern_cache(int which) {
 	MetricPatterns::iterator i = metric_patterns.begin();
 	TickPatterns::iterator j = ticks_patterns.begin();
 
diff --git a/gtk2_ardour/meter_patterns.h b/gtk2_ardour/meter_patterns.h
index a664f478f2..9ac8ce308a 100644
--- a/gtk2_ardour/meter_patterns.h
+++ b/gtk2_ardour/meter_patterns.h
@@ -27,6 +27,9 @@
 #include "gtkmm2ext/cairo_widget.h"
 
 #include <sigc++/signal.h>
+
+namespace ArdourMeter {
+
 extern sigc::signal<void> ResetAllPeakDisplays;
 extern sigc::signal<void,ARDOUR::Route*> ResetRoutePeakDisplays;
 extern sigc::signal<void,ARDOUR::RouteGroup*> ResetGroupPeakDisplays;
@@ -34,13 +37,12 @@ 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);
 
 void meter_clear_pattern_cache(int which=7);
 
+}
+
 #endif
 
diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index 88a946585a..c5d32d6680 100644
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -52,6 +52,7 @@ using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace std;
+using namespace ArdourMeter;
 
 PBD::Signal1<void,MeterStrip*> MeterStrip::CatchDeletion;
 PBD::Signal0<void> MeterStrip::MetricChanged;
diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc
index 24b21656d1..cdecb36c7c 100644
--- a/gtk2_ardour/meterbridge.cc
+++ b/gtk2_ardour/meterbridge.cc
@@ -62,6 +62,7 @@ using namespace Gtk;
 using namespace Glib;
 using namespace Gtkmm2ext;
 using namespace std;
+using namespace ArdourMeter;
 
 using PBD::atoi;
 
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 98b208f317..cd3185fcbf 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -71,6 +71,7 @@ using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace std;
+using namespace ArdourMeter;
 
 int MixerStrip::scrollbar_height = 0;
 PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;