X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_diskstream.h;h=45f01763d8a1ff7e5145ae68ab2ef1419272d1d2;hb=5c32fc3babdd3ed7d715b6aeb24a72f3a0f550a0;hp=e3f2673871fe2d296da808fc95a87853483c732e;hpb=cf806123ca5faaef483f898daba3f7bd38ec62eb;p=ardour.git

diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index e3f2673871..45f01763d8 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -36,9 +36,9 @@
 
 #include "ardour/ardour.h"
 #include "ardour/diskstream.h"
-#include "ardour/midi_playlist.h"
-#include "ardour/midi_ring_buffer.h"
+#include "ardour/midi_buffer.h"
 #include "ardour/utils.h"
+#include "ardour/interpolation.h"
 
 struct tm;
 
@@ -46,36 +46,42 @@ namespace ARDOUR {
 
 class IO;
 class MidiEngine;
+class MidiPlaylist;
 class MidiPort;
 class MidiRingbuffer;
+class MidiSource;
 class SMFSource;
 class Send;
 class Session;
 
+template<typename T> class MidiRingBuffer;
+
 class LIBARDOUR_API MidiDiskstream : public Diskstream
 {
   public:
-	MidiDiskstream (Session &, const string& name, Diskstream::Flag f = Recordable);
+	MidiDiskstream (Session &, const std::string& name, Diskstream::Flag f = Recordable);
 	MidiDiskstream (Session &, const XMLNode&);
 	~MidiDiskstream();
 
 	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 ();
 	int use_copy_playlist ();
 
 	bool set_name (std::string const &);
+	bool set_write_source_name (const std::string& str);
 
 	/* stateful */
 	XMLNode& get_state(void);
@@ -111,32 +117,32 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
 	void set_block_size (pframes_t);
 	int  internal_playback_seek (framecnt_t distance);
 	int  can_internal_playback_seek (framecnt_t distance);
-	std::list<boost::shared_ptr<Source> > steal_write_sources();
+	std::string steal_write_source_name();
 	void reset_write_sources (bool, bool force = false);
 	void non_realtime_input_change ();
 	void non_realtime_locate (framepos_t location);
 
 	static void set_readahead_frames (framecnt_t frames_ahead) { midi_readahead = frames_ahead; }
 
-  protected:
-	int seek (framepos_t which_sample, bool complete_refill = false);
-
   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 ();
@@ -147,7 +153,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
 
 	int use_new_write_source (uint32_t n=0);
 
-	int find_and_use_playlist (const string&);
+	int find_and_use_playlist (const std::string&);
 
 	void allocate_temporary_buffers ();
 
@@ -164,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;
@@ -174,12 +180,15 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
 	gint                         _frames_read_from_ringbuffer;
 	volatile gint                _frames_pending_write;
 	volatile gint                _num_captured_loops;
+	framepos_t                   _accumulated_capture_offset;
 
 	/** A buffer that we use to put newly-arrived MIDI data in for
 	    the GUI to read (so that it can update itself).
 	*/
 	MidiBuffer                   _gui_feed_buffer;
 	mutable Glib::Threads::Mutex _gui_feed_buffer_mutex;
+
+	CubicMidiInterpolation interpolation;
 };
 
 }; /* namespace ARDOUR */