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

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

diff --git a/libs/ardour/ardour/ticker.h b/libs/ardour/ardour/ticker.h
index 9a26d4d3ff2eb0afa3baca9e2eff7c034f80662e..42f3d88dc91be936c3b1ad8870dbc9120f2ed06d 100644 (file)
--- a/libs/ardour/ardour/ticker.h
+++ b/libs/ardour/ardour/ticker.h
@@ -19,8 +19,7 @@
 */
 
 
-#include "midi++/jack.h"
-#include "pbd/scoped_connections.h"
+#include "pbd/signals.h"
 
 #include "ardour/types.h"
 #include "ardour/session_handle.h"
@@ -29,6 +28,10 @@
 #ifndef TICKER_H_
 #define TICKER_H_
 
+namespace MIDI {
+       class Port;
+}
+
 namespace ARDOUR
 {
 
@@ -40,8 +43,8 @@ public:
        Ticker() {};
        virtual ~Ticker() {}
 
-       virtual void tick(
-               const nframes_t& transport_frames,
+       virtual void tick (
+               const framepos_t& transport_frames,
                const BBT_Time& transport_bbt,
                const Timecode::Time& transport_timecode) = 0;
 
@@ -65,7 +68,7 @@ public:
        }
 
        void tick(
-               const nframes_t& transport_frames,
+               const framepos_t& transport_frames,
                const BBT_Time& transport_bbt,
                const Timecode::Time& transport_timecode);
 
@@ -79,7 +82,7 @@ public:
        void transport_state_changed();
 
        /// slot for the signal session::PositionChanged
-       void position_changed(nframes_t position);
+       void position_changed (framepos_t position);
 
        /// slot for the signal session::TransportLooped
        void transport_looped();
@@ -92,12 +95,12 @@ private:
        int          _ppqn;
        double       _last_tick;
 
-       double one_ppqn_in_frames(nframes_t transport_position);
+       double one_ppqn_in_frames (framepos_t transport_position);
 
-       void send_midi_clock_event(nframes_t offset);
-       void send_start_event(nframes_t offset);
-       void send_continue_event(nframes_t offset);
-       void send_stop_event(nframes_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);
 };
 
 }