X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_diskstream.h;h=45f01763d8a1ff7e5145ae68ab2ef1419272d1d2;hb=74a604d261b1ecb0f20ee0c69aef7648da3a1d86;hp=e8cc37028958a0e908a515ecf86ee01785b7e9ab;hpb=1693e57e0ee37c6cd74f2feadb3af6249ac6c29d;p=ardour.git

diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index e8cc370289..45f01763d8 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -37,8 +37,8 @@
 #include "ardour/ardour.h"
 #include "ardour/diskstream.h"
 #include "ardour/midi_buffer.h"
-#include "ardour/midi_playlist.h"
 #include "ardour/utils.h"
+#include "ardour/interpolation.h"
 
 struct tm;
 
@@ -46,6 +46,7 @@ namespace ARDOUR {
 
 class IO;
 class MidiEngine;
+class MidiPlaylist;
 class MidiPort;
 class MidiRingbuffer;
 class MidiSource;
@@ -53,6 +54,8 @@ class SMFSource;
 class Send;
 class Session;
 
+template<typename T> class MidiRingBuffer;
+
 class LIBARDOUR_API MidiDiskstream : public Diskstream
 {
   public:
@@ -63,14 +66,15 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
 	float playback_buffer_load() const;
 	float capture_buffer_load() const;
 
-	void get_playback (MidiBuffer& dst, framecnt_t);
-        void flush_playback (framepos_t, framepos_t);
+	void flush_playback (framepos_t, framepos_t);
 
 	void set_record_enabled (bool yn);
-	
+	void set_record_safe (bool yn);
+
 	void reset_tracker ();
+	void resolve_tracker (Evoral::EventSink<framepos_t>& buffer, framepos_t time);
 
-	boost::shared_ptr<MidiPlaylist> midi_playlist () { return boost::dynamic_pointer_cast<MidiPlaylist>(_playlist); }
+	boost::shared_ptr<MidiPlaylist> midi_playlist ();
 
 	int use_playlist (boost::shared_ptr<Playlist>);
 	int use_new_playlist ();
@@ -123,21 +127,22 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
   protected:
 	friend class MidiTrack;
 	friend class Auditioner;
+
 	int seek (framepos_t which_sample, bool complete_refill = false);
+	int _do_refill_with_alloc (bool one_chunk_only);
+	int process (BufferSet&, framepos_t transport_frame, pframes_t nframes, framecnt_t &, bool need_diskstream);
+	frameoffset_t calculate_playback_distance (pframes_t nframes);
+	bool commit (framecnt_t nframes);
 
-        int  process (BufferSet&, framepos_t transport_frame, pframes_t nframes, framecnt_t &, bool need_diskstream);
-        frameoffset_t calculate_playback_distance (pframes_t nframes);
-	bool commit  (framecnt_t nframes);
 	static framecnt_t midi_readahead;
 
   private:
+	void get_playback (MidiBuffer& dst, framecnt_t);
 
 	/* The two central butler operations */
 	int do_flush (RunContext context, bool force = false);
 	int do_refill ();
 
-	int do_refill_with_alloc();
-
 	int read (framepos_t& start, framecnt_t cnt, bool reversed);
 
 	void finish_capture ();
@@ -165,7 +170,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
 
 	bool prep_record_enable ();
 	bool prep_record_disable ();
-    
+
 	MidiRingBuffer<framepos_t>*  _playback_buf;
 	MidiRingBuffer<framepos_t>*  _capture_buf;
 	boost::weak_ptr<MidiPort>    _source_port;
@@ -182,6 +187,8 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
 	*/
 	MidiBuffer                   _gui_feed_buffer;
 	mutable Glib::Threads::Mutex _gui_feed_buffer_mutex;
+
+	CubicMidiInterpolation interpolation;
 };
 
 }; /* namespace ARDOUR */