Fix set_loop() return value (amend 00a4ad)

[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 56b70b15bd49ca3d8e9353ed6b983b7dcdcf5ce7..88c02beed5ede234d8739115a5d1dc8edb4c4218 100644 (file)
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -47,55 +47,61 @@ public:
 
        virtual ~SMFSource ();
 
-        bool safe_file_extension (const std::string& path) const {
+       bool safe_file_extension (const std::string& path) const {
                return safe_midi_file_extension(path);
        }
 
-       void append_event_unlocked_beats (const Evoral::Event<Evoral::MusicalTime>& ev);
-       void append_event_unlocked_frames (const Evoral::Event<framepos_t>& ev, framepos_t source_start);
+       void append_event_beats (const Lock& lock, const Evoral::Event<Temporal::Beats>& ev);
+       void append_event_samples (const Lock& lock, const Evoral::Event<samplepos_t>& ev, samplepos_t source_start);
 
-       void mark_streaming_midi_write_started (NoteMode mode);
-       void mark_streaming_write_completed ();
-       void mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::MusicalTime>::StuckNoteOption,
-                                                 Evoral::MusicalTime when = Evoral::MusicalTime());
+       void mark_streaming_midi_write_started (const Lock& lock, NoteMode mode);
+       void mark_streaming_write_completed (const Lock& lock);
+       void mark_midi_streaming_write_completed (const Lock& lock,
+                                                 Evoral::Sequence<Temporal::Beats>::StuckNoteOption,
+                                                 Temporal::Beats when = Temporal::Beats());
 
        XMLNode& get_state ();
        int set_state (const XMLNode&, int version);
 
-       void load_model (bool lock=true, bool force_reload=false);
-       void destroy_model ();
-
-       void flush_midi ();
-       void ensure_disk_file ();
+       void load_model (const Glib::Threads::Mutex::Lock& lock, bool force_reload=false);
+       void destroy_model (const Glib::Threads::Mutex::Lock& lock);
 
        static bool safe_midi_file_extension (const std::string& path);
        static bool valid_midi_file (const std::string& path);
 
        void prevent_deletion ();
+       void set_path (const std::string& newpath);
 
   protected:
-       void set_path (const std::string& newpath);
+       void close ();
+       void flush_midi (const Lock& lock);
 
   private:
        bool _open;
-       Evoral::MusicalTime _last_ev_time_beats;
-       framepos_t          _last_ev_time_frames;
+       Temporal::Beats     _last_ev_time_beats;
+       samplepos_t          _last_ev_time_samples;
        /** end time (start + duration) of last call to read_unlocked */
-       mutable framepos_t _smf_last_read_end;
+       mutable samplepos_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;
+       mutable samplepos_t _smf_last_read_time;
 
        int open_for_write ();
-       
-       framecnt_t read_unlocked (Evoral::EventSink<framepos_t>& dst,
-                                 framepos_t                     position,
-                                 framepos_t                     start,
-                                 framecnt_t                     cnt,
-                                 MidiStateTracker*              tracker) const;
-
-       framecnt_t write_unlocked (MidiRingBuffer<framepos_t>& src,
-                                  framepos_t                  position,
-                                  framecnt_t                  cnt);
+
+       void ensure_disk_file (const Lock& lock);
+
+       samplecnt_t read_unlocked (const Lock&                    lock,
+                                 Evoral::EventSink<samplepos_t>& dst,
+                                 samplepos_t                     position,
+                                 samplepos_t                     start,
+                                 samplecnt_t                     cnt,
+                                 Evoral::Range<samplepos_t>*     loop_range,
+                                 MidiStateTracker*              tracker,
+                                 MidiChannelFilter*             filter) const;
+
+       samplecnt_t write_unlocked (const Lock&                 lock,
+                                  MidiRingBuffer<samplepos_t>& src,
+                                  samplepos_t                  position,
+                                  samplecnt_t                  cnt);
 
 };