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/crossfade_edit.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/crossfade_edit.h')
| -rw-r--r-- | gtk2_ardour/crossfade_edit.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h index f2ec1a125b..7334002abd 100644 --- a/gtk2_ardour/crossfade_edit.h +++ b/gtk2_ardour/crossfade_edit.h @@ -27,6 +27,8 @@ #include <gtkmm/radiobutton.h> #include "evoral/Curve.hpp" +#include "ardour/session_handle.h" + #include "ardour_dialog.h" #include "canvas.h" @@ -40,7 +42,7 @@ namespace ARDOUR class CrossfadeEditor : public ArdourDialog { public: - CrossfadeEditor (ARDOUR::Session&, boost::shared_ptr<ARDOUR::Crossfade>, double miny, double maxy); + CrossfadeEditor (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Crossfade>, double miny, double maxy); ~CrossfadeEditor (); void apply (); @@ -79,7 +81,6 @@ class CrossfadeEditor : public ArdourDialog private: boost::shared_ptr<ARDOUR::Crossfade> xfade; - ARDOUR::Session& session; Gtk::VBox vpacker; @@ -182,10 +183,10 @@ class CrossfadeEditor : public ArdourDialog void set (const ARDOUR::AutomationList& alist, WhichFade); - sigc::connection peaks_ready_connection; + boost::signals2::scoped_connection peaks_ready_connection; void make_waves (boost::shared_ptr<ARDOUR::AudioRegion>, WhichFade); - void peaks_ready (boost::shared_ptr<ARDOUR::AudioRegion> r, WhichFade); + void peaks_ready (boost::weak_ptr<ARDOUR::AudioRegion> r, WhichFade); void _apply_to (boost::shared_ptr<ARDOUR::Crossfade> xf); void setup (boost::shared_ptr<ARDOUR::Crossfade>); |