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 /libs/ardour/ardour/ticker.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 'libs/ardour/ardour/ticker.h')
-rw-r--r-- | libs/ardour/ardour/ticker.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/libs/ardour/ardour/ticker.h b/libs/ardour/ardour/ticker.h index 3e0f1844a6..9a26d4d3ff 100644 --- a/libs/ardour/ardour/ticker.h +++ b/libs/ardour/ardour/ticker.h @@ -18,10 +18,13 @@ $Id$ */ -#include <sigc++/sigc++.h> -#include "ardour/types.h" #include "midi++/jack.h" +#include "pbd/scoped_connections.h" + +#include "ardour/types.h" +#include "ardour/session_handle.h" + #ifndef TICKER_H_ #define TICKER_H_ @@ -31,22 +34,18 @@ namespace ARDOUR class Session; -class Ticker : public sigc::trackable +class Ticker : public SessionHandlePtr { public: - Ticker() : _session(0) {}; - virtual ~Ticker() {}; + Ticker() {}; + virtual ~Ticker() {} virtual void tick( const nframes_t& transport_frames, const BBT_Time& transport_bbt, const Timecode::Time& transport_timecode) = 0; - virtual void set_session(Session& s); - virtual void going_away() { _session = 0; } - -protected: - Session* _session; + void set_session (Session* s); }; class MidiClockTicker : public Ticker @@ -70,8 +69,8 @@ public: const BBT_Time& transport_bbt, const Timecode::Time& transport_timecode); - void set_session(Session& s); - void going_away() { _midi_port = 0; Ticker::going_away(); } + void set_session (Session* s); + void session_going_away(); /// slot for the signal session::MIDIClock_PortChanged void update_midi_clock_port(); |