reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 04:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winecoreaudio: Set AudioQueue volume, not AudioDevice volume.

Browse Source 
We want to control the volume for each particular stream, not the entire
system-wide device.
This commit is contained in:
Andrew Eikum 2011-06-17 15:49:48 -05:00 committed by Alexandre Julliard
parent 792060d67f
commit 096fb434eb
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/winecoreaudio.drv/mmdevdrv.c
View File

@ -2289,7 +2289,6 @@ static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl =
/* index == -1 means set all channels, otherwise sets only the given channel */
static HRESULT ca_setvol(ACImpl *This, UINT32 index)
{
AudioObjectPropertyAddress addr;
float level;
OSStatus sc;
@ -2308,14 +2307,9 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index)
level = This->session->master_vol * This->session->channel_vols[index] *
This->vols[index];
addr.mScope = This->scope;
addr.mSelector = kAudioDevicePropertyVolumeScalar;
addr.mElement = index + 1;
sc = AudioObjectSetPropertyData(This->adevid, &addr, 0, NULL,
sizeof(float), &level);
sc = AudioQueueSetParameter(This->aqueue, kAudioQueueParam_Volume, level);
if(sc != noErr){
WARN("Setting _VolumeScalar property failed: %lx\n", sc);
WARN("Setting _Volume property failed: %lx\n", sc);
return E_FAIL;
}
@ -2514,6 +2508,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume(
This->vols[index] = level;
WARN("AudioQueue doesn't support per-channel volume control\n");
ret = ca_setvol(This, index);
OSSpinLockUnlock(&This->lock);
@ -2675,6 +2670,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume(
session->channel_vols[index] = level;
WARN("AudioQueue doesn't support per-channel volume control\n");
ret = ca_session_setvol(session, index);
LeaveCriticalSection(&session->lock);