From e8c59e4155a6fa40863c2d761ab8e1c5b81c589b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 13 Dec 2010 16:03:24 +0000 Subject: Remove unnecessary assert from midi clock ticker code; MIDI::Port handles non-process thread sends using a ringbuffer. Clean up some types. git-svn-id: svn://localhost/ardour2/branches/3.0@8259 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ticker.cc | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'libs/ardour/ticker.cc') diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc index d3499c13be..fdae97e4bc 100644 --- a/libs/ardour/ticker.cc +++ b/libs/ardour/ticker.cc @@ -176,48 +176,46 @@ double MidiClockTicker::one_ppqn_in_frames (framepos_t transport_position) return frames_per_quarter_note / double (_ppqn); } -void MidiClockTicker::send_midi_clock_event (framecnt_t offset) +void MidiClockTicker::send_midi_clock_event (pframes_t offset) { if (!_midi_port) { return; } - assert (MIDI::Port::is_process_thread()); -#ifdef DEBUG_MIDI_CLOCK - cerr << "Tick with offset " << offset << endl; -#endif // DEBUG_MIDI_CLOCK + DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Tick with offset %1", offset)); + static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_CLOCK }; - _midi_port->write(_midi_clock_tick, 1, offset); + _midi_port->write (_midi_clock_tick, 1, offset); } -void MidiClockTicker::send_start_event (framecnt_t offset) +void MidiClockTicker::send_start_event (pframes_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); + _midi_port->write (_midi_clock_tick, 1, offset); } -void MidiClockTicker::send_continue_event (framecnt_t offset) +void MidiClockTicker::send_continue_event (pframes_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); + _midi_port->write (_midi_clock_tick, 1, offset); } -void MidiClockTicker::send_stop_event (framecnt_t offset) +void MidiClockTicker::send_stop_event (pframes_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); + _midi_port->write (_midi_clock_tick, 1, offset); } -- cgit v1.2.3