X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_diskstream.h;h=8c927c5fc6614b4294c9856ca281fc21bd54bf58;hb=9925ab554e65ac31a41eff1fa03a9c12aad1973e;hp=49a7525dc72358c229b2179c428294c2a90c665e;hpb=10bdce85a0e7381d1b5db38e3640600c6fd3ec79;p=ardour.git

diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index 49a7525dc7..8c927c5fc6 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -72,6 +72,8 @@ class MidiDiskstream : public Diskstream
 	int use_new_playlist ();
 	int use_copy_playlist ();
 
+	bool set_name (std::string const &);
+
 	/* stateful */
 	XMLNode& get_state(void);
 	int set_state(const XMLNode&, int version);
@@ -107,6 +109,12 @@ 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;
@@ -118,16 +126,15 @@ class MidiDiskstream : public Diskstream
 
 	void set_pending_overwrite(bool);
 	int  overwrite_existing_buffers ();
-	void set_block_size (nframes_t);
+	void set_block_size (pframes_t);
 	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 (framepos_t location);
 
-	static void set_readahead_frames(nframes_t frames_ahead) { midi_readahead = frames_ahead; }
+	static void set_readahead_frames (framecnt_t frames_ahead) { midi_readahead = frames_ahead; }
 
   protected:
 	int seek (framepos_t which_sample, bool complete_refill = false);
@@ -135,9 +142,9 @@ class MidiDiskstream : public Diskstream
   protected:
 	friend class MidiTrack;
 
-	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;
+	int  process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler);
+	bool commit  (framecnt_t nframes);
+	static framecnt_t midi_readahead;
 
   private:
 
@@ -147,7 +154,7 @@ class MidiDiskstream : public Diskstream
 
 	int do_refill_with_alloc();
 
-	int read (framepos_t& start, nframes_t cnt, bool reversed);
+	int read (framepos_t& start, framecnt_t cnt, bool reversed);
 
 	void finish_capture (bool rec_monitors_input);
 	void transport_stopped_wallclock (struct tm&, time_t, bool abort);
@@ -175,11 +182,11 @@ class MidiDiskstream : public Diskstream
 	void engage_record_enable ();
 	void disengage_record_enable ();
 
-	MidiRingBuffer<nframes_t>*   _playback_buf;
-	MidiRingBuffer<nframes_t>*   _capture_buf;
+	MidiRingBuffer<framepos_t>*  _playback_buf;
+	MidiRingBuffer<framepos_t>*  _capture_buf;
 	MidiPort*                    _source_port;
 	boost::shared_ptr<SMFSource> _write_source;
-	nframes_t                    _last_flush_frame;
+	framepos_t                   _last_flush_frame;
 	NoteMode                     _note_mode;
 	volatile gint                _frames_written_to_ringbuffer;
 	volatile gint                _frames_read_from_ringbuffer;