Tempo ramps - implement TempoMap::tempo_at_beat().

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

diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index daf30024af760e240f16d0242dc0376df670cee9..21a178946800529f6a31411187af2a3be3bb3f0e 100644 (file)
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -53,7 +53,7 @@ class AudioPlaylist;
 class AudioFileSource;
 class IO;
 
-class AudioDiskstream : public Diskstream
+class LIBARDOUR_API AudioDiskstream : public Diskstream
 {
   public:
        AudioDiskstream (Session &, const std::string& name, Diskstream::Flag f = Recordable);
@@ -73,6 +73,7 @@ class AudioDiskstream : public Diskstream
        }
 
        void set_record_enabled (bool yn);
+       void set_record_safe (bool yn);
        int set_destructive (bool yn);
        int set_non_layered (bool yn);
        bool can_become_destructive (bool& requires_bounce) const;
@@ -108,13 +109,14 @@ class AudioDiskstream : public Diskstream
        int remove_channel (uint32_t how_many);
 
        bool set_name (std::string const &);
+       bool set_write_source_name (const std::string& str);
 
        /* stateful */
 
        XMLNode& get_state(void);
        int      set_state(const XMLNode& node, int version);
 
-       void monitor_input (bool);
+       void request_input_monitoring (bool);
 
        static void swap_by_ptr (Sample *first, Sample *last) {
                while (first < last) {
@@ -124,15 +126,6 @@ class AudioDiskstream : public Diskstream
                }
        }
 
-       static void swap_by_ptr (Sample *first, Sample *last, framecnt_t n) {
-               while (n--) {
-                       Sample tmp = *first;
-                       *first++ = *last;
-                       *last-- = tmp;
-               }
-       }
-
-       CubicInterpolation interpolation;
 
   protected:
        friend class Session;
@@ -147,29 +140,28 @@ class AudioDiskstream : 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();
        void reset_write_sources (bool, bool force = false);
        void non_realtime_input_change ();
        void non_realtime_locate (framepos_t location);
 
   protected:
        friend class Auditioner;
-       int  seek (framepos_t which_sample, bool complete_refill = false);
-
-  protected:
        friend class AudioTrack;
+       int  seek (framepos_t which_sample, bool complete_refill = false);
 
-       int  process (framepos_t transport_frame, pframes_t nframes, bool& need_butler);
-       bool commit  (framecnt_t nframes);
+        int  process (BufferSet&, framepos_t transport_frame, pframes_t nframes, framecnt_t &, bool need_disk_signal);
+        frameoffset_t calculate_playback_distance (pframes_t nframes);
+       bool commit  (framecnt_t);
 
   private:
        struct ChannelSource {
                std::string name;
 
                bool is_physical () const;
-               void ensure_monitor_input (bool) const;
+               void request_input_monitoring (bool) const;
        };
 
+       /** Information about one of our channels */
        struct ChannelInfo : public boost::noncopyable {
 
                ChannelInfo (framecnt_t playback_buffer_size,
@@ -184,13 +176,15 @@ class AudioDiskstream : public Diskstream
 
                boost::shared_ptr<AudioFileSource> write_source;
 
-               /// information the Port that our audio data comes from
-
+               /** Information about the Port that our audio data comes from */
                ChannelSource source;
 
                Sample       *current_capture_buffer;
                Sample       *current_playback_buffer;
 
+               /** A ringbuffer for data to be played back, written to in the
+                   butler thread, read from in the process thread.
+               */
                PBD::RingBufferNPT<Sample> *playback_buf;
                PBD::RingBufferNPT<Sample> *capture_buf;
 
@@ -211,13 +205,12 @@ class AudioDiskstream : public Diskstream
 
        typedef std::vector<ChannelInfo*> ChannelList;
 
-       void process_varispeed_playback (pframes_t nframes, boost::shared_ptr<ChannelList> c);
+       CubicInterpolation interpolation;
 
        /* The two central butler operations */
        int do_flush (RunContext context, bool force = false);
-       int do_refill () { return _do_refill(_mixdown_buffer, _gain_buffer); }
+       int do_refill () { return _do_refill(_mixdown_buffer, _gain_buffer, 0); }
 
-       int do_refill_with_alloc ();
 
        int read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer,
                  framepos_t& start, framecnt_t cnt,
@@ -249,14 +242,13 @@ class AudioDiskstream : 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 ();
 
        // Working buffers for do_refill (butler thread)
        static void allocate_working_buffers();
        static void free_working_buffers();
 
-       static size_t  _working_buffers_size;
        static Sample* _mixdown_buffer;
        static gain_t* _gain_buffer;
 
@@ -264,9 +256,12 @@ class AudioDiskstream : public Diskstream
 
        SerializedRCUManager<ChannelList> channels;
 
+  protected:
+       int _do_refill_with_alloc (bool one_chunk_only);
+
  /* really */
   private:
-       int _do_refill (Sample *mixdown_buffer, float *gain_buffer);
+       int _do_refill (Sample *mixdown_buffer, float *gain_buffer, framecnt_t fill_level);
 
        int add_channel_to (boost::shared_ptr<ChannelList>, uint32_t how_many);
        int remove_channel_from (boost::shared_ptr<ChannelList>, uint32_t how_many);