missing part of lincoln's patch

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

diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index 0a6bb8b20ba5db2b65b8faaa441aa6b508c66af0..98f0632c45c6ef71fa761c6b21f200f2d35cb3f5 100644 (file)
--- a/libs/ardour/ticker.cc
+++ b/libs/ardour/ticker.cc
@@ -18,6 +18,9 @@
     $Id$
 */
 
+#include "midi++/port.h"
+#include "midi++/manager.h"
+#include "evoral/midi_events.h"
 #include "ardour/ticker.h"
 #include "ardour/session.h"
 #include "ardour/tempo.h"
@@ -34,7 +37,7 @@ void Ticker::set_session (Session* s)
        SessionHandlePtr::set_session (s);
 
        if (_session) {
-               _session_connections.add_connection (_session->tick.connect (boost::bind (&Ticker::tick, this, _1, _2, _3)));
+               _session->tick.connect_same_thread (_session_connections, boost::bind (&Ticker::tick, this, _1, _2, _3));
        }
 }
 
@@ -43,10 +46,9 @@ void MidiClockTicker::set_session (Session* s)
         Ticker::set_session (s);
 
         if (_session) {
-                _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)));
+                _session->TransportStateChange.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::transport_state_changed, this));
+                _session->PositionChanged.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::position_changed, this, _1));
+                _session->TransportLooped.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::transport_looped, this));
                 update_midi_clock_port();
         }
 }
@@ -60,7 +62,7 @@ MidiClockTicker::session_going_away ()
 
 void MidiClockTicker::update_midi_clock_port()
 {
-        _midi_port = _session->midi_clock_port();
+       _midi_port = MIDI::Manager::instance()->midi_clock_output_port();
 }
 
 void MidiClockTicker::transport_state_changed()
@@ -135,13 +137,9 @@ void MidiClockTicker::transport_looped()
 
 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)
+       if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f || _midi_port == 0)
                return;
 
-       MIDI::JACK_MidiPort* jack_port = dynamic_cast<MIDI::JACK_MidiPort*>(_midi_port);
-       assert(jack_port);
-
        while (true) {
                double next_tick = _last_tick + one_ppqn_in_frames(transport_frames);
                nframes_t next_tick_offset = nframes_t(next_tick) - transport_frames;
@@ -151,18 +149,17 @@ void MidiClockTicker::tick(const nframes_t& transport_frames, const BBT_Time& /*
                         << ":Last tick time:" << _last_tick << ":"
                         << ":Next tick time:" << next_tick << ":"
                         << "Offset:" << next_tick_offset << ":"
-                        << "cycle length:" << jack_port->nframes_this_cycle()
+                        << "cycle length:" << _midi_port->nframes_this_cycle()
                         << endl;
 #endif
 
-               if (next_tick_offset >= jack_port->nframes_this_cycle())
+               if (next_tick_offset >= _midi_port->nframes_this_cycle())
                        return;
 
                send_midi_clock_event(next_tick_offset);
 
                _last_tick = next_tick;
        }
-#endif // WITH_JACK_MIDI
 }
 
 double MidiClockTicker::one_ppqn_in_frames(nframes_t transport_position)
@@ -185,9 +182,7 @@ void MidiClockTicker::send_midi_clock_event(nframes_t offset)
                return;
        }
 
-#ifdef WITH_JACK_MIDI
-       assert (MIDI::JACK_MidiPort::is_process_thread());
-#endif // WITH_JACK_MIDI
+       assert (MIDI::Port::is_process_thread());
 #ifdef DEBUG_MIDI_CLOCK
        cerr << "Tick with offset " << offset << endl;
 #endif // DEBUG_MIDI_CLOCK