diff --git a/src/engine/audio/Audio_Interface.cpp b/src/engine/audio/Audio_Interface.cpp index c8a7944f..e1844c95 100644 --- a/src/engine/audio/Audio_Interface.cpp +++ b/src/engine/audio/Audio_Interface.cpp @@ -25,7 +25,7 @@ using namespace Audio; Device::Device() -:mConnection(nullptr) + :mConnection(nullptr) { } @@ -36,12 +36,12 @@ Device::~Device() void Device::setConnection(DataConnection* connection) { - mConnection = connection; + mConnection = connection; } DataConnection* Device::connection() { - return mConnection; + return mConnection; } InputDevice::InputDevice() @@ -55,20 +55,20 @@ InputDevice::~InputDevice() InputDevice* InputDevice::make(int devId) { #if defined(USE_NULL_AUDIO) - return new NullInputDevice(); + return new NullInputDevice(); #else - #if defined(TARGET_WIN) && defined(_MSC_VER) +#if defined(TARGET_WIN) && defined(_MSC_VER) // return new WmmeInputDevice(index); return new DSoundInputDevice(DSoundHelper::deviceId2Guid(devId, true)); - #endif - #ifdef TARGET_OSX - return new MacInputDevice(devId); - #endif - #ifdef TARGET_ANDROID - return new AndroidInputDevice(devId); - #endif #endif - return nullptr; +#ifdef TARGET_OSX + return new MacInputDevice(devId); +#endif +#ifdef TARGET_ANDROID + return new AndroidInputDevice(devId); +#endif +#endif + return nullptr; } OutputDevice::OutputDevice() @@ -82,20 +82,20 @@ OutputDevice::~OutputDevice() OutputDevice* OutputDevice::make(int devId) { #if defined(USE_NULL_AUDIO) - return new NullOutputDevice(); + return new NullOutputDevice(); #else - #if defined(TARGET_WIN) +#if defined(TARGET_WIN) //return new WmmeOutputDevice(index); return new DSoundOutputDevice(DSoundHelper::deviceId2Guid(devId, false)); - #endif - #ifdef TARGET_OSX - return new MacOutputDevice(devId); - #endif - #ifdef TARGET_ANDROID - return new AndroidOutputDevice(devId); - #endif #endif - return nullptr; +#ifdef TARGET_OSX + return new MacOutputDevice(devId); +#endif +#ifdef TARGET_ANDROID + return new AndroidOutputDevice(devId); +#endif +#endif + return nullptr; } @@ -110,31 +110,31 @@ Enumerator::~Enumerator() int Enumerator::nameToIndex(const std::tstring& name) { - for (int i = 0; i < count(); i++) - if (nameAt(i) == name) - return i; - return -1; + for (int i = 0; i < count(); i++) + if (nameAt(i) == name) + return i; + return -1; } Enumerator* Enumerator::make(bool useNull) { - if (useNull) - return new NullEnumerator(); + if (useNull) + return new NullEnumerator(); #ifndef USE_NULL_AUDIO - #ifdef TARGET_WIN - if (winVersion() > Win_Xp) - return new VistaEnumerator(); - else - return new XpEnumerator(); - #endif - #ifdef TARGET_OSX - return new MacEnumerator(); - #endif +#ifdef TARGET_WIN + if (winVersion() > Win_Xp) + return new VistaEnumerator(); + else + return new XpEnumerator(); #endif - return new NullEnumerator(); +#ifdef TARGET_OSX + return new MacEnumerator(); +#endif +#endif + return new NullEnumerator(); } // ----- OsEngine ------------ @@ -142,12 +142,12 @@ Enumerator* Enumerator::make(bool useNull) OsEngine* OsEngine::instance() { #ifdef USE_NULL_AUDIO - return nullptr; + return nullptr; #endif #ifdef TARGET_ANDROID - return &OpenSLEngine::instance(); + return &OpenSLEngine::instance(); #endif - return nullptr; + return nullptr; }