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

Move audio input/output system to mumble.ini if present.

Browse Source 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@873 05730e5d-ab1b-0410-a4ac-84af385074fa
This commit is contained in:
Thorvald Natvig 2007-11-25 12:39:05 +00:00
parent f63c019b77
commit f40e3eb78f
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mumble/AudioInput.cpp
View File

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

7
src/mumble/AudioOutput.cpp
View File

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

4
src/mumble/Settings.cpp
View File

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