diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-04-30 19:44:14 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-04-30 19:44:14 +0000 |
| commit | 7314f66b953e594b630d7725d3520e0f086a2db4 (patch) | |
| tree | 77f562cff65a4b6b395000c3c92d70845013c29b /libs/ardour/ardour/audioregion.h | |
| parent | bc2f8348b51332f7078726c1ab8c0deac8b49921 (diff) | |
Clarify behaviour of ::read (overwrites its buffer) wrt ::read_at (mixes into its buffer).
Refactor things slightly, removing need for ReadOps. Fix crash on teardown of test.
Fixes Rhythm Ferret.
git-svn-id: svn://localhost/ardour2/branches/3.0@12127 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audioregion.h')
| -rw-r--r-- | libs/ardour/ardour/audioregion.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index 1a8b2c9d79..43d831521d 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -106,13 +106,6 @@ class AudioRegion : public Region /* Readable interface */ - enum ReadOps { - ReadOpsNone = 0x0, - ReadOpsOwnAutomation = 0x1, - ReadOpsOwnScaling = 0x2, - ReadOpsFades = 0x4 - }; - virtual framecnt_t read (Sample*, framepos_t pos, framecnt_t cnt, int channel) const; virtual framecnt_t readable_length() const { return length(); } @@ -213,11 +206,7 @@ class AudioRegion : public Region 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, - 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 (); |