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 d93fdb8506322ed6a6bb53978b9526745af17192..8f58fda2fea7b0cf0c83fa0facaedca0d216b661 100644 (file)
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -51,14 +51,14 @@ public:
                return safe_midi_file_extension(path);
        }
 
-       void append_event_beats (const Lock& lock, const Evoral::Event<Evoral::MusicalTime>& ev);
+       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 (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::MusicalTime>::StuckNoteOption,
-                                                 Evoral::MusicalTime when = Evoral::MusicalTime());
+                                                 Evoral::Sequence<Evoral::Beats>::StuckNoteOption,
+                                                 Evoral::Beats when = Evoral::Beats());
 
        XMLNode& get_state ();
        int set_state (const XMLNode&, int version);
@@ -72,12 +72,13 @@ public:
        void prevent_deletion ();
 
   protected:
+       void close ();
        void set_path (const std::string& newpath);
        void flush_midi (const Lock& lock);
 
   private:
        bool _open;
-       Evoral::MusicalTime _last_ev_time_beats;
+       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;
@@ -85,7 +86,7 @@ public:
        mutable framepos_t _smf_last_read_time;
 
        int open_for_write ();
-       
+
        void ensure_disk_file (const Lock& lock);
 
        framecnt_t read_unlocked (const Lock&                    lock,
@@ -93,7 +94,8 @@ public:
                                  framepos_t                     position,
                                  framepos_t                     start,
                                  framecnt_t                     cnt,
-                                 MidiStateTracker*              tracker) const;
+                                 MidiStateTracker*              tracker,
+                                 MidiChannelFilter*             filter) const;
 
        framecnt_t write_unlocked (const Lock&                 lock,
                                   MidiRingBuffer<framepos_t>& src,