Skip to content
Permalink
Browse files

Add setting 'asio/enable' to allow users to disable ASIO via the Mumb…

…le configuration.
  • Loading branch information...
mkrautz committed Feb 7, 2015
1 parent 3293f7a commit a5651973d511405b4484528dada750abac409f25
Showing with 12 additions and 0 deletions.
  1. +5 −0 src/mumble/ASIOInput.cpp
  2. +4 −0 src/mumble/Settings.cpp
  3. +3 −0 src/mumble/Settings.h
@@ -89,6 +89,11 @@ void ASIOInit::initialize() {

bool bFound = false;

if (!g.s.bASIOEnable) {
qWarning("ASIOInput: ASIO forcefully disabled via 'asio/enable' config option.");
return;
}

// List of devices known to misbehave or be totally useless
QStringList blacklist;
blacklist << QLatin1String("{a91eaba1-cf4c-11d3-b96a-00a0c9c7b61a}"); // ASIO DirectX
@@ -324,6 +324,8 @@ Settings::Settings() {

iOutputDelay = 5;

bASIOEnable = true;

qsALSAInput=QLatin1String("default");
qsALSAOutput=QLatin1String("default");

@@ -589,6 +591,7 @@ void Settings::load(QSettings* settings_ptr) {
SAVELOAD(iJitterBufferSize, "net/jitterbuffer");
SAVELOAD(iFramesPerPacket, "net/framesperpacket");

SAVELOAD(bASIOEnable, "asio/enable");
SAVELOAD(qsASIOclass, "asio/class");
SAVELOAD(qlASIOmic, "asio/mic");
SAVELOAD(qlASIOspeaker, "asio/speaker");
@@ -882,6 +885,7 @@ void Settings::save() {
SAVELOAD(iJitterBufferSize, "net/jitterbuffer");
SAVELOAD(iFramesPerPacket, "net/framesperpacket");

SAVELOAD(bASIOEnable, "asio/enable");
SAVELOAD(qsASIOclass, "asio/class");
SAVELOAD(qlASIOmic, "asio/mic");
SAVELOAD(qlASIOspeaker, "asio/speaker");
@@ -210,9 +210,12 @@ struct Settings {
QString qsPulseAudioInput, qsPulseAudioOutput;
QString qsOSSInput, qsOSSOutput;
int iPortAudioInput, iPortAudioOutput;

bool bASIOEnable;
QString qsASIOclass;
QList<QVariant> qlASIOmic;
QList<QVariant> qlASIOspeaker;

QString qsCoreAudioInput, qsCoreAudioOutput;
QString qsWASAPIInput, qsWASAPIOutput;
QByteArray qbaDXInput, qbaDXOutput;

0 comments on commit a565197

Please sign in to comment.
You can’t perform that action at this time.