X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudioregion.h;h=8e510b3e43cd25d41f2ec1f269c7427d634ba959;hb=0622a0cc3068a06d328119e90b7d9c5f5a84df32;hp=fe9f991ed04889fb8ee1a2cf2788d348d4a5e41c;hpb=a47ec8ba590d1fe663a64a50b02b1f6b61fd5743;p=ardour.git diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index fe9f991ed0..8e510b3e43 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -34,28 +34,23 @@ #include "ardour/region.h" class XMLNode; -class AudioRegionTest; +class AudioRegionReadTest; class PlaylistReadTest; namespace ARDOUR { 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; - - /* 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; + LIBARDOUR_API extern PBD::PropertyDescriptor envelope_active; + LIBARDOUR_API extern PBD::PropertyDescriptor default_fade_in; + LIBARDOUR_API extern PBD::PropertyDescriptor default_fade_out; + LIBARDOUR_API extern PBD::PropertyDescriptor fade_in_active; + LIBARDOUR_API extern PBD::PropertyDescriptor fade_out_active; + LIBARDOUR_API extern PBD::PropertyDescriptor scale_amplitude; + LIBARDOUR_API extern PBD::PropertyDescriptor > fade_in; + LIBARDOUR_API extern PBD::PropertyDescriptor > inverse_fade_in; + LIBARDOUR_API extern PBD::PropertyDescriptor > fade_out; + LIBARDOUR_API extern PBD::PropertyDescriptor > inverse_fade_out; + LIBARDOUR_API extern PBD::PropertyDescriptor > envelope; } class Playlist; @@ -64,7 +59,7 @@ class Filter; class AudioSource; -class AudioRegion : public Region +class LIBARDOUR_API AudioRegion : public Region { public: static void make_property_quarks (); @@ -89,22 +84,17 @@ class AudioRegion : public Region bool fade_in_active () const { return _fade_in_active; } bool fade_out_active () const { return _fade_out_active; } - bool fade_in_is_xfade() const { return _fade_in_is_xfade; } - void set_fade_in_is_xfade (bool yn); - bool fade_out_is_xfade() const { return _fade_out_is_xfade; } - void set_fade_out_is_xfade (bool yn); - - boost::shared_ptr fade_in() { return _fade_in; } - boost::shared_ptr inverse_fade_in() { return _inverse_fade_in; } - boost::shared_ptr fade_out() { return _fade_out; } - boost::shared_ptr inverse_fade_out() { return _inverse_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 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; + uint32_t chan_n=0, double frames_per_pixel = 1.0) const; /* Readable interface */ @@ -122,9 +112,11 @@ class AudioRegion : public Region 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); + void fade_range (framepos_t, framepos_t); + bool fade_in_is_default () const; bool fade_out_is_default () const; @@ -142,6 +134,8 @@ class AudioRegion : public Region 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 (); @@ -178,7 +172,6 @@ class AudioRegion : public Region private: friend class RegionFactory; - friend class Crossfade; AudioRegion (boost::shared_ptr); AudioRegion (const SourceList &); @@ -188,7 +181,7 @@ class AudioRegion : public Region AudioRegion (SourceList &); private: - friend class ::AudioRegionTest; + friend class ::AudioRegionReadTest; friend class ::PlaylistReadTest; PBD::Property _envelope_active; @@ -221,20 +214,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 _inverse_fade_in; - boost::shared_ptr _fade_out; - boost::shared_ptr _inverse_fade_out; - boost::shared_ptr _envelope; - uint32_t _fade_in_suspended; - uint32_t _fade_out_suspended; - /* This is not a Property because its not subject to user control, - or undo/redo. XXX this may prove to be a mistake. - */ - bool _fade_in_is_xfade; - bool _fade_out_is_xfade; + + 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 */ @@ -249,9 +239,9 @@ class AudioRegion : public Region /* 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); + LIBARDOUR_API 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); + LIBARDOUR_API uint32_t region_length_from_c (void *arg); + LIBARDOUR_API uint32_t sourcefile_length_from_c (void *arg, double); } #endif /* __ardour_audio_region_h__ */