X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_diskstream.h;h=eddeaa451a9416a45d5f07d0848da25bc43f78f3;hb=022818b4a796f52c0a91eea42e65aec0bc7bed43;hp=ee11b5e1330406ddac2c02caf2b055ec28b26b06;hpb=532f6aad4ac79ca15d69deccd18fca90e444c437;p=ardour.git

diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index ee11b5e133..eddeaa451a 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -34,29 +34,26 @@
 
 #include <pbd/fastlog.h>
 #include <pbd/ringbufferNPT.h>
- 
 
 #include <ardour/ardour.h>
 #include <ardour/configuration.h>
-#include <ardour/session.h>
-#include <ardour/route_group.h>
-#include <ardour/route.h>
-#include <ardour/port.h>
-#include <ardour/utils.h>
 #include <ardour/diskstream.h>
 #include <ardour/midi_playlist.h>
 #include <ardour/midi_ring_buffer.h>
+#include <ardour/midi_state_tracker.h>
+#include <ardour/utils.h>
 
 struct tm;
 
 namespace ARDOUR {
 
+class IO;
 class MidiEngine;
+class MidiPort;
+class MidiRingbuffer;
+class SMFSource;
 class Send;
 class Session;
-class MidiPlaylist;
-class SMFSource;
-class IO;
 
 class MidiDiskstream : public Diskstream
 {	
@@ -68,7 +65,7 @@ class MidiDiskstream : public Diskstream
 	float playback_buffer_load() const;
 	float capture_buffer_load() const;
 	
-	void get_playback(MidiBuffer& dst, jack_nframes_t start, jack_nframes_t end);
+	void get_playback(MidiBuffer& dst, nframes_t start, nframes_t end, nframes_t offset);
 
 	void set_record_enabled (bool yn);
 
@@ -79,7 +76,6 @@ class MidiDiskstream : public Diskstream
 	int use_copy_playlist ();
 
 	/* stateful */
-
 	XMLNode& get_state(void);
 	int set_state(const XMLNode& node);
 
@@ -88,6 +84,31 @@ class MidiDiskstream : public Diskstream
 	boost::shared_ptr<SMFSource> write_source () { return _write_source; }
 	
 	int set_destructive (bool yn); // doom!
+	
+	void set_note_mode (NoteMode m);
+	
+	uint16_t get_channel_mask() { 
+		uint16_t playback_mask = _playback_buf->get_channel_mask();
+#ifndef NDEBUG
+		uint16_t capture_mask  = _capture_buf->get_channel_mask();
+		assert(playback_mask == capture_mask);
+#endif
+		return playback_mask;
+	}
+
+	void set_channel_mode(ChannelMode mode, uint16_t mask) {
+		_playback_buf->set_channel_mode(mode, mask); 
+		_capture_buf->set_channel_mode(mode, mask); 
+	}
+	
+	ChannelMode get_channel_mode() {
+		ChannelMode playback_mode = _playback_buf->get_channel_mode();
+#ifndef NDEBUG
+		ChannelMode capture_mode  = _capture_buf->get_channel_mode();
+		assert(playback_mode == capture_mode);
+#endif
+		return playback_mode;
+	}
 
   protected:
 	friend class Session;
@@ -99,34 +120,39 @@ class MidiDiskstream : public Diskstream
 
 	void set_pending_overwrite(bool);
 	int  overwrite_existing_buffers ();
-	void set_block_size (jack_nframes_t);
-	int  internal_playback_seek (jack_nframes_t distance);
-	int  can_internal_playback_seek (jack_nframes_t distance);
+	void set_block_size (nframes_t);
+	int  internal_playback_seek (nframes_t distance);
+	int  can_internal_playback_seek (nframes_t distance);
 	int  rename_write_sources ();
 	void reset_write_sources (bool, bool force = false);
 	void non_realtime_input_change ();
+	void non_realtime_locate (nframes_t location);
+
+	static void set_readahed_frames( nframes_t frames_ahead ) { midi_readahead = frames_ahead; }
 
   protected:
-	int seek (jack_nframes_t which_sample, bool complete_refill = false);
+	int seek (nframes_t which_sample, bool complete_refill = false);
 
   protected:
 	friend class MidiTrack;
 
-	int  process (jack_nframes_t transport_frame, jack_nframes_t nframes, jack_nframes_t offset, bool can_record, bool rec_monitors_input);
-	bool commit  (jack_nframes_t nframes);
+	int  process (nframes_t transport_frame, nframes_t nframes, nframes_t offset, bool can_record, bool rec_monitors_input);
+	bool commit  (nframes_t nframes);
+	static nframes_t midi_readahead;
 
   private:
 
 	/* The two central butler operations */
-	int do_flush (Session::RunContext context, bool force = false);
+	int do_flush (RunContext context, bool force = false);
 	int do_refill ();
 	
 	int do_refill_with_alloc();
 
-	int read (jack_nframes_t& start, jack_nframes_t cnt, bool reversed);
+	int read (nframes_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 init (Diskstream::Flag);
 
@@ -139,25 +165,21 @@ class MidiDiskstream : public Diskstream
 	int use_pending_capture_data (XMLNode& node);
 
 	void get_input_sources ();
-	void check_record_status (jack_nframes_t transport_frame, jack_nframes_t nframes, bool can_record);
+	void check_record_status (nframes_t transport_frame, nframes_t nframes, bool can_record);
 	void set_align_style_from_io();
 	
 	void engage_record_enable ();
 	void disengage_record_enable ();
-	
-	// FIXME: This is basically a single ChannelInfo.. abstractify that concept?
-	MidiRingBuffer*                    _playback_buf;
-	MidiRingBuffer*                    _capture_buf;
-	//RawMidi*                          _current_playback_buffer;
-	//RawMidi*                          _current_capture_buffer;
-	//RawMidi*                          _playback_wrap_buffer;
-	//RawMidi*                          _capture_wrap_buffer;
-	MidiPort*                         _source_port;
-	boost::shared_ptr<SMFSource>      _write_source;
-	RingBufferNPT<CaptureTransition>* _capture_transition_buf;
-	//RingBufferNPT<RawMidi>::rw_vector _playback_vector;
-	//RingBufferNPT<RawMidi>::rw_vector _capture_vector;
-	jack_nframes_t _last_flush_frame;
+
+	MidiRingBuffer<nframes_t>*   _playback_buf;
+	MidiRingBuffer<nframes_t>*   _capture_buf;
+	MidiPort*                    _source_port;
+	boost::shared_ptr<SMFSource> _write_source;
+	nframes_t                    _last_flush_frame;
+	NoteMode                     _note_mode;  
+	MidiStateTracker             _midi_state_tracker;
+	volatile gint                _frames_written_to_ringbuffer;
+	volatile gint                _frames_read_from_ringbuffer;
 };
 
 }; /* namespace ARDOUR */