diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp index 94d1e7858..3e92c6c09 100644 --- a/src/mumble/AudioInput.cpp +++ b/src/mumble/AudioInput.cpp @@ -70,8 +70,8 @@ AudioInputPtr AudioInputRegistrar::newFromChoice(QString choice) { // Try a sensible default. For example, ASIO is NOT a sensible default, but it's // pretty early in the sorted map. - if (qmNew->contains(QLatin1String("DirectSound"))) { - current = QLatin1String("DirectSound"); + if (qmNew->contains(QLatin1String(DEFAULT_SOUNDSYS))) { + current = QLatin1String(DEFAULT_SOUNDSYS); return AudioInputPtr(qmNew->value(current)->create()); } diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp index f7359f839..f27bec3bb 100644 --- a/src/mumble/AudioOutput.cpp +++ b/src/mumble/AudioOutput.cpp @@ -71,8 +71,8 @@ AudioOutputPtr AudioOutputRegistrar::newFromChoice(QString choice) { // Try a sensible default. For example, ASIO is NOT a sensible default, but it's // pretty early in the sorted map. - if (qmNew->contains(QLatin1String("DirectSound"))) { - current = QLatin1String("DirectSound"); + if (qmNew->contains(QLatin1String(DEFAULT_SOUNDSYS))) { + current = QLatin1String(DEFAULT_SOUNDSYS); return AudioOutputPtr(qmNew->value(current)->create()); } diff --git a/src/mumble/Global.h b/src/mumble/Global.h index 2cb41929b..aa4b1e5ba 100644 --- a/src/mumble/Global.h +++ b/src/mumble/Global.h @@ -34,14 +34,20 @@ #include "Settings.h" #include "Timer.h" +#define MUMXTEXT(X) #X +#define MUMTEXT(X) MUMXTEXT(X) + #ifndef MUMBLE_VERSION #define MUMBLE_RELEASE "Compiled " __DATE__ " " __TIME__ #else -#define MUMXTEXT(X) #X -#define MUMTEXT(X) MUMXTEXT(X) #define MUMBLE_RELEASE MUMTEXT(MUMBLE_VERSION) #endif +#ifndef DEFAULT_SOUNDSYSTEM +#define DEFAULT_SOUNDSYSTEM DirectSound +#endif +#define DEFAULT_SOUNDSYS MUMTEXT(DEFAULT_SOUNDSYSTEM) + // Global helper class to spread variables around across threads. class MainWindow;