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

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

diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index 3c6364532a6f368343b400ca69aeb18f667aea06..44080a8cff898cd6b0b3219393edba66d78d6b25 100644 (file)
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -37,7 +37,7 @@ template<typename T> class MidiRingBuffer;
 class SMFSource : public MidiSource, public FileSource, public Evoral::SMF {
 public:
        /** Constructor for existing external-to-session files */
-       SMFSource (Session& session, const Glib::ustring& path, bool embedded,
+       SMFSource (Session& session, const Glib::ustring& path, 
                        Source::Flag flags = Source::Flag(0));
 
        /** Constructor for existing in-session files */
@@ -58,7 +58,7 @@ public:
        void mark_streaming_write_completed ();
 
        XMLNode& get_state ();
-       int set_state (const XMLNode&, int version = 3000);
+       int set_state (const XMLNode&, int version);
 
        void load_model (bool lock=true, bool force_reload=false);
        void destroy_model ();
@@ -70,12 +70,13 @@ public:
        static bool safe_midi_file_extension (const Glib::ustring& path);
 
 private:
-       nframes_t read_unlocked (MidiRingBuffer<nframes_t>& dst,
-                       sframes_t position,
-                       sframes_t start,
-                       nframes_t cnt,
-                       sframes_t stamp_offset,
-                       sframes_t negative_stamp_offset) const;
+       nframes_t read_unlocked (Evoral::EventSink<nframes_t>& dst,
+                                sframes_t position,
+                                sframes_t start,
+                                nframes_t cnt,
+                                sframes_t stamp_offset,
+                                sframes_t negative_stamp_offset,
+                                MidiStateTracker* tracker) const;
 
        nframes_t write_unlocked (MidiRingBuffer<nframes_t>& src,
                        sframes_t position,