summaryrefslogtreecommitdiff
path: root/libs/ardour/ticker.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-07-06 00:16:36 +0000
committerCarl Hetherington <carl@carlh.net>2010-07-06 00:16:36 +0000
commit91850f0eb4ab9f63bc6582d042d5495ea1968031 (patch)
treefb73d1ed43c228984cdd61c70f19d81e82f420a4 /libs/ardour/ticker.cc
parentdc1e5d09a27180b35453b45edaeb0a117d1489f9 (diff)
Remove non-JACK midi++ ports.
git-svn-id: svn://localhost/ardour2/branches/3.0@7377 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ticker.cc')
-rw-r--r--libs/ardour/ticker.cc13
1 files changed, 5 insertions, 8 deletions
diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index dbe81ae32c..4327e25c72 100644
--- a/libs/ardour/ticker.cc
+++ b/libs/ardour/ticker.cc
@@ -18,6 +18,8 @@
$Id$
*/
+#include "midi++/port.h"
+#include "evoral/midi_events.h"
#include "ardour/ticker.h"
#include "ardour/session.h"
#include "ardour/tempo.h"
@@ -138,9 +140,6 @@ void MidiClockTicker::tick(const nframes_t& transport_frames, const BBT_Time& /*
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;
@@ -150,11 +149,11 @@ 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);
@@ -183,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