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

Combine a couple if checks

Browse Source
This commit is contained in:
Chris Robinson 2012-02-15 11:28:19 -08:00
parent 1140b3ae83
commit 425ff7cb00
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Alc/ALc.c
View File

@ -1189,19 +1189,15 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
}
device->Flags |= DEVICE_RUNNING;
if(device->FmtChans != oldChans)
if(device->FmtChans != oldChans && (device->Flags&DEVICE_CHANNELS_REQUEST))
{
if((device->Flags&DEVICE_CHANNELS_REQUEST))
ERR("Failed to set %s, got %s instead\n",
DevFmtChannelsString(oldChans),
DevFmtChannelsString(device->FmtChans));
ERR("Failed to set %s, got %s instead\n", DevFmtChannelsString(oldChans),
DevFmtChannelsString(device->FmtChans));
device->Flags &= ~DEVICE_CHANNELS_REQUEST;
}
if(device->Frequency != oldFreq)
if(device->Frequency != oldFreq && (device->Flags&DEVICE_FREQUENCY_REQUEST))
{
if((device->Flags&DEVICE_FREQUENCY_REQUEST))
ERR("Failed to set %uhz, got %uhz instead\n",
oldFreq, device->Frequency);
ERR("Failed to set %uhz, got %uhz instead\n", oldFreq, device->Frequency);
device->Flags &= ~DEVICE_FREQUENCY_REQUEST;
}