diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
| commit | f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe (patch) | |
| tree | 5214c580b9e6c17a499fa587660dbf949e892bf2 /gtk2_ardour/gain_meter.h | |
| parent | da762129f19c28aff64f833b6ec09fba946faef6 (diff) | |
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/gain_meter.h')
| -rw-r--r-- | gtk2_ardour/gain_meter.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h index 448e0239fe..16c818dead 100644 --- a/gtk2_ardour/gain_meter.h +++ b/gtk2_ardour/gain_meter.h @@ -32,11 +32,14 @@ #include <gtkmm/drawingarea.h> #include <gdkmm/colormap.h> +#include "pbd/scoped_connections.h" + #include "ardour/types.h" +#include "ardour/session_handle.h" -#include <gtkmm2ext/click_box.h> -#include <gtkmm2ext/focus_entry.h> -#include <gtkmm2ext/slider_controller.h> +#include "gtkmm2ext/click_box.h" +#include "gtkmm2ext/focus_entry.h" +#include "gtkmm2ext/slider_controller.h" #include "enums.h" #include "level_meter.h" @@ -58,10 +61,10 @@ namespace Gtk { class Menu; } -class GainMeterBase : virtual public sigc::trackable +class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr { public: - GainMeterBase (ARDOUR::Session&, const Glib::RefPtr<Gdk::Pixbuf>& pix, + GainMeterBase (ARDOUR::Session*, const Glib::RefPtr<Gdk::Pixbuf>& pix, bool horizontal, int); virtual ~GainMeterBase (); @@ -90,8 +93,8 @@ class GainMeterBase : virtual public sigc::trackable boost::shared_ptr<ARDOUR::Route> _route; boost::shared_ptr<ARDOUR::PeakMeter> _meter; boost::shared_ptr<ARDOUR::Amp> _amp; - ARDOUR::Session& _session; std::vector<sigc::connection> connections; + PBD::ScopedConnectionList model_connections; bool ignore_toggle; bool next_release_selects; @@ -180,7 +183,7 @@ class GainMeterBase : virtual public sigc::trackable class GainMeter : public GainMeterBase, public Gtk::VBox { public: - GainMeter (ARDOUR::Session&, int); + GainMeter (ARDOUR::Session*, int); ~GainMeter () {} virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route, |