Skip to content

W
wine-winehq
Commit bc10fd3c authored by Andrew Eikum's avatar Andrew Eikum Committed by Alexandre Julliard
Browse files
Options

mmdevapi: Sessions should be unique per-device.

parent aa005d7d
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 92 deletions
dlls/mmdevapi/devenum.c
View file @ bc10fd3c
......@@ -547,7 +547,7 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls
else if (IsEqualIID(riid, &IID_IAudioSessionManager)
|| IsEqualIID(riid, &IID_IAudioSessionManager2))
{
hr = drvs.pGetAudioSessionManager(This->flow, (IAudioSessionManager2**)ppv);
hr = drvs.pGetAudioSessionManager(iface, (IAudioSessionManager2**)ppv);
}
else if (IsEqualIID(riid, &IID_IBaseFilter))
{
......
dlls/mmdevapi/mmdevapi.h
View file @ bc10fd3c
......@@ -37,7 +37,7 @@ typedef struct _DriverFuncs {
void ***keys, UINT *num, UINT *default_index);
HRESULT WINAPI (*pGetAudioEndpoint)(void *key, IMMDevice *dev,
EDataFlow dataflow, IAudioClient **out);
HRESULT WINAPI (*pGetAudioSessionManager)(EDataFlow flow,
HRESULT WINAPI (*pGetAudioSessionManager)(IMMDevice *device,
IAudioSessionManager2 **out);
} DriverFuncs;
......
dlls/winealsa.drv/mmdevdrv.c
View file @ bc10fd3c
......@@ -60,7 +60,7 @@ typedef struct _AudioSession {
GUID guid;
struct list clients;
EDataFlow dataflow;
IMMDevice *device;
float master_vol;
UINT32 channel_count;
......@@ -133,7 +133,7 @@ typedef struct _SessionMgr {
LONG ref;
EDataFlow flow;
IMMDevice *device;
} SessionMgr;
static HANDLE g_timer_q;
......@@ -560,18 +560,26 @@ static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt)
static void session_init_vols(AudioSession *session, UINT channels)
{
session->channel_vols = HeapAlloc(GetProcessHeap(), 0,
sizeof(float) * channels);
if(!session->channel_vols)
return;
if(session->channel_count < channels){
UINT i;
session->channel_count = channels;
if(session->channel_vols)
session->channel_vols = HeapReAlloc(GetProcessHeap(), 0,
session->channel_vols, sizeof(float) * channels);
else
session->channel_vols = HeapAlloc(GetProcessHeap(), 0,
sizeof(float) * channels);
if(!session->channel_vols)
return;
for(; channels > 0; --channels)
session->channel_vols[channels - 1] = 1.f;
for(i = session->channel_count; i < channels; ++i)
session->channel_vols[i] = 1.f;
session->channel_count = channels;
}
}
static AudioSession *create_session(const GUID *guid, EDataFlow flow,
static AudioSession *create_session(const GUID *guid, IMMDevice *device,
UINT num_channels)
{
AudioSession *ret;
......@@ -582,7 +590,7 @@ static AudioSession *create_session(const GUID *guid, EDataFlow flow,
memcpy(&ret->guid, guid, sizeof(GUID));
ret->dataflow = flow;
ret->device = device;
list_init(&ret->clients);
......@@ -590,8 +598,7 @@ static AudioSession *create_session(const GUID *guid, EDataFlow flow,
InitializeCriticalSection(&ret->lock);
if(num_channels > 0)
session_init_vols(ret, num_channels);
session_init_vols(ret, num_channels);
ret->master_vol = 1.f;
......@@ -601,12 +608,12 @@ static AudioSession *create_session(const GUID *guid, EDataFlow flow,
/* if channels == 0, then this will return or create a session with
* matching dataflow and GUID. otherwise, channels must also match */
static HRESULT get_audio_session(const GUID *sessionguid,
EDataFlow flow, UINT channels, AudioSession **out)
IMMDevice *device, UINT channels, AudioSession **out)
{
AudioSession *session;
if(!sessionguid || IsEqualGUID(sessionguid, &GUID_NULL)){
*out = create_session(&GUID_NULL, flow, channels);
*out = create_session(&GUID_NULL, device, channels);
if(!*out)
return E_OUTOFMEMORY;
......@@ -615,20 +622,16 @@ static HRESULT get_audio_session(const GUID *sessionguid,
*out = NULL;
LIST_FOR_EACH_ENTRY(session, &g_sessions, AudioSession, entry){
if(IsEqualGUID(sessionguid, &session->guid) &&
session->dataflow == flow){
if(session->channel_count > 0){
if(channels > 0 && session->channel_count != channels)
return E_INVALIDARG;
}else if(channels > 0)
session_init_vols(session, channels);
if(session->device == device &&
IsEqualGUID(sessionguid, &session->guid)){
session_init_vols(session, channels);
*out = session;
break;
}
}
if(!*out){
*out = create_session(sessionguid, flow, channels);
*out = create_session(sessionguid, device, channels);
if(!*out)
return E_OUTOFMEMORY;
}
......@@ -873,7 +876,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface,
EnterCriticalSection(&g_sessions_lock);
hr = get_audio_session(sessionguid, This->dataflow, fmt->nChannels,
hr = get_audio_session(sessionguid, This->parent, fmt->nChannels,
&This->session);
if(FAILED(hr)){
LeaveCriticalSection(&g_sessions_lock);
......@@ -2972,7 +2975,7 @@ HRESULT WINAPI AudioSessionManager_GetAudioSessionControl(
TRACE("(%p)->(%s, %x, %p)\n", This, debugstr_guid(session_guid),
flags, out);
hr = get_audio_session(session_guid, This->flow, 0, &session);
hr = get_audio_session(session_guid, This->device, 0, &session);
if(FAILED(hr))
return hr;
......@@ -2999,7 +3002,7 @@ HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume(
TRACE("(%p)->(%s, %x, %p)\n", This, debugstr_guid(session_guid),
flags, out);
hr = get_audio_session(session_guid, This->flow, 0, &session);
hr = get_audio_session(session_guid, This->device, 0, &session);
if(FAILED(hr))
return hr;
......@@ -3070,17 +3073,17 @@ static const IAudioSessionManager2Vtbl AudioSessionManager2_Vtbl =
AudioSessionManager_UnregisterDuckNotification
};
HRESULT WINAPI AUDDRV_GetAudioSessionManager(EDataFlow dataflow,
HRESULT WINAPI AUDDRV_GetAudioSessionManager(IMMDevice *device,
IAudioSessionManager2 **out)
{
SessionMgr *This;
This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SessionMgr));
if(!*out)
if(!This)
return E_OUTOFMEMORY;
This->IAudioSessionManager2_iface.lpVtbl = &AudioSessionManager2_Vtbl;
This->flow = dataflow;
This->device = device;
This->ref = 1;
*out = &This->IAudioSessionManager2_iface;
......
dlls/winealsa.drv/winealsa.drv.spec
View file @ bc10fd3c
......@@ -9,4 +9,4 @@
# MMDevAPI driver functions
@ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs
@ stdcall -private GetAudioEndpoint(ptr ptr long ptr) AUDDRV_GetAudioEndpoint
@ stdcall -private GetAudioSessionManager(long ptr) AUDDRV_GetAudioSessionManager
@ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager
dlls/winecoreaudio.drv/mmdevdrv.c
View file @ bc10fd3c
......@@ -77,7 +77,7 @@ typedef struct _AudioSession {
GUID guid;
struct list clients;
EDataFlow dataflow;
IMMDevice *device;
float master_vol;
UINT32 channel_count;
......@@ -165,7 +165,7 @@ typedef struct _SessionMgr {
LONG ref;
EDataFlow flow;
IMMDevice *device;
} SessionMgr;
static HANDLE g_timer_q;
......@@ -719,18 +719,26 @@ static HRESULT ca_setup_aqueue(AudioDeviceID did, EDataFlow flow,
static void session_init_vols(AudioSession *session, UINT channels)
{
session->channel_vols = HeapAlloc(GetProcessHeap(), 0,
sizeof(float) * channels);
if(!session->channel_vols)
return;
if(session->channel_count < channels){
UINT i;
if(session->channel_vols)
session->channel_vols = HeapReAlloc(GetProcessHeap(), 0,
session->channel_vols, sizeof(float) * channels);
else
session->channel_vols = HeapAlloc(GetProcessHeap(), 0,
sizeof(float) * channels);
if(!session->channel_vols)
return;
session->channel_count = channels;
for(i = session->channel_count; i < channels; ++i)
session->channel_vols[i] = 1.f;
for(; channels > 0; --channels)
session->channel_vols[channels - 1] = 1.f;
session->channel_count = channels;
}
}
static AudioSession *create_session(const GUID *guid, EDataFlow flow,
static AudioSession *create_session(const GUID *guid, IMMDevice *device,
UINT num_channels)
{
AudioSession *ret;
......@@ -741,7 +749,7 @@ static AudioSession *create_session(const GUID *guid, EDataFlow flow,
memcpy(&ret->guid, guid, sizeof(GUID));
ret->dataflow = flow;
ret->device = device;
list_init(&ret->clients);
......@@ -749,8 +757,7 @@ static AudioSession *create_session(const GUID *guid, EDataFlow flow,
InitializeCriticalSection(&ret->lock);
if(num_channels > 0)
session_init_vols(ret, num_channels);
session_init_vols(ret, num_channels);
ret->master_vol = 1.f;
......@@ -760,12 +767,12 @@ static AudioSession *create_session(const GUID *guid, EDataFlow flow,
/* if channels == 0, then this will return or create a session with
* matching dataflow and GUID. otherwise, channels must also match */
static HRESULT get_audio_session(const GUID *sessionguid,
EDataFlow flow, UINT channels, AudioSession **out)
IMMDevice *device, UINT channels, AudioSession **out)
{
AudioSession *session;
if(!sessionguid || IsEqualGUID(sessionguid, &GUID_NULL)){
*out = create_session(&GUID_NULL, flow, channels);
*out = create_session(&GUID_NULL, device, channels);
if(!*out)
return E_OUTOFMEMORY;
......@@ -774,20 +781,16 @@ static HRESULT get_audio_session(const GUID *sessionguid,
*out = NULL;
LIST_FOR_EACH_ENTRY(session, &g_sessions, AudioSession, entry){
if(IsEqualGUID(sessionguid, &session->guid) &&
session->dataflow == flow){
if(session->channel_count > 0){
if(channels > 0 && session->channel_count != channels)
return E_INVALIDARG;
}else if(channels > 0)
session_init_vols(session, channels);
if(session->device == device &&
IsEqualGUID(sessionguid, &session->guid)){
session_init_vols(session, channels);
*out = session;
break;
}
}
if(!*out){
*out = create_session(sessionguid, flow, channels);
*out = create_session(sessionguid, device, channels);
if(!*out)
return E_OUTOFMEMORY;
}
......@@ -914,7 +917,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface,
EnterCriticalSection(&g_sessions_lock);
hr = get_audio_session(sessionguid, This->dataflow, fmt->nChannels,
hr = get_audio_session(sessionguid, This->parent, fmt->nChannels,
&This->session);
if(FAILED(hr)){
LeaveCriticalSection(&g_sessions_lock);
......@@ -2816,7 +2819,7 @@ HRESULT WINAPI AudioSessionManager_GetAudioSessionControl(
TRACE("(%p)->(%s, %x, %p)\n", This, debugstr_guid(session_guid),
flags, out);
hr = get_audio_session(session_guid, This->flow, 0, &session);
hr = get_audio_session(session_guid, This->device, 0, &session);
if(FAILED(hr))
return hr;
......@@ -2843,7 +2846,7 @@ HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume(
TRACE("(%p)->(%s, %x, %p)\n", This, debugstr_guid(session_guid),
flags, out);
hr = get_audio_session(session_guid, This->flow, 0, &session);
hr = get_audio_session(session_guid, This->device, 0, &session);
if(FAILED(hr))
return hr;
......@@ -2914,17 +2917,17 @@ static const IAudioSessionManager2Vtbl AudioSessionManager2_Vtbl =
AudioSessionManager_UnregisterDuckNotification
};
HRESULT WINAPI AUDDRV_GetAudioSessionManager(EDataFlow dataflow,
HRESULT WINAPI AUDDRV_GetAudioSessionManager(IMMDevice *device,
IAudioSessionManager2 **out)
{
SessionMgr *This;
This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SessionMgr));
if(!*out)
if(!This)
return E_OUTOFMEMORY;
This->IAudioSessionManager2_iface.lpVtbl = &AudioSessionManager2_Vtbl;
This->flow = dataflow;
This->device = device;
This->ref = 1;
*out = &This->IAudioSessionManager2_iface;
......
dlls/winecoreaudio.drv/winecoreaudio.drv.spec
View file @ bc10fd3c
......@@ -9,4 +9,4 @@
# MMDevAPI driver functions
@ stdcall -private GetEndpointIDs(long ptr ptr ptr) AUDDRV_GetEndpointIDs
@ stdcall -private GetAudioEndpoint(str long ptr) AUDDRV_GetAudioEndpoint
@ stdcall -private GetAudioSessionManager(long ptr) AUDDRV_GetAudioSessionManager
@ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager
dlls/wineoss.drv/mmdevdrv.c
View file @ bc10fd3c
......@@ -74,7 +74,7 @@ typedef struct _AudioSession {
GUID guid;
struct list clients;
EDataFlow dataflow;
IMMDevice *device;
float master_vol;
UINT32 channel_count;
......@@ -147,7 +147,7 @@ typedef struct _SessionMgr {
LONG ref;
EDataFlow flow;
IMMDevice *device;
} SessionMgr;
static HANDLE g_timer_q;
......@@ -656,18 +656,26 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt,
static void session_init_vols(AudioSession *session, UINT channels)
{
session->channel_vols = HeapAlloc(GetProcessHeap(), 0,
sizeof(float) * channels);
if(!session->channel_vols)
return;
if(session->channel_count < channels){
UINT i;
session->channel_count = channels;
if(session->channel_vols)
session->channel_vols = HeapReAlloc(GetProcessHeap(), 0,
session->channel_vols, sizeof(float) * channels);
else
session->channel_vols = HeapAlloc(GetProcessHeap(), 0,
sizeof(float) * channels);
if(!session->channel_vols)
return;
for(; channels > 0; --channels)
session->channel_vols[channels - 1] = 1.f;
for(i = session->channel_count; i < channels; ++i)
session->channel_vols[i] = 1.f;
session->channel_count = channels;
}
}
static AudioSession *create_session(const GUID *guid, EDataFlow flow,
static AudioSession *create_session(const GUID *guid, IMMDevice *device,
UINT num_channels)
{
AudioSession *ret;
......@@ -678,7 +686,7 @@ static AudioSession *create_session(const GUID *guid, EDataFlow flow,
memcpy(&ret->guid, guid, sizeof(GUID));
ret->dataflow = flow;
ret->device = device;
list_init(&ret->clients);
......@@ -686,8 +694,7 @@ static AudioSession *create_session(const GUID *guid, EDataFlow flow,
InitializeCriticalSection(&ret->lock);
if(num_channels > 0)
session_init_vols(ret, num_channels);
session_init_vols(ret, num_channels);
ret->master_vol = 1.f;
......@@ -697,12 +704,12 @@ static AudioSession *create_session(const GUID *guid, EDataFlow flow,
/* if channels == 0, then this will return or create a session with
* matching dataflow and GUID. otherwise, channels must also match */
static HRESULT get_audio_session(const GUID *sessionguid,
EDataFlow flow, UINT channels, AudioSession **out)
IMMDevice *device, UINT channels, AudioSession **out)
{
AudioSession *session;
if(!sessionguid || IsEqualGUID(sessionguid, &GUID_NULL)){
*out = create_session(&GUID_NULL, flow, channels);
*out = create_session(&GUID_NULL, device, channels);
if(!*out)
return E_OUTOFMEMORY;
......@@ -711,20 +718,16 @@ static HRESULT get_audio_session(const GUID *sessionguid,
*out = NULL;
LIST_FOR_EACH_ENTRY(session, &g_sessions, AudioSession, entry){
if(IsEqualGUID(sessionguid, &session->guid) &&
session->dataflow == flow){
if(session->channel_count > 0){
if(channels > 0 && session->channel_count != channels)
return E_INVALIDARG;
}else if(channels > 0)
session_init_vols(session, channels);
if(session->device == device &&
IsEqualGUID(sessionguid, &session->guid)){
session_init_vols(session, channels);
*out = session;
break;
}
}
if(!*out){
*out = create_session(sessionguid, flow, channels);
*out = create_session(sessionguid, device, channels);
if(!*out)
return E_OUTOFMEMORY;
}
......@@ -829,7 +832,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface,
EnterCriticalSection(&g_sessions_lock);
hr = get_audio_session(sessionguid, This->dataflow, fmt->nChannels,
hr = get_audio_session(sessionguid, This->parent, fmt->nChannels,
&This->session);
if(FAILED(hr)){
LeaveCriticalSection(&g_sessions_lock);
......@@ -2761,7 +2764,7 @@ HRESULT WINAPI AudioSessionManager_GetAudioSessionControl(
TRACE("(%p)->(%s, %x, %p)\n", This, debugstr_guid(session_guid),
flags, out);
hr = get_audio_session(session_guid, This->flow, 0, &session);
hr = get_audio_session(session_guid, This->device, 0, &session);
if(FAILED(hr))
return hr;
......@@ -2788,7 +2791,7 @@ HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume(
TRACE("(%p)->(%s, %x, %p)\n", This, debugstr_guid(session_guid),
flags, out);
hr = get_audio_session(session_guid, This->flow, 0, &session);
hr = get_audio_session(session_guid, This->device, 0, &session);
if(FAILED(hr))
return hr;
......@@ -2859,17 +2862,17 @@ static const IAudioSessionManager2Vtbl AudioSessionManager2_Vtbl =
AudioSessionManager_UnregisterDuckNotification
};
HRESULT WINAPI AUDDRV_GetAudioSessionManager(EDataFlow dataflow,
HRESULT WINAPI AUDDRV_GetAudioSessionManager(IMMDevice *device,
IAudioSessionManager2 **out)
{
SessionMgr *This;
This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SessionMgr));
if(!*out)
if(!This)
return E_OUTOFMEMORY;
This->IAudioSessionManager2_iface.lpVtbl = &AudioSessionManager2_Vtbl;
This->flow = dataflow;
This->device = device;
This->ref = 1;
*out = &This->IAudioSessionManager2_iface;
......
dlls/wineoss.drv/wineoss.drv.spec
View file @ bc10fd3c
......@@ -10,4 +10,4 @@
# MMDevAPI driver functions
@ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs
@ stdcall -private GetAudioEndpoint(ptr ptr long ptr) AUDDRV_GetAudioEndpoint
@ stdcall -private GetAudioSessionManager(long ptr) AUDDRV_GetAudioSessionManager
@ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment