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_ReadDevice.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_ReadDevice.cpp')
| -rw-r--r-- | intern/audaspace/intern/AUD_ReadDevice.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/intern/audaspace/intern/AUD_ReadDevice.cpp b/intern/audaspace/intern/AUD_ReadDevice.cpp index 37a7d1ae295..cde5694354e 100644 --- a/intern/audaspace/intern/AUD_ReadDevice.cpp +++ b/intern/audaspace/intern/AUD_ReadDevice.cpp @@ -23,21 +23,17 @@ * ***** END LGPL LICENSE BLOCK ***** */ -#include "AUD_Mixer.h" +#include "AUD_DefaultMixer.h" #include "AUD_ReadDevice.h" #include "AUD_IReader.h" #include <cstring> -AUD_ReadDevice::AUD_ReadDevice(AUD_DeviceSpecs specs) +AUD_ReadDevice::AUD_ReadDevice(AUD_DeviceSpecs specs) : + m_playing(false) { m_specs = specs; - m_mixer = new AUD_Mixer(); AUD_NEW("mixer") - m_mixer->setSpecs(m_specs); - - m_playing = false; - create(); } |