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/processor_box.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/processor_box.h')
| -rw-r--r-- | gtk2_ardour/processor_box.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h index daff50dfe7..e704eba015 100644 --- a/gtk2_ardour/processor_box.h +++ b/gtk2_ardour/processor_box.h @@ -20,9 +20,11 @@ #ifndef __ardour_gtk_processor_box__ #define __ardour_gtk_processor_box__ +#include <cmath> #include <vector> -#include <cmath> +#include <boost/function.hpp> + #include <gtkmm/box.h> #include <gtkmm/eventbox.h> #include <gtkmm/menu.h> @@ -34,6 +36,7 @@ #include <gtkmm2ext/pixfader.h> #include "pbd/stateful.h" +#include "pbd/scoped_connections.h" #include "ardour/types.h" #include "ardour/ardour.h" @@ -41,6 +44,7 @@ #include "ardour/port_insert.h" #include "ardour/processor.h" #include "ardour/route.h" +#include "ardour/session_handle.h" #include "pbd/fastlog.h" @@ -120,11 +124,11 @@ private: static Glib::RefPtr<Gdk::Pixbuf> _slider; }; -class ProcessorBox : public Gtk::HBox, public PluginInterestedObject +class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARDOUR::SessionHandlePtr { public: - ProcessorBox (ARDOUR::Session&, sigc::slot<PluginSelector*> get_plugin_selector, - RouteRedirectSelection&, MixerStrip* parent, bool owner_is_mixer = false); + ProcessorBox (ARDOUR::Session*, boost::function<PluginSelector*()> get_plugin_selector, + RouteRedirectSelection&, MixerStrip* parent, bool owner_is_mixer = false); ~ProcessorBox (); void set_route (boost::shared_ptr<ARDOUR::Route>); @@ -145,13 +149,12 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject private: boost::shared_ptr<ARDOUR::Route> _route; - ARDOUR::Session & _session; MixerStrip* _parent_strip; // null if in RouteParamsUI bool _owner_is_mixer; bool ab_direction; - std::vector<sigc::connection> connections; + PBD::ScopedConnectionList connections; - sigc::slot<PluginSelector*> _get_plugin_selector; + boost::function<PluginSelector*()> _get_plugin_selector; boost::shared_ptr<ARDOUR::Processor> _processor_being_created; |