Part 1 of loading 2.X sessions; some things work, some things don't, hacks a-plenty.

[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 7942a118af95de1971ba9b9d60aea9f00644ee58..3c6364532a6f368343b400ca69aeb18f667aea06 100644 (file)
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -18,14 +18,14 @@
 
 */
 
-#ifndef __ardour_smf_source_h__ 
+#ifndef __ardour_smf_source_h__
 #define __ardour_smf_source_h__
 
 #include <cstdio>
 #include <time.h>
-#include <evoral/SMF.hpp>
-#include <ardour/midi_source.h>
-#include <ardour/file_source.h>
+#include "evoral/SMF.hpp"
+#include "ardour/midi_source.h"
+#include "ardour/file_source.h"
 
 namespace Evoral { template<typename T> class Event; }
 
@@ -44,47 +44,48 @@ public:
        SMFSource (Session& session, const XMLNode&, bool must_exist = false);
 
        virtual ~SMFSource ();
-       
+
        bool safe_file_extension (const Glib::ustring& path) const {
                return safe_midi_file_extension(path);
        }
 
        bool set_name (const std::string& newname) { return (set_source_name(newname, false) == 0); }
-       
-       void append_event_unlocked_beats (const Evoral::Event<double>& ev);
-       void append_event_unlocked_frames (const Evoral::Event<nframes_t>& ev, nframes_t position);
 
-       void mark_streaming_midi_write_started (NoteMode mode, nframes_t start_time);
+       void append_event_unlocked_beats (const Evoral::Event<Evoral::MusicalTime>& ev);
+       void append_event_unlocked_frames (const Evoral::Event<nframes_t>& ev, sframes_t source_start);
+
+       void mark_streaming_midi_write_started (NoteMode mode, sframes_t start_time);
        void mark_streaming_write_completed ();
 
        XMLNode& get_state ();
-       int set_state (const XMLNode&);
+       int set_state (const XMLNode&, int version = 3000);
 
        void load_model (bool lock=true, bool force_reload=false);
        void destroy_model ();
 
        void flush_midi ();
-       
+
        static void set_header_position_offset (nframes_t offset, bool negative);
 
        static bool safe_midi_file_extension (const Glib::ustring& path);
 
 private:
        nframes_t read_unlocked (MidiRingBuffer<nframes_t>& dst,
-                       nframes_t position,
-                       nframes_t start,
+                       sframes_t position,
+                       sframes_t start,
                        nframes_t cnt,
-                       nframes_t stamp_offset,
-                       nframes_t negative_stamp_offset) const;
+                       sframes_t stamp_offset,
+                       sframes_t negative_stamp_offset) const;
 
        nframes_t write_unlocked (MidiRingBuffer<nframes_t>& src,
-                       nframes_t position,
+                       sframes_t position,
                        nframes_t cnt);
 
        void set_default_controls_interpolation ();
 
        double    _last_ev_time_beats;
-       nframes_t _last_ev_time_frames;
+       sframes_t _last_ev_time_frames;
+       mutable sframes_t _smf_last_read_end;
 };
 
 }; /* namespace ARDOUR */