Fix some mangled whitespace (noop).

[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 01e890473692f444957d1ed92be87f42ba63b95e..7e72ef9a7ed55f0d4d0749acc8cde940e16d5106 100644 (file)
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -36,8 +36,7 @@
 
 #include "ardour/ardour.h"
 #include "ardour/diskstream.h"
-#include "ardour/midi_playlist.h"
-#include "ardour/midi_ring_buffer.h"
+#include "ardour/midi_buffer.h"
 #include "ardour/utils.h"
 
 struct tm;
@@ -46,16 +45,20 @@ namespace ARDOUR {
 
 class IO;
 class MidiEngine;
+class MidiPlaylist;
 class MidiPort;
 class MidiRingbuffer;
+class MidiSource;
 class SMFSource;
 class Send;
 class Session;
 
+template<typename T> class MidiRingBuffer;
+
 class LIBARDOUR_API MidiDiskstream : public Diskstream
 {
   public:
-       MidiDiskstream (Session &, const string& name, Diskstream::Flag f = Recordable);
+       MidiDiskstream (Session &, const std::string& name, Diskstream::Flag f = Recordable);
        MidiDiskstream (Session &, const XMLNode&);
        ~MidiDiskstream();
 
@@ -63,19 +66,20 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
        float capture_buffer_load() const;
 
        void get_playback (MidiBuffer& dst, framecnt_t);
-        void flush_playback (framepos_t, framepos_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); }
+       boost::shared_ptr<MidiPlaylist> midi_playlist ();
 
        int use_playlist (boost::shared_ptr<Playlist>);
        int use_new_playlist ();
        int use_copy_playlist ();
 
        bool set_name (std::string const &);
+       bool set_write_source_name (const std::string& str);
 
        /* stateful */
        XMLNode& get_state(void);
@@ -111,7 +115,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
        void set_block_size (pframes_t);
        int  internal_playback_seek (framecnt_t distance);
        int  can_internal_playback_seek (framecnt_t distance);
-       std::list<boost::shared_ptr<Source> > steal_write_sources();
+       std::string steal_write_source_name();
        void reset_write_sources (bool, bool force = false);
        void non_realtime_input_change ();
        void non_realtime_locate (framepos_t location);
@@ -123,9 +127,11 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
        friend class Auditioner;
        int seek (framepos_t which_sample, bool complete_refill = false);
 
-        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);
+       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;
 
   private:
@@ -146,7 +152,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
 
        int use_new_write_source (uint32_t n=0);
 
-       int find_and_use_playlist (const string&);
+       int find_and_use_playlist (const std::string&);
 
        void allocate_temporary_buffers ();
 
@@ -173,6 +179,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
        gint                         _frames_read_from_ringbuffer;
        volatile gint                _frames_pending_write;
        volatile gint                _num_captured_loops;
+       framepos_t                   _accumulated_capture_offset;
 
        /** A buffer that we use to put newly-arrived MIDI data in for
            the GUI to read (so that it can update itself).