X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fardour%2Fdiskstream.h;h=e51f8c3ef15ec7c42d6232d92dcca0ce89a05392;hb=79245a296b73c4ad49bc9b5a204cdda120e1ab90;hp=5bd18663b82878e352af993454fe5005ee78ecac;hpb=5792674ca4d02e093b4318d31a117a47ae72ecdf;p=ardour.git diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h index 5bd18663b8..e51f8c3ef1 100644 --- a/libs/ardour/ardour/diskstream.h +++ b/libs/ardour/ardour/diskstream.h @@ -29,7 +29,7 @@ #include -#include "evoral/types.hpp" +#include "evoral/Range.hpp" #include "ardour/ardour.h" #include "ardour/chan_count.h" @@ -70,6 +70,17 @@ class LIBARDOUR_API Diskstream : public SessionObject, public PublicDiskstream virtual ~Diskstream(); virtual bool set_name (const std::string& str); + virtual bool set_write_source_name (const std::string& str); + + std::string write_source_name () const { + if (_write_source_name.empty()) { + return name(); + } else { + return _write_source_name; + } + } + + virtual std::string steal_write_source_name () { return std::string(); } boost::shared_ptr io() const { return _io; } void set_track (ARDOUR::Track *); @@ -92,8 +103,10 @@ class LIBARDOUR_API Diskstream : public SessionObject, public PublicDiskstream framecnt_t roll_delay() const { return _roll_delay; } void set_roll_delay (framecnt_t); - bool record_enabled() const { return g_atomic_int_get (&_record_enabled); } + bool record_enabled() const { return g_atomic_int_get (const_cast(&_record_enabled)); } + bool record_safe () const { return g_atomic_int_get (const_cast(&_record_safe)); } virtual void set_record_enabled (bool yn) = 0; + virtual void set_record_safe (bool yn) = 0; bool destructive() const { return _flags & Destructive; } virtual int set_destructive (bool /*yn*/) { return -1; } @@ -127,8 +140,14 @@ class LIBARDOUR_API Diskstream : public SessionObject, public PublicDiskstream ChanCount n_channels() { return _n_channels; } - static framecnt_t disk_io_frames() { return disk_io_chunk_frames; } - static void set_disk_io_chunk_frames (framecnt_t n) { disk_io_chunk_frames = n; } + static framecnt_t disk_read_frames() { return disk_read_chunk_frames; } + static framecnt_t disk_write_frames() { return disk_write_chunk_frames; } + static void set_disk_read_chunk_frames (framecnt_t n) { disk_read_chunk_frames = n; } + static void set_disk_write_chunk_frames (framecnt_t n) { disk_write_chunk_frames = n; } + static framecnt_t default_disk_read_chunk_frames (); + static framecnt_t default_disk_write_chunk_frames (); + + static void set_buffering_parameters (BufferingPreset bp); /* Stateful */ virtual XMLNode& get_state(void); @@ -152,8 +171,15 @@ class LIBARDOUR_API Diskstream : public SessionObject, public PublicDiskstream void move_processor_automation (boost::weak_ptr, std::list > const &); - /** For non-butler contexts (allocates temporary working buffers) */ - virtual int do_refill_with_alloc() = 0; + /** For non-butler contexts (allocates temporary working buffers) + * + * This accessible method has a default argument; derived classes + * must inherit the virtual method that we call which does NOT + * have a default argument, to avoid complications with inheritance + */ + int do_refill_with_alloc(bool partial_fill = true) { + return _do_refill_with_alloc (partial_fill); + } virtual void set_block_size (pframes_t) = 0; bool pending_overwrite () const { @@ -161,6 +187,7 @@ class LIBARDOUR_API Diskstream : public SessionObject, public PublicDiskstream } PBD::Signal0 RecordEnableChanged; + PBD::Signal0 RecordSafeChanged; PBD::Signal0 SpeedChanged; PBD::Signal0 ReverseChanged; /* Emitted when this diskstream is set to use a different playlist */ @@ -185,6 +212,11 @@ class LIBARDOUR_API Diskstream : public SessionObject, public PublicDiskstream virtual int can_internal_playback_seek (framecnt_t distance) = 0; virtual void reset_write_sources (bool, bool force = false) = 0; virtual void non_realtime_input_change () = 0; + /* accessible method has default argument, so use standard C++ "trick" + to avoid complications with inheritance, by adding this virtual + method which does NOT have a default argument. + */ + virtual int _do_refill_with_alloc (bool partial_fill) = 0; protected: friend class Auditioner; @@ -244,10 +276,12 @@ class LIBARDOUR_API Diskstream : public SessionObject, public PublicDiskstream virtual void set_align_style_from_io() {} virtual void setup_destructive_playlist () {} virtual void use_destructive_playlist () {} - virtual void prepare_to_stop (framepos_t pos); + virtual void prepare_to_stop (framepos_t transport_pos, framepos_t audible_frame); void engage_record_enable (); void disengage_record_enable (); + void engage_record_safe (); + void disengage_record_safe (); virtual bool prep_record_enable () = 0; virtual bool prep_record_disable () = 0; @@ -257,7 +291,9 @@ class LIBARDOUR_API Diskstream : public SessionObject, public PublicDiskstream framecnt_t& rec_nframes, framecnt_t& rec_offset ); - static framecnt_t disk_io_chunk_frames; + static framecnt_t disk_read_chunk_frames; + static framecnt_t disk_write_chunk_frames; + std::vector capture_info; mutable Glib::Threads::Mutex capture_info_lock; @@ -269,7 +305,8 @@ class LIBARDOUR_API Diskstream : public SessionObject, public PublicDiskstream boost::shared_ptr _playlist; - mutable gint _record_enabled; + gint _record_enabled; + gint _record_safe; double _visible_speed; double _actual_speed; /* items needed for speed change logic */ @@ -310,6 +347,8 @@ class LIBARDOUR_API Diskstream : public SessionObject, public PublicDiskstream bool in_set_state; + std::string _write_source_name; + Glib::Threads::Mutex state_lock; PBD::ScopedConnectionList playlist_connections; @@ -320,6 +359,12 @@ class LIBARDOUR_API Diskstream : public SessionObject, public PublicDiskstream XMLNode* deprecated_io_node; void route_going_away (); + + static bool get_buffering_presets (BufferingPreset bp, + framecnt_t& read_chunk_size, + framecnt_t& read_buffer_size, + framecnt_t& write_chunk_size, + framecnt_t& write_buffer_size); }; }; /* namespace ARDOUR */