diff options
author | Joerg Mueller <nexyon@gmail.com> | 2011-06-22 00:29:02 +0400 |
---|---|---|
committer | Joerg Mueller <nexyon@gmail.com> | 2011-06-22 00:29:02 +0400 |
commit | fba07308bf939352f6db4abbc19983a1d435060e (patch) | |
tree | 73ba8b2759dbb0c41b475324ac145394b6f82aa3 /intern/audaspace/SRC | |
parent | d5eaffda23274271e28bf499bd8d4555b0077079 (diff) |
3D Audio GSoC:
- Converting AUD_SampleRate to a double
- Removing AUD_DefaultMixer
- Introducing AUD_ResampleReader as base class for all resampling readers.
Diffstat (limited to 'intern/audaspace/SRC')
-rw-r--r-- | intern/audaspace/SRC/AUD_SRCResampleReader.cpp | 3 | ||||
-rw-r--r-- | intern/audaspace/SRC/AUD_SRCResampleReader.h | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/intern/audaspace/SRC/AUD_SRCResampleReader.cpp b/intern/audaspace/SRC/AUD_SRCResampleReader.cpp index cd6b0ef8c50..a72d8ba393b 100644 --- a/intern/audaspace/SRC/AUD_SRCResampleReader.cpp +++ b/intern/audaspace/SRC/AUD_SRCResampleReader.cpp @@ -45,8 +45,7 @@ static const char* state_error = "AUD_SRCResampleReader: SRC State couldn't be " AUD_SRCResampleReader::AUD_SRCResampleReader(AUD_Reference<AUD_IReader> reader, AUD_Specs specs) : - AUD_EffectReader(reader), - m_rate(specs.rate), + AUD_ResampleReader(reader, specs.rate), m_channels(reader->getSpecs().channels), m_position(0) { diff --git a/intern/audaspace/SRC/AUD_SRCResampleReader.h b/intern/audaspace/SRC/AUD_SRCResampleReader.h index 896a742356b..dddfeb6a452 100644 --- a/intern/audaspace/SRC/AUD_SRCResampleReader.h +++ b/intern/audaspace/SRC/AUD_SRCResampleReader.h @@ -32,7 +32,7 @@ #ifndef AUD_SRCRESAMPLEREADER #define AUD_SRCRESAMPLEREADER -#include "AUD_EffectReader.h" +#include "AUD_ResampleReader.h" #include "AUD_Buffer.h" #include <samplerate.h> @@ -40,7 +40,7 @@ /** * This resampling reader uses libsamplerate for resampling. */ -class AUD_SRCResampleReader : public AUD_EffectReader +class AUD_SRCResampleReader : public AUD_ResampleReader { private: /** @@ -49,11 +49,6 @@ private: AUD_Buffer m_buffer; /** - * The target sampling rate. - */ - AUD_SampleRate m_rate; - - /** * The reader channels. */ AUD_Channels m_channels; |