diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-08 16:07:28 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-08 16:07:28 +0000 |
| commit | 3be16e8afbd891c0bfe7227158384ed0d127597f (patch) | |
| tree | 73a8f761fc13cbd0613d3923a34748bb9aa761d2 /gtk2_ardour/gain_meter.h | |
| parent | a9bb336fc44ab4937978f5a0308e440ed632ea50 (diff) | |
partial patch/partial by-hand merge of 2.X commits 3169&3170 to 3.X codebase
git-svn-id: svn://localhost/ardour2/branches/3.0@4300 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/gain_meter.h')
| -rw-r--r-- | gtk2_ardour/gain_meter.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h index d493edf0fb..820e9ef0e7 100644 --- a/gtk2_ardour/gain_meter.h +++ b/gtk2_ardour/gain_meter.h @@ -58,10 +58,12 @@ namespace Gtk { class GainMeterBase : virtual public sigc::trackable { public: - GainMeterBase (boost::shared_ptr<ARDOUR::IO>, ARDOUR::Session&, const Glib::RefPtr<Gdk::Pixbuf>& pix, + GainMeterBase ( ARDOUR::Session&, const Glib::RefPtr<Gdk::Pixbuf>& pix, bool horizontal); virtual ~GainMeterBase (); + virtual void set_io (boost::shared_ptr<ARDOUR::IO>); + void update_gain_sensitive (); void update_meters (); @@ -82,6 +84,7 @@ class GainMeterBase : virtual public sigc::trackable friend class MixerStrip; boost::shared_ptr<ARDOUR::IO> _io; ARDOUR::Session& _session; + std::vector<sigc::connection> connections; bool ignore_toggle; bool next_release_selects; @@ -169,9 +172,11 @@ class GainMeterBase : virtual public sigc::trackable class GainMeter : public GainMeterBase, public Gtk::VBox { public: - GainMeter (boost::shared_ptr<ARDOUR::IO>, ARDOUR::Session&); + GainMeter (ARDOUR::Session&); ~GainMeter () {} + void set_io (boost::shared_ptr<ARDOUR::IO>); + int get_gm_width (); void setup_meters (int len=0); |