From f40e3eb78f070ea2fd089a0053605c00d75f167a Mon Sep 17 00:00:00 2001
From: Thorvald Natvig <slicer@users.sourceforge.net>
Date: Sun, 25 Nov 2007 12:39:05 +0000
Subject: [PATCH] Move audio input/output system to mumble.ini if present.

git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@873 05730e5d-ab1b-0410-a4ac-84af385074fa
---
 src/mumble/AudioInput.cpp  | 5 ++---
 src/mumble/AudioOutput.cpp | 7 +++----
 src/mumble/Settings.cpp    | 4 ++++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp
index a1a6905bc..09c3746f0 100644
--- a/src/mumble/AudioInput.cpp
+++ b/src/mumble/AudioInput.cpp
@@ -55,13 +55,12 @@ AudioInputRegistrar::~AudioInputRegistrar() {
 }
 
 AudioInputPtr AudioInputRegistrar::newFromChoice(QString choice) {
-	QSettings qs;
 	if (!choice.isEmpty() && qmNew->contains(choice)) {
-		qs.setValue(QLatin1String("AudioInputDevice"), choice);
+		g.s.qsAudioInput = choice;
 		current = choice;
 		return AudioInputPtr(qmNew->value(current)->create());
 	}
-	choice = qs.value(QLatin1String("AudioInputDevice")).toString();
+	choice = g.s.qsAudioInput;
 	if (qmNew->contains(choice)) {
 		current = choice;
 		return AudioInputPtr(qmNew->value(choice)->create());
diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp
index cfa83add6..956aa687a 100644
--- a/src/mumble/AudioOutput.cpp
+++ b/src/mumble/AudioOutput.cpp
@@ -57,13 +57,12 @@ AudioOutputRegistrar::~AudioOutputRegistrar() {
 }
 
 AudioOutputPtr AudioOutputRegistrar::newFromChoice(QString choice) {
-	QSettings qs;
 	if (!choice.isEmpty() && qmNew->contains(choice)) {
-		qs.setValue(QLatin1String("AudioOutputDevice"), choice);
+		g.s.qsAudioOutput = choice;
 		current = choice;
 		return AudioOutputPtr(qmNew->value(choice)->create());
 	}
-	choice = qs.value(QLatin1String("AudioOutputDevice")).toString();
+	choice = g.s.qsAudioOutput;
 	if (qmNew->contains(choice)) {
 		current = choice;
 		return AudioOutputPtr(qmNew->value(choice)->create());
@@ -350,7 +349,7 @@ AudioSine::AudioSine(float hz, float i, unsigned int frm, float vol) : AudioOutp
 	psBuffer = new short[iFrameSize];
 	fftTable = NULL;
 	tbin = 4;
-	
+
 	if (inc == 0.0)
 		g.iAudioPathTime = 0;
 }
diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp
index b7b26404e..b3936c3c4 100644
--- a/src/mumble/Settings.cpp
+++ b/src/mumble/Settings.cpp
@@ -137,6 +137,8 @@ void Settings::load() {
 	SAVELOAD(fDXMinDistance, "audio/mindistance");
 	SAVELOAD(fDXMaxDistance, "audio/maxdistance");
 	SAVELOAD(fDXRollOff, "audio/rolloff");
+	SAVELOAD(qsAudioInput, "audio/input");
+	SAVELOAD(qsAudioOutput, "audio/output");
 
 	SAVELOAD(iJitterBufferSize, "net/jitterbuffer");
 	SAVELOAD(iFramesPerPacket, "net/framesperpacket");
@@ -242,6 +244,8 @@ void Settings::save() {
 	SAVELOAD(fDXMinDistance, "audio/mindistance");
 	SAVELOAD(fDXMaxDistance, "audio/maxdistance");
 	SAVELOAD(fDXRollOff, "audio/rolloff");
+	SAVELOAD(qsAudioInput, "audio/input");
+	SAVELOAD(qsAudioOutput, "audio/output");
 
 	SAVELOAD(iJitterBufferSize, "net/jitterbuffer");
 	SAVELOAD(iFramesPerPacket, "net/framesperpacket");