X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudio_diskstream.h;h=be43142f218b189bc2dcf97f6eb86d708ff55099;hb=04416e2d1df3cc8d9f014765e5ca5ce818b7b4d7;hp=838c9406eeab517e13881500511d3b4d0647a095;hpb=22fd9aec55587a50c427fff8f5e800afcef6ac69;p=ardour.git diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h index 838c9406ee..be43142f21 100644 --- a/libs/ardour/ardour/audio_diskstream.h +++ b/libs/ardour/ardour/audio_diskstream.h @@ -19,7 +19,6 @@ #ifndef __ardour_audio_diskstream_h__ #define __ardour_audio_diskstream_h__ -#include #include #include @@ -29,6 +28,8 @@ #include +#include + #include "pbd/fastlog.h" #include "pbd/ringbufferNPT.h" #include "pbd/stateful.h" @@ -65,34 +66,17 @@ class AudioDiskstream : public Diskstream std::string input_source (uint32_t n=0) const { boost::shared_ptr c = channels.reader(); if (n < c->size()) { - return (*c)[n]->source ? (*c)[n]->source->name() : ""; + return (*c)[n]->source.name; } else { return ""; } } - Port *input_source_port (uint32_t n=0) const { - boost::shared_ptr c = channels.reader(); - if (n < c->size()) return (*c)[n]->source; return 0; - } - void set_record_enabled (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); @@ -123,12 +107,14 @@ class AudioDiskstream : public Diskstream int add_channel (uint32_t how_many); int remove_channel (uint32_t how_many); + bool set_name (std::string const &); + /* stateful */ XMLNode& get_state(void); int set_state(const XMLNode& node, int version); - void monitor_input (bool); + void request_jack_monitors_input (bool); static void swap_by_ptr (Sample *first, Sample *last) { while (first < last) { @@ -138,18 +124,8 @@ class AudioDiskstream : public Diskstream } } - static void swap_by_ptr (Sample *first, Sample *last, nframes_t n) { - while (n--) { - Sample tmp = *first; - *first++ = *last; - *last-- = tmp; - } - } - CubicInterpolation interpolation; - XMLNode* deprecated_io_node; - protected: friend class Session; @@ -160,64 +136,76 @@ class AudioDiskstream : public Diskstream void set_pending_overwrite(bool); int overwrite_existing_buffers (); - void set_block_size (nframes_t); - int internal_playback_seek (nframes_t distance); - int can_internal_playback_seek (nframes_t distance); - int rename_write_sources (); + 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 (nframes_t location); + void non_realtime_locate (framepos_t location); protected: friend class Auditioner; - int seek (nframes_t which_sample, bool complete_refill = false); + int seek (framepos_t which_sample, bool complete_refill = false); protected: friend class AudioTrack; - int process (nframes_t transport_frame, nframes_t nframes, bool can_record, bool rec_monitors_input); - bool commit (nframes_t nframes); + int process (framepos_t transport_frame, pframes_t nframes, framecnt_t &); + bool commit (framecnt_t); private: + struct ChannelSource { + std::string name; + + bool is_physical () const; + void request_jack_monitors_input (bool) const; + }; - struct ChannelInfo { + /** Information about one of our channels */ + struct ChannelInfo : public boost::noncopyable { - ChannelInfo (nframes_t buffer_size, nframes_t speed_buffer_size, nframes_t wrap_buffer_size); + ChannelInfo (framecnt_t playback_buffer_size, + framecnt_t capture_buffer_size, + framecnt_t speed_buffer_size, + framecnt_t wrap_buffer_size); ~ChannelInfo (); Sample *playback_wrap_buffer; Sample *capture_wrap_buffer; Sample *speed_buffer; - float peak_power; - - boost::shared_ptr fades_source; boost::shared_ptr write_source; - /// the Port that our audio data comes from - Port *source; + /** Information about the Port that our audio data comes from */ + ChannelSource source; + Sample *current_capture_buffer; Sample *current_playback_buffer; - RingBufferNPT *playback_buf; - RingBufferNPT *capture_buf; + /** 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; Sample* scrub_buffer; Sample* scrub_forward_buffer; Sample* scrub_reverse_buffer; - RingBufferNPT::rw_vector playback_vector; - RingBufferNPT::rw_vector capture_vector; + PBD::RingBufferNPT::rw_vector playback_vector; + PBD::RingBufferNPT::rw_vector capture_vector; - RingBufferNPT * capture_transition_buf; + PBD::RingBufferNPT * capture_transition_buf; // the following are used in the butler thread only - nframes_t curr_capture_cnt; + framecnt_t curr_capture_cnt; + + void resize_playback (framecnt_t); + void resize_capture (framecnt_t); }; typedef std::vector ChannelList; - void process_varispeed_playback(nframes_t nframes, boost::shared_ptr c); - /* The two central butler operations */ int do_flush (RunContext context, bool force = false); int do_refill () { return _do_refill(_mixdown_buffer, _gain_buffer); } @@ -225,14 +213,14 @@ class AudioDiskstream : public Diskstream int do_refill_with_alloc (); int read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer, - nframes_t& start, nframes_t cnt, - ChannelInfo* channel_info, int channel, bool reversed); + framepos_t& start, framecnt_t cnt, + int channel, bool reversed); - void finish_capture (bool rec_monitors_input, boost::shared_ptr); - void transport_stopped (struct tm&, time_t, bool abort); - void transport_looped (nframes_t transport_frame); + void finish_capture (boost::shared_ptr); + void transport_stopped_wallclock (struct tm&, time_t, bool abort); + void transport_looped (framepos_t transport_frame); - void init (Diskstream::Flag); + void init (); void init_channel (ChannelInfo &chan); void destroy_channel (ChannelInfo &chan); @@ -246,11 +234,14 @@ class AudioDiskstream : public Diskstream int use_pending_capture_data (XMLNode& node); void get_input_sources (); - void prepare_record_status(nframes_t capture_start_frame); + void prepare_record_status(framepos_t capture_start_frame); void set_align_style_from_io(); void setup_destructive_playlist (); void use_destructive_playlist (); + void adjust_playback_buffering (); + void adjust_capture_buffering (); + void engage_record_enable (); void disengage_record_enable ();