diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-06-14 16:13:19 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-06-14 16:13:19 +0400 |
| commit | d8974a60f6811faa2872b55eda41b03387614ed1 (patch) | |
| tree | a517f14ea860a1c0111fe758c293d9471dca7496 /intern/audaspace/sndfile | |
| parent | 8ff0c2e10720bd6e583a6b133b75e7bdff27a5f8 (diff) | |
3D Audio GSoC:
Changed Readers to top-down architecture instead of bottom-up.
Diffstat (limited to 'intern/audaspace/sndfile')
| -rw-r--r-- | intern/audaspace/sndfile/AUD_SndFileReader.cpp | 10 | ||||
| -rw-r--r-- | intern/audaspace/sndfile/AUD_SndFileReader.h | 7 |
2 files changed, 2 insertions, 15 deletions
diff --git a/intern/audaspace/sndfile/AUD_SndFileReader.cpp b/intern/audaspace/sndfile/AUD_SndFileReader.cpp index 7b5fd7b0f45..cfe42b0725d 100644 --- a/intern/audaspace/sndfile/AUD_SndFileReader.cpp +++ b/intern/audaspace/sndfile/AUD_SndFileReader.cpp @@ -161,16 +161,8 @@ AUD_Specs AUD_SndFileReader::getSpecs() const return m_specs; } -void AUD_SndFileReader::read(int & length, sample_t* & buffer) +void AUD_SndFileReader::read(int & length, sample_t* buffer) { - int sample_size = AUD_SAMPLE_SIZE(m_specs); - - // resize output buffer if necessary - if(m_buffer.getSize() < length*sample_size) - m_buffer.resize(length*sample_size); - - buffer = m_buffer.getBuffer(); - length = sf_readf_float(m_sndfile, buffer, length); m_position += length; diff --git a/intern/audaspace/sndfile/AUD_SndFileReader.h b/intern/audaspace/sndfile/AUD_SndFileReader.h index af095819c0e..54ab05c63da 100644 --- a/intern/audaspace/sndfile/AUD_SndFileReader.h +++ b/intern/audaspace/sndfile/AUD_SndFileReader.h @@ -68,11 +68,6 @@ private: AUD_Specs m_specs; /** - * The playback buffer. - */ - AUD_Buffer m_buffer; - - /** * The sndfile. */ SNDFILE* m_sndfile; @@ -129,7 +124,7 @@ public: virtual int getLength() const; virtual int getPosition() const; virtual AUD_Specs getSpecs() const; - virtual void read(int & length, sample_t* & buffer); + virtual void read(int & length, sample_t* buffer); }; #endif //AUD_SNDFILEREADER |