make 3.0 catch up with transport and other changes in 2.X (hand applied, not merged)

[ardour.git] / libs / ardour / ardour / midi_source.h

diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index 1b452a7c4d4c3b1daa6e713a9d0eb8a1aa2d1732..dfbd5ea6a2f1377bed86fba0802099944ed5ab2b 100644 (file)
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -58,14 +58,14 @@ class MidiSource : virtual public Source
         * \param negative_stamp_offset Offset to subtract from event times written to dst
         * \param tracker an optional pointer to MidiStateTracker object, for note on/off tracking
         */
-       virtual nframes_t midi_read (MidiRingBuffer<nframes_t>& dst,
+       virtual nframes_t midi_read (Evoral::EventSink<nframes_t>& dst,
                                     sframes_t source_start,
                                     sframes_t start, nframes_t cnt,
                                     sframes_t stamp_offset, sframes_t negative_stamp_offset, MidiStateTracker*) const;
 
        virtual nframes_t midi_write (MidiRingBuffer<nframes_t>& src,
-                       sframes_t source_start,
-                       nframes_t cnt);
+                                     sframes_t source_start,
+                                     nframes_t cnt);
 
        virtual void append_event_unlocked_beats(const Evoral::Event<Evoral::MusicalTime>& ev) = 0;
 
@@ -114,7 +114,7 @@ class MidiSource : virtual public Source
   protected:
        virtual void flush_midi() = 0;
 
-       virtual nframes_t read_unlocked (MidiRingBuffer<nframes_t>& dst,
+       virtual nframes_t read_unlocked (Evoral::EventSink<nframes_t>& dst,
                                         sframes_t position,
                                         sframes_t start, nframes_t cnt,
                                         sframes_t stamp_offset, sframes_t negative_stamp_offset,
@@ -137,9 +137,6 @@ class MidiSource : virtual public Source
        mutable double    _length_beats;
        mutable sframes_t _last_read_end;
        sframes_t         _last_write_end;
-
-  private:
-       bool file_changed (std::string path);
 };
 
 }