Rewrote MidiRingBuffer to more efficiently pack data (flat pack stamps, sizes, and...

[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 1c002890033270706779ff9be583e3273ea8b175..dec9536c741c84f2eebe222fe61f0ae9aa503524 100644 (file)
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -30,6 +30,7 @@
 
 #include <ardour/source.h>
 #include <ardour/ardour.h>
+#include <ardour/buffer.h>
 #include <pbd/stateful.h>
 #include <pbd/xml++.h>
 
@@ -37,16 +38,18 @@ using std::string;
 
 namespace ARDOUR {
 
-/** Source for raw MIDI data */
+class MidiRingBuffer;
+
+/** Source for MIDI data */
 class MidiSource : public Source
 {
   public:
-       MidiSource (string name);
-       MidiSource (const XMLNode&);
+       MidiSource (Session& session, string name);
+       MidiSource (Session& session, const XMLNode&);
        virtual ~MidiSource ();
-
-       virtual jack_nframes_t read (RawMidi *dst, jack_nframes_t start, jack_nframes_t cnt) const;
-       virtual jack_nframes_t write (RawMidi *src, jack_nframes_t cnt);
+       
+       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 mark_for_remove() = 0;
        virtual void mark_streaming_write_completed () {}
@@ -59,15 +62,15 @@ class MidiSource : public Source
 
        static sigc::signal<void,MidiSource*> MidiSourceCreated;
               
-       mutable sigc::signal<void>  PeaksReady;
-       mutable sigc::signal<void,jack_nframes_t,jack_nframes_t>  PeakRangeReady;
+       // The MIDI equivalent to "peaks"
+       mutable sigc::signal<void,boost::shared_ptr<MidiBuffer>,nframes_t,nframes_t> ViewDataRangeReady;
        
        XMLNode& get_state ();
        int set_state (const XMLNode&);
 
   protected:
-       virtual jack_nframes_t read_unlocked (RawMidi* dst, jack_nframes_t start, jack_nframes_t cn) const = 0;
-       virtual jack_nframes_t write_unlocked (RawMidi* dst, jack_nframes_t cnt) = 0;
+       virtual nframes_t read_unlocked (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset) const = 0;
+       virtual nframes_t write_unlocked (MidiRingBuffer& dst, nframes_t cnt) = 0;
        
        mutable Glib::Mutex _lock;
        string              _captured_for;