Remove all use of nframes_t.

[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 fbaa049d8ab54456be855b4c8b3bb11a7d08bef9..32163551a0cfd4293b03b26405c4dff54195d050 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 std::string& path, 
                        Source::Flag flags = Source::Flag(0));
 
        /** Constructor for existing in-session files */
@@ -45,16 +45,16 @@ public:
 
        virtual ~SMFSource ();
 
-       bool safe_file_extension (const Glib::ustring& path) const {
+       bool safe_file_extension (const std::string& 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<Evoral::MusicalTime>& ev);
-       void append_event_unlocked_frames (const Evoral::Event<nframes_t>& ev, sframes_t source_start);
+       void append_event_unlocked_frames (const Evoral::Event<framepos_t>& ev, framepos_t source_start);
 
-       void mark_streaming_midi_write_started (NoteMode mode, sframes_t start_time);
+       void mark_streaming_midi_write_started (NoteMode mode, framepos_t start_time);
        void mark_streaming_write_completed ();
 
        XMLNode& get_state ();
@@ -65,27 +65,30 @@ public:
 
        void flush_midi ();
 
-       static void set_header_position_offset (nframes_t offset, bool negative);
+       static void set_header_position_offset (framecnt_t offset, bool negative);
 
-       static bool safe_midi_file_extension (const Glib::ustring& path);
+       static bool safe_midi_file_extension (const std::string& 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;
+  protected:
+        void set_path (const std::string& newpath);
+        
+  private:
+       framecnt_t read_unlocked (Evoral::EventSink<framepos_t>& dst,
+                                 framepos_t position,
+                                 framepos_t start,
+                                 framecnt_t cnt,
+                                 MidiStateTracker* tracker) const;
 
-       nframes_t write_unlocked (MidiRingBuffer<nframes_t>& src,
-                       sframes_t position,
-                       nframes_t cnt);
-
-       void set_default_controls_interpolation ();
+       framecnt_t write_unlocked (MidiRingBuffer<framepos_t>& src,
+                                  framepos_t position,
+                                  framecnt_t cnt);
 
        double    _last_ev_time_beats;
-       sframes_t _last_ev_time_frames;
-       mutable sframes_t _smf_last_read_end;
+       framepos_t _last_ev_time_frames;
+       /** end time (start + duration) of last call to read_unlocked */
+       mutable framepos_t _smf_last_read_end;
+       /** time (in SMF ticks, 1 tick per _ppqn) of the last event read by read_unlocked */
+       mutable framepos_t _smf_last_read_time;
 };
 
 }; /* namespace ARDOUR */