diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/audioregion.h | 20 | ||||
| -rw-r--r-- | libs/ardour/ardour/audiosource.h | 10 | ||||
| -rw-r--r-- | libs/ardour/ardour/crossfade.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_region.h | 14 | ||||
| -rw-r--r-- | libs/ardour/ardour/readable.h | 6 |
5 files changed, 23 insertions, 31 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, diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h index 0ed621c6ac..08435bf3b1 100644 --- a/libs/ardour/ardour/audiosource.h +++ b/libs/ardour/ardour/audiosource.h @@ -57,15 +57,7 @@ class AudioSource : virtual public Source, virtual nframes_t available_peaks (double zoom) const; - /** Stopgap for Readable until nframes_t becomes nframes64_t. */ - virtual nframes64_t read (Sample *dst, nframes64_t start, nframes64_t cnt, int channel) const { - /* XXX currently ignores channel, assuming that source is always mono, which - historically has been true. - */ - return read (dst, (nframes_t) start, (nframes_t) cnt); - } - - virtual nframes_t read (Sample *dst, sframes_t start, nframes_t cnt) const; + virtual nframes_t read (Sample *dst, sframes_t start, nframes_t cnt, int channel=0) const; virtual nframes_t write (Sample *src, nframes_t cnt); virtual float sample_rate () const = 0; diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h index b0785a6e59..2b893478d4 100644 --- a/libs/ardour/ardour/crossfade.h +++ b/libs/ardour/ardour/crossfade.h @@ -81,7 +81,7 @@ class Crossfade : public ARDOUR::AudioRegion boost::shared_ptr<ARDOUR::AudioRegion> out() const { return _out; } nframes_t read_at (Sample *buf, Sample *mixdown_buffer, - float *gain_buffer, nframes_t position, nframes_t cnt, + float *gain_buffer, sframes_t position, nframes_t cnt, uint32_t chan_n, nframes_t read_frames = 0, nframes_t skip_frames = 0) const; @@ -170,7 +170,7 @@ class Crossfade : public ARDOUR::AudioRegion bool update (); protected: - nframes_t read_raw_internal (Sample*, nframes_t, nframes_t) const; + nframes_t read_raw_internal (Sample*, sframes_t, nframes_t) const; }; diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index dc95fccdb4..0760fb7268 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -54,17 +54,17 @@ class MidiRegion : public Region boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const; /* Stub Readable interface */ - virtual nframes64_t read (Sample*, nframes64_t pos, nframes64_t cnt, int channel) const { return 0; } - virtual nframes64_t readable_length() const { return length(); } + virtual nframes_t read (Sample*, sframes_t pos, nframes_t cnt, int channel) const { return 0; } + virtual sframes_t readable_length() const { return length(); } nframes_t read_at (MidiRingBuffer<nframes_t>& dst, - nframes_t position, - nframes_t dur, - uint32_t chan_n = 0, - NoteMode mode = Sustained) const; + sframes_t position, + nframes_t dur, + uint32_t chan_n = 0, + NoteMode mode = Sustained) const; nframes_t master_read_at (MidiRingBuffer<nframes_t>& dst, - nframes_t position, + sframes_t position, nframes_t dur, uint32_t chan_n = 0, NoteMode mode = Sustained) const; diff --git a/libs/ardour/ardour/readable.h b/libs/ardour/ardour/readable.h index e072a1c95e..a65af23312 100644 --- a/libs/ardour/ardour/readable.h +++ b/libs/ardour/ardour/readable.h @@ -10,9 +10,9 @@ class Readable { Readable () {} virtual ~Readable() {} - virtual nframes64_t read (Sample*, nframes64_t pos, nframes64_t cnt, int channel) const = 0; - virtual nframes64_t readable_length() const = 0; - virtual uint32_t n_channels () const = 0; + virtual nframes_t read (Sample*, sframes_t pos, nframes_t cnt, int channel) const = 0; + virtual sframes_t readable_length() const = 0; + virtual uint32_t n_channels () const = 0; }; } |