kcat/openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't stop the device before going over the attributes

Browse Source
This commit is contained in:
Chris Robinson 2019-07-06 13:20:21 -07:00
parent aeb7fe52f1
commit 47246e5205
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Alc/alc.cpp
View File

@ -1684,26 +1684,13 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
// Check for attributes // Check for attributes
if(attrList && attrList[0]) if(attrList && attrList[0])
{ {
ALCenum alayout = AL_NONE; ALCenum alayout{AL_NONE};
ALCenum ascale = AL_NONE; ALCenum ascale{AL_NONE};
ALCenum schans = AL_NONE; ALCenum schans{AL_NONE};
ALCenum stype = AL_NONE; ALCenum stype{AL_NONE};
ALCsizei attrIdx = 0; ALCsizei attrIdx{0};
ALCsizei aorder = 0; ALCsizei aorder{0};
ALCuint freq = 0; ALCuint freq{0u};
const char *devname{nullptr};
const bool loopback{device->Type == Loopback};
if(!loopback)
{
devname = device->DeviceName.c_str();
/* If a context is already running on the device, stop playback so
* the device attributes can be updated.
*/
if(device->Flags.get<DeviceRunning>())
device->Backend->stop();
device->Flags.unset<DeviceRunning>();
}
ALuint numMono{device->NumMonoSources}; ALuint numMono{device->NumMonoSources};
ALuint numStereo{device->NumStereoSources}; ALuint numStereo{device->NumStereoSources};
@ -1792,6 +1779,7 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
} }
#undef TRACE_ATTR #undef TRACE_ATTR
const bool loopback{device->Type == Loopback};
if(loopback) if(loopback)
{ {
if(!schans || !stype || !freq) if(!schans || !stype || !freq)
@ -1817,14 +1805,20 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
} }
} }
/* If a context is already running on the device, stop playback so the
* device attributes can be updated.
*/
if(device->Flags.get<DeviceRunning>()) if(device->Flags.get<DeviceRunning>())
device->Backend->stop(); device->Backend->stop();
device->Flags.unset<DeviceRunning>(); device->Flags.unset<DeviceRunning>();
UpdateClockBase(device); UpdateClockBase(device);
const char *devname{nullptr};
if(!loopback) if(!loopback)
{ {
devname = device->DeviceName.c_str();
device->BufferSize = DEFAULT_UPDATE_SIZE * DEFAULT_NUM_UPDATES; device->BufferSize = DEFAULT_UPDATE_SIZE * DEFAULT_NUM_UPDATES;
device->UpdateSize = DEFAULT_UPDATE_SIZE; device->UpdateSize = DEFAULT_UPDATE_SIZE;
device->Frequency = DEFAULT_OUTPUT_RATE; device->Frequency = DEFAULT_OUTPUT_RATE;