X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudioregion.h;h=13e46e4979da16cd7ee06dcee34226a5a9a59c97;hb=bebe2af95ad9999fdca719450dc2c70cfb849076;hp=c2d13667dd7fc29e5fa99562256fbc2acac2c888;hpb=bd231ac9bf860fbfec074d0d2b737bdbe1dea733;p=ardour.git diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index c2d13667dd..13e46e4979 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -27,31 +27,42 @@ #include "pbd/undo.h" #include "ardour/ardour.h" -#include "ardour/automatable_controls.h" -#include "ardour/gain.h" +#include "ardour/automatable.h" +#include "ardour/automation_list.h" +#include "ardour/interthread_info.h" #include "ardour/logcurve.h" #include "ardour/region.h" class XMLNode; +class AudioRegionReadTest; +class PlaylistReadTest; namespace ARDOUR { -class Route; +namespace Properties { + extern PBD::PropertyDescriptor envelope_active; + extern PBD::PropertyDescriptor default_fade_in; + extern PBD::PropertyDescriptor default_fade_out; + extern PBD::PropertyDescriptor fade_in_active; + extern PBD::PropertyDescriptor fade_out_active; + extern PBD::PropertyDescriptor scale_amplitude; + extern PBD::PropertyDescriptor > fade_in; + extern PBD::PropertyDescriptor > inverse_fade_in; + extern PBD::PropertyDescriptor > fade_out; + extern PBD::PropertyDescriptor > inverse_fade_out; + extern PBD::PropertyDescriptor > envelope; +} + class Playlist; class Session; class Filter; class AudioSource; + class AudioRegion : public Region { public: - static Change FadeInChanged; - static Change FadeOutChanged; - static Change FadeInActiveChanged; - static Change FadeOutActiveChanged; - static Change EnvelopeActiveChanged; - static Change ScaleAmplitudeChanged; - static Change EnvelopeChanged; + static void make_property_quarks (); ~AudioRegion(); @@ -66,73 +77,65 @@ class AudioRegion : public Region void set_scale_amplitude (gain_t); gain_t scale_amplitude() const { return _scale_amplitude; } - void normalize_to (float target_in_dB = 0.0f); + void normalize (float, float target_in_dB = 0.0f); + double maximum_amplitude (Progress* p = 0) const; - bool envelope_active () const { return _flags & Region::EnvelopeActive; } - bool fade_in_active () const { return _flags & Region::FadeIn; } - bool fade_out_active () const { return _flags & Region::FadeOut; } + bool envelope_active () const { return _envelope_active; } + bool fade_in_active () const { return _fade_in_active; } + bool fade_out_active () const { return _fade_out_active; } - boost::shared_ptr fade_in() { return _fade_in; } - boost::shared_ptr fade_out() { return _fade_out; } - boost::shared_ptr envelope() { return _envelope; } + boost::shared_ptr fade_in() { return _fade_in.val (); } + boost::shared_ptr inverse_fade_in() { return _inverse_fade_in.val (); } + boost::shared_ptr fade_out() { return _fade_out.val (); } + boost::shared_ptr inverse_fade_out() { return _inverse_fade_out.val (); } + boost::shared_ptr envelope() { return _envelope.val (); } - virtual nframes_t read_peaks (PeakData *buf, nframes_t npeaks, - nframes_t offset, nframes_t cnt, - uint32_t chan_n=0, double samples_per_unit= 1.0) const; + Evoral::Range body_range () const; - /* Readable interface */ + virtual framecnt_t read_peaks (PeakData *buf, framecnt_t npeaks, + framecnt_t offset, framecnt_t cnt, + uint32_t chan_n=0, double frames_per_pixel = 1.0) const; - enum ReadOps { - ReadOpsNone = 0x0, - ReadOpsOwnAutomation = 0x1, - ReadOpsOwnScaling = 0x2, - ReadOpsCount = 0x4, - ReadOpsFades = 0x8 - }; + /* Readable interface */ - virtual nframes_t read (Sample*, sframes_t pos, nframes_t cnt, int channel) const; - virtual nframes_t read_with_ops (Sample*, sframes_t pos, nframes_t cnt, int channel, ReadOps rops) const; - virtual nframes64_t readable_length() const { return length(); } + virtual framecnt_t read (Sample*, framepos_t pos, framecnt_t cnt, int channel) const; + virtual framecnt_t readable_length() const { return length(); } - virtual nframes_t read_at (Sample *buf, Sample *mixdown_buf, float *gain_buf, - sframes_t position, - nframes_t cnt, - uint32_t chan_n = 0, - nframes_t read_frames = 0, - nframes_t skip_frames = 0) const; + virtual framecnt_t read_at (Sample *buf, Sample *mixdown_buf, float *gain_buf, + framepos_t position, + framecnt_t cnt, + uint32_t chan_n = 0) const; - virtual nframes_t master_read_at (Sample *buf, Sample *mixdown_buf, float *gain_buf, - sframes_t position, nframes_t cnt, uint32_t chan_n=0) const; + virtual framecnt_t master_read_at (Sample *buf, Sample *mixdown_buf, float *gain_buf, + framepos_t position, framecnt_t cnt, uint32_t chan_n=0) const; - virtual nframes_t read_raw_internal (Sample*, sframes_t, nframes_t, int channel) const; + virtual framecnt_t read_raw_internal (Sample*, framepos_t, framecnt_t, int channel) const; - XMLNode& state (bool); - int set_state (const XMLNode&, int version); + XMLNode& state (); + XMLNode& get_basic_state (); + int set_state (const XMLNode&, int version); - static void set_default_fade (float steepness, nframes_t len); + static void set_default_fade (float steepness, framecnt_t len); bool fade_in_is_default () const; bool fade_out_is_default () const; - enum FadeShape { - Linear, - Fast, - Slow, - LogA, - LogB - }; - void set_fade_in_active (bool yn); void set_fade_in_shape (FadeShape); - void set_fade_in_length (nframes_t); - void set_fade_in (FadeShape, nframes_t); + void set_fade_in_length (framecnt_t); + void set_fade_in (FadeShape, framecnt_t); void set_fade_in (boost::shared_ptr); void set_fade_out_active (bool yn); void set_fade_out_shape (FadeShape); - void set_fade_out_length (nframes_t); - void set_fade_out (FadeShape, nframes_t); + void set_fade_out_length (framecnt_t); + void set_fade_out (FadeShape, framecnt_t); void set_fade_out (boost::shared_ptr); + void set_default_fade_in (); + void set_default_fade_out (); + + framecnt_t verify_xfade_bounds (framecnt_t, bool start); + void set_envelope_active (bool yn); void set_default_envelope (); @@ -142,18 +145,14 @@ class AudioRegion : public Region boost::shared_ptr control(const Evoral::Parameter& id, bool create=false) { - return _automatable.data().control(id, create); + return _automatable.control(id, create); } virtual boost::shared_ptr control(const Evoral::Parameter& id) const { - return _automatable.data().control(id); + return _automatable.control(id); } - /* export */ - - int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&); - /* xfade/fade interactions */ void suspend_fade_in (); @@ -161,38 +160,47 @@ class AudioRegion : public Region void resume_fade_in (); void resume_fade_out (); + void add_transient (framepos_t where); + void remove_transient (framepos_t where); + int set_transients (AnalysisFeatureList&); int get_transients (AnalysisFeatureList&, bool force_new = false); - std::list > find_silence (Sample, nframes_t) const; + int update_transient (framepos_t old_position, framepos_t new_position); + int adjust_transients (frameoffset_t delta); + + AudioIntervalResult find_silence (Sample, framecnt_t, InterThreadInfo&) const; private: friend class RegionFactory; - friend class Crossfade; - AudioRegion (boost::shared_ptr, nframes_t start, nframes_t length); - AudioRegion (boost::shared_ptr, nframes_t start, nframes_t length, const std::string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags); - AudioRegion (const SourceList &, nframes_t start, nframes_t length, const std::string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags); - AudioRegion (boost::shared_ptr, nframes_t start, nframes_t length, const std::string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags); - AudioRegion (boost::shared_ptr, const SourceList&, nframes_t length, const std::string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags); + AudioRegion (boost::shared_ptr); + AudioRegion (const SourceList &); AudioRegion (boost::shared_ptr); - AudioRegion (boost::shared_ptr, const XMLNode&); - AudioRegion (SourceList &, const XMLNode&); + AudioRegion (boost::shared_ptr, frameoffset_t offset); + AudioRegion (boost::shared_ptr, const SourceList&); + AudioRegion (SourceList &); private: + friend class ::AudioRegionReadTest; + friend class ::PlaylistReadTest; + + PBD::Property _envelope_active; + PBD::Property _default_fade_in; + PBD::Property _default_fade_out; + PBD::Property _fade_in_active; + PBD::Property _fade_out_active; + /** linear gain to apply to the whole region */ + PBD::Property _scale_amplitude; + + void register_properties (); + void post_set (const PBD::PropertyChange&); + void init (); void set_default_fades (); - void set_default_fade_in (); - void set_default_fade_out (); void recompute_gain_at_end (); void recompute_gain_at_start (); - nframes_t _read_at (const SourceList&, nframes_t limit, - Sample *buf, Sample *mixdown_buffer, float *gain_buffer, - sframes_t position, nframes_t cnt, - uint32_t chan_n = 0, - nframes_t read_frames = 0, - nframes_t skip_frames = 0, - ReadOps readops = ReadOps (~0)) const; + framecnt_t read_from_sources (SourceList const &, framecnt_t, Sample *, framepos_t, framecnt_t, uint32_t) const; void recompute_at_start (); void recompute_at_end (); @@ -205,31 +213,26 @@ class AudioRegion : public Region void connect_to_analysis_changed (); void connect_to_header_position_offset_changed (); - AutomatableControls _automatable; - boost::shared_ptr _fade_in; - boost::shared_ptr _fade_out; - boost::shared_ptr _envelope; - gain_t _scale_amplitude; - uint32_t _fade_in_disabled; - uint32_t _fade_out_disabled; + AutomationListProperty _fade_in; + AutomationListProperty _inverse_fade_in; + AutomationListProperty _fade_out; + AutomationListProperty _inverse_fade_out; + AutomationListProperty _envelope; + Automatable _automatable; + uint32_t _fade_in_suspended; + uint32_t _fade_out_suspended; + + boost::shared_ptr get_single_other_xfade_region (bool start) const; protected: /* default constructor for derived (compound) types */ - AudioRegion (Session& s, nframes_t, nframes_t, std::string name); + AudioRegion (Session& s, framepos_t, framecnt_t, std::string name); - int set_live_state (const XMLNode&, int version, Change&, bool send); + int _set_state (const XMLNode&, int version, PBD::PropertyChange& what_changed, bool send_signal); }; } /* namespace ARDOUR */ -/* access from C objects */ - -extern "C" { - int region_read_peaks_from_c (void *arg, uint32_t npeaks, uint32_t start, uint32_t length, intptr_t data, uint32_t n_chan, double samples_per_unit); - uint32_t region_length_from_c (void *arg); - uint32_t sourcefile_length_from_c (void *arg, double); -} - #endif /* __ardour_audio_region_h__ */