more MTC stuff, including toggleable use of torben's PI controller

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

diff --git a/libs/ardour/ardour/ticker.h b/libs/ardour/ardour/ticker.h
index 249f6b885f850a01305ebb3a69578165633898b1..3e0f1844a690f8395709b083b937fa5a9d656219 100644 (file)
--- a/libs/ardour/ardour/ticker.h
+++ b/libs/ardour/ardour/ticker.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2008 Hans Baier 
+    Copyright (C) 2008 Hans Baier
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -36,14 +36,14 @@ class Ticker : public sigc::trackable
 public:
        Ticker() : _session(0) {};
        virtual ~Ticker() {};
-       
+
        virtual void tick(
-               const nframes_t& transport_frames, 
-               const BBT_Time& transport_bbt, 
-               const SMPTE::Time& transport_smpte) = 0;
-       
+               const nframes_t& transport_frames,
+               const BBT_Time& transport_bbt,
+               const Timecode::Time& transport_timecode) = 0;
+
        virtual void set_session(Session& s);
-       virtual void going_away() { _session = 0;  delete this; }
+       virtual void going_away() { _session = 0; }
 
 protected:
        Session* _session;
@@ -51,38 +51,50 @@ protected:
 
 class MidiClockTicker : public Ticker
 {
+       /// Singleton
+private:
+       MidiClockTicker() : _midi_port(0), _ppqn(24), _last_tick(0.0) {};
+       MidiClockTicker( const MidiClockTicker& );
+       MidiClockTicker& operator= (const MidiClockTicker&);
+
 public:
-       MidiClockTicker() : _jack_port(0), _ppqn(24), _last_tick(0.0) {};
        virtual ~MidiClockTicker() {};
-       
+
+       static MidiClockTicker& instance() {
+               static MidiClockTicker _instance;
+               return _instance;
+       }
+
        void tick(
-               const nframes_t& transport_frames, 
-               const BBT_Time& transport_bbt, 
-               const SMPTE::Time& transport_smpte);
-       
+               const nframes_t& transport_frames,
+               const BBT_Time& transport_bbt,
+               const Timecode::Time& transport_timecode);
+
        void set_session(Session& s);
-       void going_away() { Ticker::going_away(); _jack_port = 0;}
-       
+       void going_away() { _midi_port = 0; Ticker::going_away(); }
+
        /// slot for the signal session::MIDIClock_PortChanged
        void update_midi_clock_port();
-       
+
        /// slot for the signal session::TransportStateChange
        void transport_state_changed();
-       
+
        /// slot for the signal session::PositionChanged
        void position_changed(nframes_t position);
 
        /// slot for the signal session::TransportLooped
        void transport_looped();
-       
+
        /// pulses per quarter note (default 24)
        void set_ppqn(int ppqn) { _ppqn = ppqn; }
 
-private:       
-       MIDI::JACK_MidiPort* _jack_port;
-       int                  _ppqn;
-       double               _last_tick;
-       
+private:
+       MIDI::Port*  _midi_port;
+       int          _ppqn;
+       double       _last_tick;
+
+       double one_ppqn_in_frames(nframes_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);