remember meter type with session

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

diff --git a/libs/ardour/ardour/ticker.h b/libs/ardour/ardour/ticker.h
index 07aa1cc52241ad809baa2a291e6f7c7293594c15..23d2ef2fe6f8488411fab3465edcbbc7016af586 100644 (file)
--- a/libs/ardour/ardour/ticker.h
+++ b/libs/ardour/ardour/ticker.h
@@ -18,6 +18,7 @@
     $Id$
 */
 
+#include <boost/noncopyable.hpp>
 
 #include "pbd/signals.h"
 
@@ -37,40 +38,15 @@ namespace ARDOUR
 
 class Session;
 
-class Ticker : public SessionHandlePtr
+class MidiClockTicker : public SessionHandlePtr, boost::noncopyable
 {
 public:
-       Ticker() {};
-       virtual ~Ticker() {}
-
-       virtual void tick (
-               const framepos_t&         transport_frames,
-               const Timecode::BBT_Time& transport_bbt,
-               const Timecode::Time&     transport_timecode) = 0;
-
-       void set_session (Session* s);
-};
-
-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 framepos_t&         transport_frames,
-               const Timecode::BBT_Time& transport_bbt,
-               const Timecode::Time&     transport_timecode);
+       bool has_midi_port() const { return _midi_port != 0; }
 
        void set_session (Session* s);
        void session_going_away();