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

…le configuration.
mumble-voip · Feb 7, 2015 · a565197 · a565197
1 parent 3293f7a
commit a565197
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/src/mumble/ASIOInput.cpp b/src/mumble/ASIOInput.cpp
@@ -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

diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp
@@ -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");

diff --git a/src/mumble/Settings.h b/src/mumble/Settings.h
@@ -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;