diff options
| author | David Robillard <d@drobilla.net> | 2009-02-19 21:06:56 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-02-19 21:06:56 +0000 |
| commit | bed0d89337b0775e669439ef4e0759feb7ddc74e (patch) | |
| tree | d8e065e64e32970d6d2b67bec936f0f078d1802f /libs/ardour/ardour/audioregion.h | |
| parent | 75c15679bf1551dcb93d4fa62075517c66d3b222 (diff) | |
Clean up Region interface, remove Readable stub kludge.
git-svn-id: svn://localhost/ardour2/branches/3.0@4643 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audioregion.h')
| -rw-r--r-- | libs/ardour/ardour/audioregion.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index b259a13229..9be2defaa7 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -92,21 +92,21 @@ class AudioRegion : public Region ReadOpsFades = 0x8 }; - virtual nframes64_t read (Sample*, nframes64_t pos, nframes64_t cnt, int channel) const; - virtual nframes64_t read_with_ops (Sample*, nframes64_t pos, nframes64_t cnt, int channel, ReadOps rops) const; + 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 nframes_t read_at (Sample *buf, Sample *mixdown_buf, - float *gain_buf, nframes_t position, nframes_t cnt, + 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 nframes_t master_read_at (Sample *buf, Sample *mixdown_buf, - float *gain_buf, - nframes_t position, nframes_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 nframes_t read_raw_internal (Sample*, nframes_t, nframes_t) const; + virtual nframes_t read_raw_internal (Sample*, sframes_t, nframes_t) const; XMLNode& state (bool); int set_state (const XMLNode&); @@ -186,8 +186,8 @@ class AudioRegion : public Region void recompute_gain_at_start (); nframes_t _read_at (const SourceList&, nframes_t limit, - Sample *buf, Sample *mixdown_buffer, - float *gain_buffer, nframes_t position, nframes_t cnt, + 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, |