Remove unused source file_changed methods.

[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 a479b4a8a845f1fc3e28e5c6db815dbb234b72ec..dfbd5ea6a2f1377bed86fba0802099944ed5ab2b 100644 (file)
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 2006 Paul Davis
        Written by Dave Robillard, 2006
 
     This program is free software; you can redistribute it and/or modify
@@ -34,6 +34,7 @@
 
 namespace ARDOUR {
 
+class MidiStateTracker;
 class MidiModel;
 template<typename T> class MidiRingBuffer;
 
@@ -46,7 +47,7 @@ class MidiSource : virtual public Source
        MidiSource (Session& session, std::string name, Source::Flag flags = Source::Flag(0));
        MidiSource (Session& session, const XMLNode&);
        virtual ~MidiSource ();
-       
+
        /** Read the data in a given time range from the MIDI source.
         * All time stamps in parameters are in audio frames (even if the source has tempo time).
         * \param dst Ring buffer where read events are written
@@ -55,28 +56,29 @@ class MidiSource : virtual public Source
         * \param cnt Length of range to be read (in audio frames)
         * \param stamp_offset Offset to add to event times written to dst
         * \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,
-                       sframes_t source_start,
-                       sframes_t start, nframes_t cnt,
-                       sframes_t stamp_offset, sframes_t negative_stamp_offset) const;
+       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;
 
        virtual void append_event_unlocked_frames(const Evoral::Event<nframes_t>& ev,
                        sframes_t source_start) = 0;
-       
+
        virtual sframes_t length (sframes_t pos) const;
        virtual void      update_length (sframes_t pos, sframes_t cnt);
 
        virtual void mark_streaming_midi_write_started (NoteMode mode, sframes_t start_time);
        virtual void mark_streaming_write_started ();
        virtual void mark_streaming_write_completed ();
-       
+
        virtual void session_saved();
 
        std::string captured_for() const               { return _captured_for; }
@@ -86,13 +88,13 @@ class MidiSource : virtual public Source
        uint32_t write_data_count() const { return _write_data_count; }
 
        static sigc::signal<void,MidiSource*> MidiSourceCreated;
-              
+
        // Signal a range of recorded data is available for reading from model()
        mutable sigc::signal<void,sframes_t,nframes_t> ViewDataRangeReady;
-       
+
        XMLNode& get_state ();
-       int set_state (const XMLNode&);
-       
+       int set_state (const XMLNode&, int version);
+
        bool length_mutable() const { return true; }
 
        virtual void load_model(bool lock=true, bool force_reload=false) = 0;
@@ -104,38 +106,37 @@ class MidiSource : virtual public Source
        void invalidate();
 
        void set_note_mode(NoteMode mode);
-       
+
        boost::shared_ptr<MidiModel> model() { return _model; }
        void set_model(boost::shared_ptr<MidiModel> m) { _model = m; }
        void drop_model() { _model.reset(); }
 
   protected:
        virtual void flush_midi() = 0;
-       
-       virtual nframes_t read_unlocked (MidiRingBuffer<nframes_t>& dst,
-                       sframes_t position,
-                       sframes_t start, nframes_t cnt,
-                       sframes_t stamp_offset, sframes_t negative_stamp_offset) const = 0;
+
+       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,
+                                        MidiStateTracker* tracker) const = 0;
 
        virtual nframes_t write_unlocked (MidiRingBuffer<nframes_t>& dst,
                        sframes_t position,
                        nframes_t cnt) = 0;
-       
+
        std::string      _captured_for;
        mutable uint32_t _read_data_count;  ///< modified in read()
        mutable uint32_t _write_data_count; ///< modified in write()
-       
+
        boost::shared_ptr<MidiModel> _model;
        bool                         _writing;
-       
+
        mutable Evoral::Sequence<Evoral::MusicalTime>::const_iterator _model_iter;
-       
+       mutable bool                                                  _model_iter_valid;
+
        mutable double    _length_beats;
        mutable sframes_t _last_read_end;
        sframes_t         _last_write_end;
-
-  private:
-       bool file_changed (std::string path);
 };
 
 }