- reformatting
This commit is contained in:
parent
b7d5df183b
commit
6deceec404
|
|
@ -25,7 +25,7 @@
|
||||||
using namespace Audio;
|
using namespace Audio;
|
||||||
|
|
||||||
Device::Device()
|
Device::Device()
|
||||||
:mConnection(nullptr)
|
:mConnection(nullptr)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -57,16 +57,16 @@ InputDevice* InputDevice::make(int devId)
|
||||||
#if defined(USE_NULL_AUDIO)
|
#if defined(USE_NULL_AUDIO)
|
||||||
return new NullInputDevice();
|
return new NullInputDevice();
|
||||||
#else
|
#else
|
||||||
#if defined(TARGET_WIN) && defined(_MSC_VER)
|
#if defined(TARGET_WIN) && defined(_MSC_VER)
|
||||||
// return new WmmeInputDevice(index);
|
// return new WmmeInputDevice(index);
|
||||||
return new DSoundInputDevice(DSoundHelper::deviceId2Guid(devId, true));
|
return new DSoundInputDevice(DSoundHelper::deviceId2Guid(devId, true));
|
||||||
#endif
|
#endif
|
||||||
#ifdef TARGET_OSX
|
#ifdef TARGET_OSX
|
||||||
return new MacInputDevice(devId);
|
return new MacInputDevice(devId);
|
||||||
#endif
|
#endif
|
||||||
#ifdef TARGET_ANDROID
|
#ifdef TARGET_ANDROID
|
||||||
return new AndroidInputDevice(devId);
|
return new AndroidInputDevice(devId);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
@ -84,16 +84,16 @@ OutputDevice* OutputDevice::make(int devId)
|
||||||
#if defined(USE_NULL_AUDIO)
|
#if defined(USE_NULL_AUDIO)
|
||||||
return new NullOutputDevice();
|
return new NullOutputDevice();
|
||||||
#else
|
#else
|
||||||
#if defined(TARGET_WIN)
|
#if defined(TARGET_WIN)
|
||||||
//return new WmmeOutputDevice(index);
|
//return new WmmeOutputDevice(index);
|
||||||
return new DSoundOutputDevice(DSoundHelper::deviceId2Guid(devId, false));
|
return new DSoundOutputDevice(DSoundHelper::deviceId2Guid(devId, false));
|
||||||
#endif
|
#endif
|
||||||
#ifdef TARGET_OSX
|
#ifdef TARGET_OSX
|
||||||
return new MacOutputDevice(devId);
|
return new MacOutputDevice(devId);
|
||||||
#endif
|
#endif
|
||||||
#ifdef TARGET_ANDROID
|
#ifdef TARGET_ANDROID
|
||||||
return new AndroidOutputDevice(devId);
|
return new AndroidOutputDevice(devId);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
@ -124,15 +124,15 @@ Enumerator* Enumerator::make(bool useNull)
|
||||||
return new NullEnumerator();
|
return new NullEnumerator();
|
||||||
#ifndef USE_NULL_AUDIO
|
#ifndef USE_NULL_AUDIO
|
||||||
|
|
||||||
#ifdef TARGET_WIN
|
#ifdef TARGET_WIN
|
||||||
if (winVersion() > Win_Xp)
|
if (winVersion() > Win_Xp)
|
||||||
return new VistaEnumerator();
|
return new VistaEnumerator();
|
||||||
else
|
else
|
||||||
return new XpEnumerator();
|
return new XpEnumerator();
|
||||||
#endif
|
#endif
|
||||||
#ifdef TARGET_OSX
|
#ifdef TARGET_OSX
|
||||||
return new MacEnumerator();
|
return new MacEnumerator();
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
return new NullEnumerator();
|
return new NullEnumerator();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue