start work on the changes to EngineControl (dialog) to integrate with new backend...

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

diff --git a/libs/ardour/ardour/ticker.h b/libs/ardour/ardour/ticker.h
index f87bca665d15b2a5e65c156c5b3ea6ea3201517c..23d2ef2fe6f8488411fab3465edcbbc7016af586 100644 (file)
--- a/libs/ardour/ardour/ticker.h
+++ b/libs/ardour/ardour/ticker.h
@@ -18,60 +18,38 @@
     $Id$
 */
 
-#include <sigc++/sigc++.h>
+#include <boost/noncopyable.hpp>
+
+#include "pbd/signals.h"
 
 #include "ardour/types.h"
-#include "midi++/jack.h"
+#include "ardour/session_handle.h"
+
 
 #ifndef TICKER_H_
 #define TICKER_H_
 
+namespace MIDI {
+       class Port;
+}
+
 namespace ARDOUR
 {
 
 class Session;
 
-class Ticker : public sigc::trackable
+class MidiClockTicker : public SessionHandlePtr, boost::noncopyable
 {
 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;
-
-       virtual void set_session(Session& s);
-       virtual void going_away() { _session = 0; }
-
-protected:
-       Session* _session;
-};
-
-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 ();
        virtual ~MidiClockTicker() {};
 
-       static MidiClockTicker& instance() {
-               static MidiClockTicker _instance;
-               return _instance;
-       }
+       void tick (const framepos_t& transport_frames);
 
-       void tick(
-               const nframes_t& transport_frames,
-               const BBT_Time& transport_bbt,
-               const SMPTE::Time& transport_smpte);
+       bool has_midi_port() const { return _midi_port != 0; }
 
-       void set_session(Session& s);
-       void going_away() { _midi_port = 0; Ticker::going_away(); }
+       void set_session (Session* s);
+       void session_going_away();
 
        /// slot for the signal session::MIDIClock_PortChanged
        void update_midi_clock_port();
@@ -80,7 +58,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();
@@ -93,12 +71,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);
 };
 
 }