remove a couple of boost::signals2 trouble spots; fix some --strict compile time...

[ardour.git] / libs / ardour / ticker.cc

diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index 19f5ed195dd0d5ba87357f09dfb91d02d0e9b549..f35f84e88999139d9152202e7fca2d22ed0f5d2e 100644 (file)
--- 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(mem_fun (*this, &Ticker::tick));
-                _session->GoingAway.connect(mem_fun (*this, &Ticker::going_away));
-        }
+       if (_session) {
+               _session->tick.connect (_session_connections, 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(
-                                mem_fun (*this, &MidiClockTicker::update_midi_clock_port));
-                _session->TransportStateChange.connect(
-                                mem_fun (*this, &MidiClockTicker::transport_state_changed));
-                _session->PositionChanged.connect(
-                                mem_fun (*this, &MidiClockTicker::position_changed));
-                _session->TransportLooped.connect(
-                                mem_fun (*this, &MidiClockTicker::transport_looped));
+                _session->MIDIClock_PortChanged.connect (_session_connections, boost::bind (&MidiClockTicker::update_midi_clock_port, this));
+                _session->TransportStateChange.connect (_session_connections, boost::bind (&MidiClockTicker::transport_state_changed, this));
+                _session->PositionChanged.connect (_session_connections, boost::bind (&MidiClockTicker::position_changed, this, _1));
+                _session->TransportLooped.connect (_session_connections, 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();
@@ -103,7 +103,7 @@ void MidiClockTicker::transport_state_changed()
                send_stop_event(0);
        }
 
-       tick(position, *((ARDOUR::BBT_Time *) 0), *((SMPTE::Time *)0));
+       tick(position, *((ARDOUR::BBT_Time *) 0), *((Timecode::Time *)0));
 }
 
 void MidiClockTicker::position_changed(nframes_t position)
@@ -133,9 +133,8 @@ void MidiClockTicker::transport_looped()
        _last_tick = loop_location->start() - elapsed_since_last_tick;
 }
 
-void MidiClockTicker::tick(const nframes_t& transport_frames, const BBT_Time& /*transport_bbt*/, const SMPTE::Time& /*transport_smpt*/)
+void MidiClockTicker::tick(const nframes_t& transport_frames, const BBT_Time& /*transport_bbt*/, const Timecode::Time& /*transport_smpt*/)
 {
-#ifdef WITH_JACK_MIDI
        if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f)
                return;
 
@@ -162,7 +161,6 @@ void MidiClockTicker::tick(const nframes_t& transport_frames, const BBT_Time& /*
 
                _last_tick = next_tick;
        }
-#endif // WITH_JACK_MIDI
 }
 
 double MidiClockTicker::one_ppqn_in_frames(nframes_t transport_position)
@@ -181,6 +179,10 @@ double MidiClockTicker::one_ppqn_in_frames(nframes_t transport_position)
 
 void MidiClockTicker::send_midi_clock_event(nframes_t offset)
 {
+       if (!_midi_port) {
+               return;
+       }
+
 #ifdef WITH_JACK_MIDI
        assert (MIDI::JACK_MidiPort::is_process_thread());
 #endif // WITH_JACK_MIDI
@@ -193,21 +195,33 @@ void MidiClockTicker::send_midi_clock_event(nframes_t offset)
 
 void MidiClockTicker::send_start_event(nframes_t offset)
 {
+       if (!_midi_port) {
+               return;
+       }
+       
        static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_START };
        _midi_port->write(_midi_clock_tick, 1, offset);
 }
 
 void MidiClockTicker::send_continue_event(nframes_t offset)
 {
+       if (!_midi_port) {
+               return;
+       }
+       
        static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_CONTINUE };
        _midi_port->write(_midi_clock_tick, 1, offset);
 }
 
 void MidiClockTicker::send_stop_event(nframes_t offset)
 {
+       if (!_midi_port) {
+               return;
+       }
+       
        static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_STOP };
        _midi_port->write(_midi_clock_tick, 1, offset);
 }
 
-}
+