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/editor.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/editor.h')
| -rw-r--r-- | gtk2_ardour/editor.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 36895bf784..a29df6ebb6 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -46,6 +46,8 @@ #include <gtkmm2ext/dndtreeview.h> #include "pbd/stateful.h" +#include "pbd/scoped_connections.h" + #include "ardour/import_status.h" #include "ardour/tempo.h" #include "ardour/location.h" @@ -155,14 +157,15 @@ struct EditorCursor { sigc::signal<void, nframes64_t> PositionChanged; }; -class Editor : public PublicEditor +class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr { public: Editor (); ~Editor (); - void connect_to_session (ARDOUR::Session *); - ARDOUR::Session* current_session() const { return session; } + void set_session (ARDOUR::Session *); + ARDOUR::Session* session() const { return _session; } + void first_idle (); virtual bool have_idled () const { return _have_idled; } @@ -443,7 +446,6 @@ class Editor : public PublicEditor void color_handler (); - ARDOUR::Session *session; ///< The session that we are editing, or 0 bool constructed; // to keep track of the playhead position for control_scroll @@ -1893,7 +1895,7 @@ public: int playlist_deletion_dialog (boost::shared_ptr<ARDOUR::Playlist>); - std::vector<sigc::connection> session_connections; + PBD::ScopedConnectionList session_connections; /* tracking step changes of track height */ |