mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support setting DEFAULT_SOUNDSYS

Browse Source 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@864 05730e5d-ab1b-0410-a4ac-84af385074fa
This commit is contained in:
Thorvald Natvig 2007-11-18 02:12:40 +00:00
parent 9257279e44
commit d47fa08d7c
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mumble/AudioInput.cpp
View File

@ -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());
}

4
src/mumble/AudioOutput.cpp
View File

@ -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());
}

10
src/mumble/Global.h
View File

@ -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;