diff options
author | Robin Gareus <robin@gareus.org> | 2013-07-15 15:04:20 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-07-15 15:04:20 +0200 |
commit | 6908ad1053a42bf98bfc576e481424d6a4c073df (patch) | |
tree | 80b1a08a2f10d9c2552c3f79db5f5037bd2b5f54 /gtk2_ardour/meter_patterns.cc | |
parent | 6827261766a678b69b15394e645478ab78133eb6 (diff) |
move ardour meter globals into dedicated namespace (TODO meter_patters typedef)
Diffstat (limited to 'gtk2_ardour/meter_patterns.cc')
-rw-r--r-- | gtk2_ardour/meter_patterns.cc | 40 |
1 files changed, 23 insertions, 17 deletions
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(); |