summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/audioregion.h
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2012-04-16 16:32:22 +0000
committerCarl Hetherington <carl@carlh.net>2012-04-16 16:32:22 +0000
commita2897ecef6da6a458aa1de8c2d9973a1e809dca2 (patch)
tree189e34b829823fc73d11fba249f283e00336d44d /libs/ardour/ardour/audioregion.h
parent02c498a8fa1c2e47988a256321bdcf5e9e869de1 (diff)
Fairly major change to the way in which crossfades are handled;
they are now done with region fades, rather than separate objects. After this commit, Ardour will try to convert your session files to the new crossfade format, but will make a backup in your session folder first. If you have works in progress using Ardour 3 it is ***STRONGLY RECOMMENDED*** that you back up session files before updating to this commit. git-svn-id: svn://localhost/ardour2/branches/3.0@11986 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audioregion.h')
-rw-r--r--libs/ardour/ardour/audioregion.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 077f90c95a..7236cd69a9 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -34,7 +34,8 @@
#include "ardour/region.h"
class XMLNode;
-
+class AudioRegionTest;
+class PlaylistReadTest;
namespace ARDOUR {
@@ -92,6 +93,8 @@ class AudioRegion : public Region
boost::shared_ptr<AutomationList> fade_out() { return _fade_out; }
boost::shared_ptr<AutomationList> envelope() { return _envelope; }
+ Evoral::Range<framepos_t> 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;
@@ -137,6 +140,9 @@ class AudioRegion : public Region
void set_fade_out (FadeShape, framecnt_t);
void set_fade_out (boost::shared_ptr<AutomationList>);
+ void set_default_fade_in ();
+ void set_default_fade_out ();
+
void set_envelope_active (bool yn);
void set_default_envelope ();
@@ -182,6 +188,9 @@ class AudioRegion : public Region
AudioRegion (SourceList &);
private:
+ friend class ::AudioRegionTest;
+ friend class ::PlaylistReadTest;
+
PBD::Property<bool> _envelope_active;
PBD::Property<bool> _default_fade_in;
PBD::Property<bool> _default_fade_out;
@@ -195,8 +204,6 @@ class AudioRegion : public Region
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 ();