From 953e4aba54686df11a7a0bce41ecfa5a75a786b7 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 25 Jul 2013 14:18:39 +0200 Subject: prepare horizontal meters (level-meter H/V Box abstraction) --- gtk2_ardour/ardour_ui.h | 4 +- gtk2_ardour/ardour_ui_dialogs.cc | 2 +- gtk2_ardour/gain_meter.cc | 2 +- gtk2_ardour/gain_meter.h | 4 +- gtk2_ardour/level_meter.cc | 101 +++++++++++++++++++++++++++------------ gtk2_ardour/level_meter.h | 38 ++++++++++++--- gtk2_ardour/meter_strip.cc | 2 +- gtk2_ardour/meter_strip.h | 2 +- 8 files changed, 110 insertions(+), 45 deletions(-) diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 5feb18a2a1..61b229454d 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -104,7 +104,7 @@ class SpeakerDialog; class ThemeManager; class TimeInfoBox; class MidiTracer; -class LevelMeter; +class LevelMeterHBox; class GlobalPortMatrixWindow; class GUIObjectState; @@ -450,7 +450,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr Gtk::VBox alert_box; Gtk::VBox meter_box; - LevelMeter * editor_meter; + LevelMeterHBox * editor_meter; void solo_blink (bool); void sync_blink (bool); diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 26cde95444..96d5de60de 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -195,7 +195,7 @@ ARDOUR_UI::set_session (Session *s) } if (_session && _session->master_out()) { - editor_meter = new LevelMeter(_session); + editor_meter = new LevelMeterHBox(_session); editor_meter->set_meter (_session->master_out()->shared_peak_meter().get()); editor_meter->clear_meters(); editor_meter->set_type (_session->master_out()->meter_type()); diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 01d619780d..efe14b1040 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -84,7 +84,7 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int gain_slider = manage (new VSliderController (&gain_adjustment, fader_length, fader_girth, false)); } - level_meter = new LevelMeter(_session); + level_meter = new LevelMeterHBox(_session); level_meter->ButtonPress.connect_same_thread (_level_meter_connection, boost::bind (&GainMeterBase::level_meter_button_press, this, _1)); meter_metric_area.signal_button_press_event().connect (sigc::mem_fun (*this, &GainMeterBase::level_meter_button_press)); diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h index 0c698d54ee..8286cbeb95 100644 --- a/gtk2_ardour/gain_meter.h +++ b/gtk2_ardour/gain_meter.h @@ -89,7 +89,7 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr boost::shared_ptr get_controllable(); - LevelMeter& get_level_meter() const { return *level_meter; } + LevelMeterHBox& get_level_meter() const { return *level_meter; } Gtkmm2ext::SliderController& get_gain_slider() const { return *gain_slider; } /** Emitted in the GUI thread when a button is pressed over the level meter; @@ -117,7 +117,7 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr Gtk::DrawingArea meter_metric_area; Gtk::DrawingArea meter_ticks1_area; Gtk::DrawingArea meter_ticks2_area; - LevelMeter *level_meter; + LevelMeterHBox *level_meter; sigc::connection gain_watching; diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 6a60239ecc..da593b9ea9 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -22,7 +22,6 @@ #include "ardour/meter.h" #include -#include #include #include "midi++/manager.h" #include "pbd/fastlog.h" @@ -44,27 +43,28 @@ using namespace Gtkmm2ext; using namespace Gtk; using namespace std; -LevelMeter::LevelMeter (Session* s) +LevelMeterBase::LevelMeterBase (Session* s, FastMeter::Orientation o) : _meter (0) + , _meter_orientation(o) , meter_length (0) , thin_meter_width(2) { set_session (s); - set_spacing (1); - Config->ParameterChanged.connect (_parameter_connection, invalidator (*this), boost::bind (&LevelMeter::parameter_changed, this, _1), gui_context()); - UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &LevelMeter::on_theme_changed)); - ColorsChanged.connect (sigc::mem_fun (*this, &LevelMeter::color_handler)); + //set_spacing (1); + Config->ParameterChanged.connect (_parameter_connection, invalidator (*this), boost::bind (&LevelMeterBase::parameter_changed, this, _1), gui_context()); + UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &LevelMeterBase::on_theme_changed)); + ColorsChanged.connect (sigc::mem_fun (*this, &LevelMeterBase::color_handler)); max_peak = minus_infinity(); meter_type = MeterPeak; } void -LevelMeter::on_theme_changed() +LevelMeterBase::on_theme_changed() { style_changed = true; } -LevelMeter::~LevelMeter () +LevelMeterBase::~LevelMeterBase () { for (vector::iterator i = meters.begin(); i != meters.end(); i++) { delete (*i).meter; @@ -72,7 +72,7 @@ LevelMeter::~LevelMeter () } void -LevelMeter::set_meter (PeakMeter* meter) +LevelMeterBase::set_meter (PeakMeter* meter) { _configuration_connection.disconnect(); _meter_type_connection.disconnect(); @@ -80,8 +80,8 @@ LevelMeter::set_meter (PeakMeter* meter) _meter = meter; if (_meter) { - _meter->ConfigurationChanged.connect (_configuration_connection, invalidator (*this), boost::bind (&LevelMeter::configuration_changed, this, _1, _2), gui_context()); - _meter->TypeChanged.connect (_meter_type_connection, invalidator (*this), boost::bind (&LevelMeter::meter_type_changed, this, _1), gui_context()); + _meter->ConfigurationChanged.connect (_configuration_connection, invalidator (*this), boost::bind (&LevelMeterBase::configuration_changed, this, _1, _2), gui_context()); + _meter->TypeChanged.connect (_meter_type_connection, invalidator (*this), boost::bind (&LevelMeterBase::meter_type_changed, this, _1), gui_context()); } } @@ -117,7 +117,7 @@ static float vu_standard() { } float -LevelMeter::update_meters () +LevelMeterBase::update_meters () { vector::iterator i; uint32_t n; @@ -167,9 +167,9 @@ LevelMeter::update_meters () } void -LevelMeter::parameter_changed (string p) +LevelMeterBase::parameter_changed (string p) { - ENSURE_GUI_THREAD (*this, &LevelMeter::parameter_changed, p) + ENSURE_GUI_THREAD (*this, &LevelMeterBase::parameter_changed, p) if (p == "meter-hold") { vector::iterator i; @@ -194,14 +194,14 @@ LevelMeter::parameter_changed (string p) } void -LevelMeter::configuration_changed (ChanCount /*in*/, ChanCount /*out*/) +LevelMeterBase::configuration_changed (ChanCount /*in*/, ChanCount /*out*/) { color_changed = true; setup_meters (meter_length, regular_meter_width, thin_meter_width); } void -LevelMeter::meter_type_changed (MeterType t) +LevelMeterBase::meter_type_changed (MeterType t) { meter_type = t; color_changed = true; @@ -210,18 +210,18 @@ LevelMeter::meter_type_changed (MeterType t) } void -LevelMeter::hide_all_meters () +LevelMeterBase::hide_all_meters () { for (vector::iterator i = meters.begin(); i != meters.end(); ++i) { if ((*i).packed) { - remove (*((*i).meter)); + mtr_remove (*((*i).meter)); (*i).packed = false; } } } void -LevelMeter::setup_meters (int len, int initial_width, int thin_width) +LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) { hide_all_meters (); @@ -251,7 +251,7 @@ LevelMeter::setup_meters (int len, int initial_width, int thin_width) meters.push_back (MeterInfo()); } - //cerr << "LevelMeter::setup_meters() called color_changed = " << color_changed << " colors: " << endl;//DEBUG + //cerr << "LevelMeterBase::setup_meters() called color_changed = " << color_changed << " colors: " << endl;//DEBUG for (int32_t n = nmeters-1; nmeters && n >= 0 ; --n) { uint32_t c[10]; @@ -365,7 +365,7 @@ LevelMeter::setup_meters (int len, int initial_width, int thin_width) } if (meters[n].width != width || meters[n].length != len || color_changed || meter_type != visible_meter_type) { delete meters[n].meter; - meters[n].meter = new FastMeter ((uint32_t) floor (Config->get_meter_hold()), width, FastMeter::Vertical, len, + meters[n].meter = new FastMeter ((uint32_t) floor (Config->get_meter_hold()), width, _meter_orientation, len, c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[8], c[9], b[0], b[1], b[2], b[3], @@ -375,34 +375,35 @@ LevelMeter::setup_meters (int len, int initial_width, int thin_width) meters[n].width = width; meters[n].length = len; meters[n].meter->add_events (Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK); - meters[n].meter->signal_button_press_event().connect (sigc::mem_fun (*this, &LevelMeter::meter_button_press)); - meters[n].meter->signal_button_release_event().connect (sigc::mem_fun (*this, &LevelMeter::meter_button_release)); + meters[n].meter->signal_button_press_event().connect (sigc::mem_fun (*this, &LevelMeterBase::meter_button_press)); + meters[n].meter->signal_button_release_event().connect (sigc::mem_fun (*this, &LevelMeterBase::meter_button_release)); } - pack_end (*meters[n].meter, false, false); + //pack_end (*meters[n].meter, false, false); + mtr_pack (*meters[n].meter); meters[n].meter->show_all (); meters[n].packed = true; } - show(); + //show(); color_changed = false; visible_meter_type = meter_type; } void -LevelMeter::set_type(MeterType t) +LevelMeterBase::set_type(MeterType t) { meter_type = t; _meter->set_type(t); } bool -LevelMeter::meter_button_press (GdkEventButton* ev) +LevelMeterBase::meter_button_press (GdkEventButton* ev) { return ButtonPress (ev); /* EMIT SIGNAL */ } bool -LevelMeter::meter_button_release (GdkEventButton* ev) +LevelMeterBase::meter_button_release (GdkEventButton* ev) { if (ev->button == 1) { clear_meters (false); @@ -412,7 +413,7 @@ LevelMeter::meter_button_release (GdkEventButton* ev) } -void LevelMeter::clear_meters (bool reset_highlight) +void LevelMeterBase::clear_meters (bool reset_highlight) { for (vector::iterator i = meters.begin(); i < meters.end(); i++) { (*i).meter->clear(); @@ -423,14 +424,52 @@ void LevelMeter::clear_meters (bool reset_highlight) max_peak = minus_infinity(); } -void LevelMeter::hide_meters () +void LevelMeterBase::hide_meters () { hide_all_meters(); } void -LevelMeter::color_handler () +LevelMeterBase::color_handler () { color_changed = true; } +LevelMeterHBox::LevelMeterHBox(Session* s) + : LevelMeterBase(s) +{ + set_spacing(1); + show(); +} + + +LevelMeterHBox::~LevelMeterHBox() {} + +void +LevelMeterHBox::mtr_pack(Gtk::Widget &w) { + pack_end (w, false, false); +} + +void +LevelMeterHBox::mtr_remove(Gtk::Widget &w) { + remove (w); +} + + +LevelMeterVBox::LevelMeterVBox(Session* s) + : LevelMeterBase(s, FastMeter::Horizontal) +{ + set_spacing(1); + show(); +} +LevelMeterVBox::~LevelMeterVBox() {} + +void +LevelMeterVBox::mtr_pack(Gtk::Widget &w) { + pack_end (w, false, false); +} + +void +LevelMeterVBox::mtr_remove(Gtk::Widget &w) { + remove (w); +} diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h index d3fd4f9bbd..0a59f1a337 100644 --- a/gtk2_ardour/level_meter.h +++ b/gtk2_ardour/level_meter.h @@ -37,6 +37,7 @@ #include #include #include +#include #include "enums.h" @@ -44,18 +45,16 @@ namespace ARDOUR { class Session; class PeakMeter; } -namespace Gtkmm2ext { - class FastMeter; -} namespace Gtk { class Menu; } -class LevelMeter : public Gtk::HBox, public ARDOUR::SessionHandlePtr +class LevelMeterBase : public sigc::trackable, public ARDOUR::SessionHandlePtr { public: - LevelMeter (ARDOUR::Session*); - ~LevelMeter (); + LevelMeterBase (ARDOUR::Session*, + Gtkmm2ext::FastMeter::Orientation o = Gtkmm2ext::FastMeter::Vertical); + ~LevelMeterBase (); virtual void set_meter (ARDOUR::PeakMeter* meter); @@ -74,8 +73,13 @@ class LevelMeter : public Gtk::HBox, public ARDOUR::SessionHandlePtr PBD::Signal1 ButtonPress; PBD::Signal1 MeterTypeChanged; + protected: + virtual void mtr_pack(Gtk::Widget &w) = 0; + virtual void mtr_remove(Gtk::Widget &w) = 0; + private: ARDOUR::PeakMeter* _meter; + Gtkmm2ext::FastMeter::Orientation _meter_orientation; Width _width; @@ -121,5 +125,27 @@ class LevelMeter : public Gtk::HBox, public ARDOUR::SessionHandlePtr void color_handler (); }; +class LevelMeterHBox : public LevelMeterBase, public Gtk::HBox +{ + public: + LevelMeterHBox (ARDOUR::Session*); + ~LevelMeterHBox(); + + protected: + void mtr_pack(Gtk::Widget &w); + void mtr_remove(Gtk::Widget &w); +}; + +class LevelMeterVBox : public LevelMeterBase, public Gtk::VBox +{ + public: + LevelMeterVBox (ARDOUR::Session*); + ~LevelMeterVBox(); + + protected: + void mtr_pack(Gtk::Widget &w); + void mtr_remove(Gtk::Widget &w); +}; + #endif /* __ardour_gtk_track_meter_h__ */ diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index 8ec9834c9d..8fde670c59 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -128,7 +128,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) } // level meter + ticks - level_meter = new LevelMeter(sess); + level_meter = new LevelMeterHBox(sess); level_meter->set_meter (_route->shared_peak_meter().get()); level_meter->clear_meters(); level_meter->set_type (_route->meter_type()); diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h index f1fe69bce2..1af2aee7ba 100644 --- a/gtk2_ardour/meter_strip.h +++ b/gtk2_ardour/meter_strip.h @@ -119,7 +119,7 @@ class MeterStrip : public Gtk::VBox, public RouteUI bool _has_midi; int _strip_type; - LevelMeter *level_meter; + LevelMeterHBox *level_meter; PBD::ScopedConnection _config_connection; void strip_property_changed (const PBD::PropertyChange&); -- cgit v1.2.3