Remove unnecessary assert from midi clock ticker code; MIDI::Port handles non-process...

git-svn-id: svn://localhost/ardour2/branches/3.0@8259 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/ardour/ticker.h b/libs/ardour/ardour/ticker.h
index 0a24070608b654dfbb6002dd50aff20121e77ea0..42f3d88dc91be936c3b1ad8870dbc9120f2ed06d 100644 (file)
--- a/libs/ardour/ardour/ticker.h
+++ b/libs/ardour/ardour/ticker.h
@@ -97,10 +97,10 @@ private:
 
        double one_ppqn_in_frames (framepos_t transport_position);
 
-       void send_midi_clock_event (framecnt_t offset);
-       void send_start_event (framecnt_t offset);
-       void send_continue_event (framecnt_t offset);
-       void send_stop_event (framecnt_t offset);
+       void send_midi_clock_event (pframes_t offset);
+       void send_start_event (pframes_t offset);
+       void send_continue_event (pframes_t offset);
+       void send_stop_event (pframes_t offset);
 };
 
 }

diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index d3499c13be899707830a40024de0987a873478ef..fdae97e4bcd5ed9d477e8770d128cbe6599c74dd 100644 (file)
--- 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);
 }