Respond to MMC even when synced to JACK. Fixes #3700.

[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 165e03e483a2e0670ff9cae53822e56c94108242..32163551a0cfd4293b03b26405c4dff54195d050 100644 (file)
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -52,9 +52,9 @@ public:
        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,7 +65,7 @@ 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 std::string& path);
 
@@ -73,22 +73,22 @@ public:
         void set_path (const std::string& newpath);
         
   private:
-       nframes_t read_unlocked (Evoral::EventSink<nframes_t>& dst,
-                                sframes_t position,
-                                sframes_t start,
-                                nframes_t cnt,
-                                MidiStateTracker* tracker) const;
+       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);
+       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;
+       framepos_t _last_ev_time_frames;
        /** end time (start + duration) of last call to read_unlocked */
-       mutable sframes_t _smf_last_read_end;
+       mutable framepos_t _smf_last_read_end;
        /** time (in SMF ticks, 1 tick per _ppqn) of the last event read by read_unlocked */
-       mutable sframes_t _smf_last_read_time;
+       mutable framepos_t _smf_last_read_time;
 };
 
 }; /* namespace ARDOUR */