diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
| commit | 90b464d3728d9ed8ec26fdf59058d236b99dbcd9 (patch) | |
| tree | e88cab4fb1358e962b19f658064ca8c9f8d29f5b /intern/audaspace/intern/AUD_ConverterFactory.cpp | |
| parent | 08d02dd04d836976b25793bb1d4c6a86b3f924c7 (diff) | |
| parent | b0b787ef38f9947b3176642556f5282eb3518f69 (diff) | |
COLLADA branch: merge from trunk -r 28015:31610.soc-2009-chingachgook
Diffstat (limited to 'intern/audaspace/intern/AUD_ConverterFactory.cpp')
| -rw-r--r-- | intern/audaspace/intern/AUD_ConverterFactory.cpp | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/intern/audaspace/intern/AUD_ConverterFactory.cpp b/intern/audaspace/intern/AUD_ConverterFactory.cpp index 1c6d5468251..057d97fe794 100644 --- a/intern/audaspace/intern/AUD_ConverterFactory.cpp +++ b/intern/audaspace/intern/AUD_ConverterFactory.cpp @@ -26,29 +26,18 @@ #include "AUD_ConverterFactory.h" #include "AUD_ConverterReader.h" -AUD_ConverterFactory::AUD_ConverterFactory(AUD_IReader* reader, - AUD_DeviceSpecs specs) : - AUD_MixerFactory(reader, specs) {} - AUD_ConverterFactory::AUD_ConverterFactory(AUD_IFactory* factory, AUD_DeviceSpecs specs) : - AUD_MixerFactory(factory, specs) {} - -AUD_ConverterFactory::AUD_ConverterFactory(AUD_DeviceSpecs specs) : - AUD_MixerFactory(specs) {} + AUD_MixerFactory(factory, specs) +{ +} -AUD_IReader* AUD_ConverterFactory::createReader() +AUD_IReader* AUD_ConverterFactory::createReader() const { AUD_IReader* reader = getReader(); - if(reader != 0) - { - if(m_specs.format != AUD_FORMAT_FLOAT32) - { - reader = new AUD_ConverterReader(reader, m_specs); - AUD_NEW("reader") - } - } + if(m_specs.format != AUD_FORMAT_FLOAT32) + reader = new AUD_ConverterReader(reader, m_specs); return reader; } |