Browse Source

Merge pull request #3788

Keegan Drake H.P (2):
      fix(audio): keep the data pointed to by tmpDevName in scope
      style(audio): remove redundant checks in src/audio/audio.cpp
pull/3774/head
sudden6 9 years ago
parent
commit
86a9c5fe26
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
  1. 10
      src/audio/audio.cpp

10
src/audio/audio.cpp

@ -352,9 +352,10 @@ bool Audio::initInput(const QString& deviceName)
const uint32_t chnls = AUDIO_CHANNELS; const uint32_t chnls = AUDIO_CHANNELS;
const ALCsizei bufSize = (frameDuration * sampleRate * 4) / 1000 * chnls; const ALCsizei bufSize = (frameDuration * sampleRate * 4) / 1000 * chnls;
const ALchar* tmpDevName = deviceName.isEmpty() const QByteArray qDevName = deviceName.toUtf8();
const ALchar* tmpDevName = qDevName.isEmpty()
? nullptr ? nullptr
: deviceName.toUtf8().constData(); : qDevName.constData();
alInDev = alcCaptureOpenDevice(tmpDevName, sampleRate, stereoFlag, bufSize); alInDev = alcCaptureOpenDevice(tmpDevName, sampleRate, stereoFlag, bufSize);
// Restart the capture if necessary // Restart the capture if necessary
@ -386,9 +387,10 @@ bool Audio::initOutput(const QString& deviceName)
qDebug() << "Opening audio output" << deviceName; qDebug() << "Opening audio output" << deviceName;
assert(!alOutDev); assert(!alOutDev);
const ALchar* tmpDevName = deviceName.isEmpty() const QByteArray qDevName = deviceName.toUtf8();
const ALchar* tmpDevName = qDevName.isEmpty()
? nullptr ? nullptr
: deviceName.toUtf8().constData(); : qDevName.constData();
alOutDev = alcOpenDevice(tmpDevName); alOutDev = alcOpenDevice(tmpDevName);
if (!alOutDev) if (!alOutDev)

Loading…
Cancel
Save