First stage of options rework.

[ardour.git] / libs / ardour / ardour / midi_diskstream.h

diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index 26198e1c62ab834b9ead62348e86ff6fc00fe562..872ffb78e3872498e46da9fbb5b3de2a251e9645 100644 (file)
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -36,7 +36,6 @@
 #include "pbd/ringbufferNPT.h"
 
 #include "ardour/ardour.h"
-#include "ardour/configuration.h"
 #include "ardour/diskstream.h"
 #include "ardour/midi_playlist.h"
 #include "ardour/midi_ring_buffer.h"
@@ -80,8 +79,10 @@ class MidiDiskstream : public Diskstream
        int set_state(const XMLNode& node);
 
        void monitor_input (bool);
-
-       boost::shared_ptr<SMFSource> write_source () { return _write_source; }
+       
+       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!
        
@@ -128,7 +129,7 @@ class MidiDiskstream : public Diskstream
        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; }
+       static void set_readahead_frames(nframes_t frames_ahead) { midi_readahead = frames_ahead; }
 
   protected:
        int seek (nframes_t which_sample, bool complete_refill = false);
@@ -178,6 +179,7 @@ class MidiDiskstream : public Diskstream
        nframes_t                    _last_flush_frame;
        NoteMode                     _note_mode;  
        MidiStateTracker             _midi_state_tracker;
+       MidiStateTracker             _incoming_midi_state_tracker;
        volatile gint                _frames_written_to_ringbuffer;
        volatile gint                _frames_read_from_ringbuffer;
 };