advance track's play-position even if processing is locked

[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 b7f3de3887cf5e3d3b5eb95802b7695bc19385c5..34fa0ae79a187166530b28602adfe0fe5031ab48 100644 (file)
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -62,9 +62,12 @@ class MidiDiskstream : public Diskstream
        float playback_buffer_load() const;
        float capture_buffer_load() const;
 
-       void get_playback(MidiBuffer& dst, framepos_t start, framepos_t end);
+       void get_playback (MidiBuffer& dst, framecnt_t);
+        void flush_playback (framepos_t, framepos_t);
 
        void set_record_enabled (bool yn);
+       
+       void reset_tracker ();
 
        boost::shared_ptr<MidiPlaylist> midi_playlist () { return boost::dynamic_pointer_cast<MidiPlaylist>(_playlist); }
 
@@ -78,7 +81,7 @@ class MidiDiskstream : public Diskstream
        XMLNode& get_state(void);
        int set_state(const XMLNode&, int version);
 
-       void monitor_input (bool);
+       void ensure_jack_monitors_input (bool);
 
        boost::shared_ptr<SMFSource> write_source ()    { return _write_source; }
 
@@ -86,34 +89,13 @@ class MidiDiskstream : public Diskstream
 
        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;
-       }
-
        /** 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.
+        *  Parameter is the source that it is destined for.
+        *  A caller can get a copy of the data with get_gui_feed_buffer ()
         */
-       PBD::Signal2<void, boost::shared_ptr<MidiBuffer>, boost::weak_ptr<MidiSource> > DataRecorded;
+       PBD::Signal1<void, boost::weak_ptr<MidiSource> > DataRecorded;
+
+       boost::shared_ptr<MidiBuffer> get_gui_feed_buffer () const;
 
   protected:
        friend class Session;
@@ -142,7 +124,8 @@ class MidiDiskstream : public Diskstream
   protected:
        friend class MidiTrack;
 
-       int  process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler);
+        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;
 
@@ -156,7 +139,7 @@ class MidiDiskstream : public Diskstream
 
        int read (framepos_t& start, framecnt_t cnt, bool reversed);
 
-       void finish_capture (bool rec_monitors_input);
+       void finish_capture ();
        void transport_stopped_wallclock (struct tm&, time_t, bool abort);
        void transport_looped (framepos_t transport_frame);
 
@@ -179,16 +162,24 @@ class MidiDiskstream : public Diskstream
        void adjust_playback_buffering () {}
        void adjust_capture_buffering () {}
 
-       void engage_record_enable ();
-       void disengage_record_enable ();
-
+       bool prep_record_enable ();
+       bool prep_record_disable ();
+    
        MidiRingBuffer<framepos_t>*  _playback_buf;
        MidiRingBuffer<framepos_t>*  _capture_buf;
-       MidiPort*                    _source_port;
+       boost::weak_ptr<MidiPort>    _source_port;
        boost::shared_ptr<SMFSource> _write_source;
        NoteMode                     _note_mode;
-       volatile gint                _frames_written_to_ringbuffer;
-       volatile gint                _frames_read_from_ringbuffer;
+       gint                         _frames_written_to_ringbuffer;
+       gint                         _frames_read_from_ringbuffer;
+       volatile gint                _frames_pending_write;
+       volatile gint                _num_captured_loops;
+
+       /** 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;
 };
 
 }; /* namespace ARDOUR */