add new sigc++2 directory

[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 088175ab75fca8eed70fe297754c21f2e3acee5d..997f3f9d6948a456c4d8e6ea09027978563e4dba 100644 (file)
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -49,18 +49,24 @@ class MidiSource : public Source
        MidiSource (Session& session, const XMLNode&);
        virtual ~MidiSource ();
        
-       virtual nframes_t read (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset) const;
-       virtual nframes_t write (MidiRingBuffer& src, nframes_t cnt);
-       virtual void append_event_unlocked(const MidiEvent& ev) = 0;
+       /* Stub Readable interface */
+       virtual nframes64_t read (Sample*, nframes64_t pos, nframes64_t cnt, int channel) const { return 0; }
+       virtual nframes64_t readable_length() const { return length(); }
+       virtual uint32_t    n_channels () const { return 1; }
+       
+       // FIXME: integrate this with the Readable::read interface somehow
+       virtual nframes_t midi_read (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset, nframes_t negative_stamp_offset) const;
+       virtual nframes_t midi_write (MidiRingBuffer& src, nframes_t cnt);
 
-       virtual void flush() {}
+       virtual void append_event_unlocked(EventTimeUnit unit, const MIDI::Event& ev) = 0;
 
        virtual void mark_for_remove() = 0;
-       virtual void mark_streaming_midi_write_started (NoteMode mode);
+       virtual void mark_streaming_midi_write_started (NoteMode mode, nframes_t start_time);
        virtual void mark_streaming_write_started ();
        virtual void mark_streaming_write_completed ();
        
-       void set_timeline_position (nframes_t when) { _timeline_position = when; }
+       uint64_t timeline_position ()                   { return _timeline_position; }
+       void     set_timeline_position (nframes_t when) { _timeline_position = when; }
        
        virtual void session_saved();
 
@@ -72,23 +78,27 @@ class MidiSource : public Source
 
        static sigc::signal<void,MidiSource*> MidiSourceCreated;
               
-       // The MIDI equivalent to "peaks" (but complete data)
-       mutable sigc::signal<void,boost::shared_ptr<MidiBuffer>,nframes_t,nframes_t> ViewDataRangeReady;
+       // Signal a range of recorded data is available for reading from model()
+       mutable sigc::signal<void,nframes_t,nframes_t> ViewDataRangeReady;
        
        XMLNode& get_state ();
        int set_state (const XMLNode&);
+       
+       bool length_mutable() const { return true; }
 
        virtual void load_model(bool lock=true, bool force_reload=false) = 0;
        virtual void destroy_model() = 0;
 
        void set_note_mode(NoteMode mode) { if (_model) _model->set_note_mode(mode); }
-       virtual bool model_loaded() const { return _model_loaded; }
 
        boost::shared_ptr<MidiModel> model() { return _model; }
-       void set_model(boost::shared_ptr<MidiModel> m) { _model = m; _model_loaded = true; }
+       void set_model(boost::shared_ptr<MidiModel> m) { _model = m; }
 
   protected:
-       virtual nframes_t read_unlocked (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset) const = 0;
+       virtual int flush_header() = 0;
+       virtual int flush_footer() = 0;
+       
+       virtual nframes_t read_unlocked (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset, nframes_t negative_stamp_offset) const = 0;
        virtual nframes_t write_unlocked (MidiRingBuffer& dst, nframes_t cnt) = 0;
        
        mutable Glib::Mutex _lock;
@@ -98,7 +108,6 @@ class MidiSource : public Source
        mutable uint32_t    _write_data_count; ///< modified in write()
 
        boost::shared_ptr<MidiModel> _model;
-       bool                         _model_loaded;
        bool                         _writing;
 
   private: