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/ticker.cc | |
| 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/ticker.cc')
| -rw-r--r-- | libs/ardour/ticker.cc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc index ab0a7144a8..0a6bb8b20b 100644 --- a/libs/ardour/ticker.cc +++ b/libs/ardour/ticker.cc @@ -27,37 +27,37 @@ using namespace std; #endif -namespace ARDOUR -{ - +using namespace ARDOUR; -void Ticker::set_session(Session& s) +void Ticker::set_session (Session* s) { - _session = &s; + SessionHandlePtr::set_session (s); - if (_session) { - _session->tick.connect(sigc::mem_fun (*this, &Ticker::tick)); - _session->GoingAway.connect(sigc::mem_fun (*this, &Ticker::going_away)); - } + if (_session) { + _session_connections.add_connection (_session->tick.connect (boost::bind (&Ticker::tick, this, _1, _2, _3))); + } } -void MidiClockTicker::set_session(Session& s) +void MidiClockTicker::set_session (Session* s) { - Ticker::set_session(s); + Ticker::set_session (s); if (_session) { - _session->MIDIClock_PortChanged.connect( - sigc::mem_fun (*this, &MidiClockTicker::update_midi_clock_port)); - _session->TransportStateChange.connect( - sigc::mem_fun (*this, &MidiClockTicker::transport_state_changed)); - _session->PositionChanged.connect( - sigc::mem_fun (*this, &MidiClockTicker::position_changed)); - _session->TransportLooped.connect( - sigc::mem_fun (*this, &MidiClockTicker::transport_looped)); + _session_connections.add_connection (_session->MIDIClock_PortChanged.connect (boost::bind (&MidiClockTicker::update_midi_clock_port, this))); + _session_connections.add_connection (_session->TransportStateChange.connect (boost::bind (&MidiClockTicker::transport_state_changed, this))); + _session_connections.add_connection (_session->PositionChanged.connect (boost::bind (&MidiClockTicker::position_changed, this, _1))); + _session_connections.add_connection (_session->TransportLooped.connect (boost::bind (&MidiClockTicker::transport_looped, this))); update_midi_clock_port(); } } +void +MidiClockTicker::session_going_away () +{ + SessionHandlePtr::session_going_away(); + _midi_port = 0; +} + void MidiClockTicker::update_midi_clock_port() { _midi_port = _session->midi_clock_port(); @@ -225,5 +225,5 @@ void MidiClockTicker::send_stop_event(nframes_t offset) _midi_port->write(_midi_clock_tick, 1, offset); } -} + |