there is no remote model choice anymore - ordering is determined by the GUI

[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 1c1f2bbcbaaa165af3700271e6c5128da8b9a0a3..8f58fda2fea7b0cf0c83fa0facaedca0d216b661 100644 (file)
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -47,26 +47,24 @@ 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<Evoral::Beats>& ev);
+       void append_event_frames (const Lock& lock, const Evoral::Event<framepos_t>& ev, framepos_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<Evoral::Beats>::StuckNoteOption,
+                                                 Evoral::Beats when = Evoral::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);
@@ -74,27 +72,36 @@ public:
        void prevent_deletion ();
 
   protected:
+       void close ();
        void set_path (const std::string& newpath);
+       void flush_midi (const Lock& lock);
 
   private:
+       bool _open;
+       Evoral::Beats       _last_ev_time_beats;
+       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;
+
        int open_for_write ();
 
-       framecnt_t read_unlocked (Evoral::EventSink<framepos_t>& dst,
+       void ensure_disk_file (const Lock& lock);
+
+       framecnt_t read_unlocked (const Lock&                    lock,
+                                 Evoral::EventSink<framepos_t>& dst,
                                  framepos_t                     position,
                                  framepos_t                     start,
                                  framecnt_t                     cnt,
-                                 MidiStateTracker*              tracker) const;
+                                 MidiStateTracker*              tracker,
+                                 MidiChannelFilter*             filter) const;
 
-       framecnt_t write_unlocked (MidiRingBuffer<framepos_t>& src,
+       framecnt_t write_unlocked (const Lock&                 lock,
+                                  MidiRingBuffer<framepos_t>& src,
                                   framepos_t                  position,
                                   framecnt_t                  cnt);
 
-       Evoral::MusicalTime _last_ev_time_beats;
-       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 */