X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_diskstream.h;h=126857a858e1d0f67a245059694d68340e278e33;hb=90172686b92b53cc5ab1d60c0e6daecb65d17d3d;hp=7035cdfd0231a400b3811dfb9b74902349b6cdab;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index 7035cdfd02..126857a858 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -21,7 +21,6 @@
 #ifndef __ardour_midi_diskstream_h__
 #define __ardour_midi_diskstream_h__
 
-#include <sigc++/signal.h>
 
 #include <cmath>
 #include <cassert>
@@ -63,7 +62,7 @@ class MidiDiskstream : public Diskstream
 	float playback_buffer_load() const;
 	float capture_buffer_load() const;
 
-	void get_playback(MidiBuffer& dst, nframes_t start, nframes_t end);
+	void get_playback(MidiBuffer& dst, framepos_t start, framepos_t end);
 
 	void set_record_enabled (bool yn);
 
@@ -75,12 +74,10 @@ class MidiDiskstream : public Diskstream
 
 	/* stateful */
 	XMLNode& get_state(void);
-	int set_state(const XMLNode& node);
+	int set_state(const XMLNode&, int version);
 
 	void monitor_input (bool);
 
-	MidiRingBuffer<nframes_t>*   playback_buffer () { return _playback_buf; }
-	MidiRingBuffer<nframes_t>*   capture_buffer ()  { return _capture_buf; }
 	boost::shared_ptr<SMFSource> write_source ()    { return _write_source; }
 
 	int set_destructive (bool yn); // doom!
@@ -110,8 +107,15 @@ class MidiDiskstream : public Diskstream
 		return playback_mode;
 	}
 
+	/** Emitted when some MIDI data has been received for recording.
+	 *  First parameter is the data.
+	 *  Second parameter is the source that it is destined for.
+	 */
+	PBD::Signal2<void, boost::shared_ptr<MidiBuffer>, boost::weak_ptr<MidiSource> > DataRecorded;
+
   protected:
 	friend class Session;
+	friend class Butler;
 
 	/* the Session is the only point of access for these
 	   because they require that the Session is "inactive"
@@ -121,22 +125,23 @@ class MidiDiskstream : public Diskstream
 	void set_pending_overwrite(bool);
 	int  overwrite_existing_buffers ();
 	void set_block_size (nframes_t);
-	int  internal_playback_seek (nframes_t distance);
-	int  can_internal_playback_seek (nframes_t distance);
+	int  internal_playback_seek (framecnt_t distance);
+	int  can_internal_playback_seek (framecnt_t distance);
 	int  rename_write_sources ();
+        std::list<boost::shared_ptr<Source> > steal_write_sources();
 	void reset_write_sources (bool, bool force = false);
 	void non_realtime_input_change ();
-	void non_realtime_locate (nframes_t location);
+	void non_realtime_locate (framepos_t location);
 
 	static void set_readahead_frames(nframes_t frames_ahead) { midi_readahead = frames_ahead; }
 
   protected:
-	int seek (nframes_t which_sample, bool complete_refill = false);
+	int seek (framepos_t which_sample, bool complete_refill = false);
 
   protected:
 	friend class MidiTrack;
 
-	int  process (nframes_t transport_frame, nframes_t nframes, bool can_record, bool rec_monitors_input);
+	int  process (framepos_t transport_frame, nframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler);
 	bool commit  (nframes_t nframes);
 	static nframes_t midi_readahead;
 
@@ -148,13 +153,13 @@ class MidiDiskstream : public Diskstream
 
 	int do_refill_with_alloc();
 
-	int read (nframes_t& start, nframes_t cnt, bool reversed);
+	int read (framepos_t& start, nframes_t cnt, bool reversed);
 
 	void finish_capture (bool rec_monitors_input);
-	void transport_stopped (struct tm&, time_t, bool abort);
-	void transport_looped (nframes_t transport_frame);
+	void transport_stopped_wallclock (struct tm&, time_t, bool abort);
+	void transport_looped (framepos_t transport_frame);
 
-	void init (Diskstream::Flag);
+	void init ();
 
 	int use_new_write_source (uint32_t n=0);
 
@@ -165,9 +170,14 @@ class MidiDiskstream : public Diskstream
 	int use_pending_capture_data (XMLNode& node);
 
 	void get_input_sources ();
-	void check_record_status (nframes_t transport_frame, nframes_t nframes, bool can_record);
 	void set_align_style_from_io();
 
+        /* fixed size buffers per instance of ardour for now (non-dynamic)
+         */
+
+        void adjust_playback_buffering () {}
+        void adjust_capture_buffering () {}
+
 	void engage_record_enable ();
 	void disengage_record_enable ();