From 8ff3d1d9602e1e6f623235c40200c874da27ebc5 Mon Sep 17 00:00:00 2001 From: "Tux3 / Mlkj / !Lev.uXFMLA" Date: Tue, 28 Oct 2014 21:27:51 +0100 Subject: [PATCH] Open the audio in/out devices of the settings --- src/core.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/core.cpp b/src/core.cpp index 923bebbab..b6b5d9b78 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -72,7 +72,11 @@ Core::Core(Camera* cam, QThread *coreThread, QString loadPath) : } // OpenAL init - alOutDev = alcOpenDevice(nullptr); + QString outDevDescr = Settings::getInstance().getOutDev(); ; + if (outDevDescr.isEmpty()) + alOutDev = alcOpenDevice(nullptr); + else + alOutDev = alcOpenDevice(outDevDescr.toStdString().c_str()); if (!alOutDev) { qWarning() << "Core: Cannot open output audio device"; @@ -88,7 +92,13 @@ Core::Core(Camera* cam, QThread *coreThread, QString loadPath) : else alGenSources(1, &alMainSource); } - alInDev = alcCaptureOpenDevice(NULL,av_DefaultSettings.audio_sample_rate, AL_FORMAT_MONO16, + + QString inDevDescr = Settings::getInstance().getInDev(); + if (inDevDescr.isEmpty()) + alInDev = alcCaptureOpenDevice(nullptr,av_DefaultSettings.audio_sample_rate, AL_FORMAT_MONO16, + (av_DefaultSettings.audio_frame_duration * av_DefaultSettings.audio_sample_rate * 4) / 1000); + else + alInDev = alcCaptureOpenDevice(inDevDescr.toStdString().c_str(),av_DefaultSettings.audio_sample_rate, AL_FORMAT_MONO16, (av_DefaultSettings.audio_frame_duration * av_DefaultSettings.audio_sample_rate * 4) / 1000); if (!alInDev) qWarning() << "Core: Cannot open input audio device";