X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudioregion.h;h=83cd227bce0136d2179b217aedd4cb56b472d7b6;hb=bb8cb93789b2eec65e4d82e5ceb64054673cbc4f;hp=d1238cb43c3aadeb06194f9418b2cd12e63c220e;hpb=faefa809ad37e5e4c9e729dd52723c7a15aa7237;p=ardour.git diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index d1238cb43c..83cd227bce 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -28,12 +28,14 @@ #include "ardour/ardour.h" #include "ardour/automatable.h" -#include "ardour/gain.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 { @@ -44,20 +46,13 @@ namespace Properties { extern PBD::PropertyDescriptor fade_in_active; extern PBD::PropertyDescriptor fade_out_active; extern PBD::PropertyDescriptor scale_amplitude; - extern PBD::PropertyDescriptor scale_amplitude; - - /* the envelope and fades are not scalar items and so - currently (2010/02) are not stored using Property. - However, these descriptors enable us to notify - about changes to them via PropertyChange. - */ - - extern PBD::PropertyDescriptor envelope; - extern PBD::PropertyDescriptor fade_in; - extern PBD::PropertyDescriptor fade_out; + 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 Route; class Playlist; class Session; class Filter; @@ -82,60 +77,48 @@ 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 _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 (); } + + Evoral::Range body_range () const; - virtual nframes_t read_peaks (PeakData *buf, nframes_t npeaks, - nframes_t offset, nframes_t cnt, + virtual framecnt_t read_peaks (PeakData *buf, framecnt_t npeaks, + framecnt_t offset, framecnt_t cnt, uint32_t chan_n=0, double samples_per_unit= 1.0) const; /* Readable interface */ - enum ReadOps { - ReadOpsNone = 0x0, - ReadOpsOwnAutomation = 0x1, - ReadOpsOwnScaling = 0x2, - ReadOpsCount = 0x4, - ReadOpsFades = 0x8 - }; - virtual framecnt_t read (Sample*, framepos_t pos, framecnt_t cnt, int channel) const; virtual framecnt_t readable_length() const { return length(); } virtual framecnt_t read_at (Sample *buf, Sample *mixdown_buf, float *gain_buf, - framepos_t position, - framecnt_t cnt, - uint32_t chan_n = 0, - framecnt_t read_frames = 0, - framecnt_t skip_frames = 0) const; - + framepos_t position, + framecnt_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 framecnt_t read_raw_internal (Sample*, framepos_t, framecnt_t, int channel) const; XMLNode& state (); + XMLNode& get_basic_state (); int set_state (const XMLNode&, int version); 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 (framecnt_t); @@ -148,6 +131,11 @@ class AudioRegion : public Region 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 (); @@ -165,10 +153,6 @@ class AudioRegion : public Region return _automatable.control(id); } - /* export */ - - int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&); - /* xfade/fade interactions */ void suspend_fade_in (); @@ -176,51 +160,47 @@ class AudioRegion : public Region void resume_fade_in (); void resume_fade_out (); - void add_transient (nframes64_t where); - void remove_transient (nframes64_t where); + void add_transient (framepos_t where); + void remove_transient (framepos_t where); int set_transients (AnalysisFeatureList&); int get_transients (AnalysisFeatureList&, bool force_new = false); - int update_transient (nframes64_t old_position, nframes64_t new_position); - int adjust_transients (nframes64_t delta); + int update_transient (framepos_t old_position, framepos_t new_position); + int adjust_transients (frameoffset_t delta); - std::list > find_silence (Sample, framecnt_t, InterThreadInfo&) const; + AudioIntervalResult find_silence (Sample, framecnt_t, InterThreadInfo&) const; private: friend class RegionFactory; - friend class Crossfade; AudioRegion (boost::shared_ptr); AudioRegion (const SourceList &); - AudioRegion (boost::shared_ptr, frameoffset_t offset = 0, bool offset_relative = true); + AudioRegion (boost::shared_ptr); + 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 (); + 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 (); - framecnt_t _read_at (const SourceList&, framecnt_t limit, - Sample *buf, Sample *mixdown_buffer, float *gain_buffer, - framepos_t position, framecnt_t cnt, - uint32_t chan_n = 0, - framecnt_t read_frames = 0, - framecnt_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 (); @@ -233,13 +213,17 @@ class AudioRegion : public Region void connect_to_analysis_changed (); void connect_to_header_position_offset_changed (); - Automatable _automatable; - boost::shared_ptr _fade_in; - boost::shared_ptr _fade_out; - boost::shared_ptr _envelope; - uint32_t _fade_in_suspended; - uint32_t _fade_out_suspended; + 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 */