X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudio_diskstream.h;h=21a178946800529f6a31411187af2a3be3bb3f0e;hb=7cc2e8c969e7b778af90f3b45a4c3fa3cbc90ef6;hp=f233e2111208586ddc357533f1f88e742bebe018;hpb=87d57a1de9125e9b2c2e0c46178906edaf7c122a;p=ardour.git diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h index f233e21112..21a1789468 100644 --- 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,22 +73,11 @@ 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; - float peak_power(uint32_t n = 0) { - boost::shared_ptr c = channels.reader(); - ChannelInfo* chaninfo = (*c)[n]; - float x = chaninfo->peak_power; - chaninfo->peak_power = 0.0f; - if (x > 0.0f) { - return 20.0f * fast_log10(x); - } else { - return minus_infinity(); - } - } - boost::shared_ptr audio_playlist () { return boost::dynamic_pointer_cast(_playlist); } int use_playlist (boost::shared_ptr); @@ -120,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) { @@ -136,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; @@ -159,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 > 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 can_record, 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, @@ -194,17 +174,17 @@ class AudioDiskstream : public Diskstream Sample *capture_wrap_buffer; Sample *speed_buffer; - float peak_power; - boost::shared_ptr 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 *playback_buf; PBD::RingBufferNPT *capture_buf; @@ -225,17 +205,16 @@ class AudioDiskstream : public Diskstream typedef std::vector ChannelList; - void process_varispeed_playback (pframes_t nframes, boost::shared_ptr 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, - ChannelInfo* channel_info, int channel, bool reversed); + int channel, bool reversed); void finish_capture (boost::shared_ptr); void transport_stopped_wallclock (struct tm&, time_t, bool abort); @@ -263,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; @@ -278,9 +256,12 @@ class AudioDiskstream : public Diskstream SerializedRCUManager 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, uint32_t how_many); int remove_channel_from (boost::shared_ptr, uint32_t how_many);