Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stephen Kitt
wine
Commits
7698135d
Commit
7698135d
authored
1 year ago
by
Davide Beatrici
Committed by
Alexandre Julliard
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
winecoreaudio: Use mmdevapi's AudioClock.
parent
e50946f0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/winecoreaudio.drv/coreaudio.c
+6
-0
6 additions, 0 deletions
dlls/winecoreaudio.drv/coreaudio.c
dlls/winecoreaudio.drv/mmdevdrv.c
+2
-141
2 additions, 141 deletions
dlls/winecoreaudio.drv/mmdevdrv.c
with
8 additions
and
141 deletions
dlls/winecoreaudio.drv/coreaudio.c
+
6
−
0
View file @
7698135d
...
@@ -1616,6 +1616,12 @@ static NTSTATUS unix_get_position(void *args)
...
@@ -1616,6 +1616,12 @@ static NTSTATUS unix_get_position(void *args)
struct
coreaudio_stream
*
stream
=
handle_get_stream
(
params
->
stream
);
struct
coreaudio_stream
*
stream
=
handle_get_stream
(
params
->
stream
);
LARGE_INTEGER
stamp
,
freq
;
LARGE_INTEGER
stamp
,
freq
;
if
(
params
->
device
)
{
FIXME
(
"Device position reporting not implemented
\n
"
);
params
->
result
=
E_NOTIMPL
;
return
STATUS_SUCCESS
;
}
OSSpinLockLock
(
&
stream
->
lock
);
OSSpinLockLock
(
&
stream
->
lock
);
*
params
->
pos
=
stream
->
written_frames
-
stream
->
held_frames
;
*
params
->
pos
=
stream
->
written_frames
-
stream
->
held_frames
;
...
...
This diff is collapsed.
Click to expand it.
dlls/winecoreaudio.drv/mmdevdrv.c
+
2
−
141
View file @
7698135d
...
@@ -56,8 +56,8 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl;
...
@@ -56,8 +56,8 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl;
static
const
IAudioCaptureClientVtbl
AudioCaptureClient_Vtbl
;
static
const
IAudioCaptureClientVtbl
AudioCaptureClient_Vtbl
;
extern
const
IAudioSessionControl2Vtbl
AudioSessionControl2_Vtbl
;
extern
const
IAudioSessionControl2Vtbl
AudioSessionControl2_Vtbl
;
extern
const
ISimpleAudioVolumeVtbl
SimpleAudioVolume_Vtbl
;
extern
const
ISimpleAudioVolumeVtbl
SimpleAudioVolume_Vtbl
;
static
const
IAudioClockVtbl
AudioClock_Vtbl
;
extern
const
IAudioClockVtbl
AudioClock_Vtbl
;
static
const
IAudioClock2Vtbl
AudioClock2_Vtbl
;
extern
const
IAudioClock2Vtbl
AudioClock2_Vtbl
;
extern
const
IAudioStreamVolumeVtbl
AudioStreamVolume_Vtbl
;
extern
const
IAudioStreamVolumeVtbl
AudioStreamVolume_Vtbl
;
extern
const
IChannelAudioVolumeVtbl
ChannelAudioVolume_Vtbl
;
extern
const
IChannelAudioVolumeVtbl
ChannelAudioVolume_Vtbl
;
...
@@ -100,16 +100,6 @@ static inline ACImpl *impl_from_IAudioCaptureClient(IAudioCaptureClient *iface)
...
@@ -100,16 +100,6 @@ static inline ACImpl *impl_from_IAudioCaptureClient(IAudioCaptureClient *iface)
return
CONTAINING_RECORD
(
iface
,
ACImpl
,
IAudioCaptureClient_iface
);
return
CONTAINING_RECORD
(
iface
,
ACImpl
,
IAudioCaptureClient_iface
);
}
}
static
inline
ACImpl
*
impl_from_IAudioClock
(
IAudioClock
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
ACImpl
,
IAudioClock_iface
);
}
static
inline
ACImpl
*
impl_from_IAudioClock2
(
IAudioClock2
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
ACImpl
,
IAudioClock2_iface
);
}
BOOL
WINAPI
DllMain
(
HINSTANCE
dll
,
DWORD
reason
,
void
*
reserved
)
BOOL
WINAPI
DllMain
(
HINSTANCE
dll
,
DWORD
reason
,
void
*
reserved
)
{
{
switch
(
reason
)
switch
(
reason
)
...
@@ -1292,135 +1282,6 @@ static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl =
...
@@ -1292,135 +1282,6 @@ static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl =
AudioCaptureClient_GetNextPacketSize
AudioCaptureClient_GetNextPacketSize
};
};
static
HRESULT
WINAPI
AudioClock_QueryInterface
(
IAudioClock
*
iface
,
REFIID
riid
,
void
**
ppv
)
{
ACImpl
*
This
=
impl_from_IAudioClock
(
iface
);
TRACE
(
"(%p)->(%s, %p)
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppv
);
if
(
!
ppv
)
return
E_POINTER
;
*
ppv
=
NULL
;
if
(
IsEqualIID
(
riid
,
&
IID_IUnknown
)
||
IsEqualIID
(
riid
,
&
IID_IAudioClock
))
*
ppv
=
iface
;
else
if
(
IsEqualIID
(
riid
,
&
IID_IAudioClock2
))
*
ppv
=
&
This
->
IAudioClock2_iface
;
if
(
*
ppv
){
IUnknown_AddRef
((
IUnknown
*
)
*
ppv
);
return
S_OK
;
}
WARN
(
"Unknown interface %s
\n
"
,
debugstr_guid
(
riid
));
return
E_NOINTERFACE
;
}
static
ULONG
WINAPI
AudioClock_AddRef
(
IAudioClock
*
iface
)
{
ACImpl
*
This
=
impl_from_IAudioClock
(
iface
);
return
IAudioClient3_AddRef
(
&
This
->
IAudioClient3_iface
);
}
static
ULONG
WINAPI
AudioClock_Release
(
IAudioClock
*
iface
)
{
ACImpl
*
This
=
impl_from_IAudioClock
(
iface
);
return
IAudioClient3_Release
(
&
This
->
IAudioClient3_iface
);
}
static
HRESULT
WINAPI
AudioClock_GetFrequency
(
IAudioClock
*
iface
,
UINT64
*
freq
)
{
ACImpl
*
This
=
impl_from_IAudioClock
(
iface
);
struct
get_frequency_params
params
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
freq
);
params
.
stream
=
This
->
stream
;
params
.
freq
=
freq
;
UNIX_CALL
(
get_frequency
,
&
params
);
return
params
.
result
;
}
static
HRESULT
WINAPI
AudioClock_GetPosition
(
IAudioClock
*
iface
,
UINT64
*
pos
,
UINT64
*
qpctime
)
{
ACImpl
*
This
=
impl_from_IAudioClock
(
iface
);
struct
get_position_params
params
;
TRACE
(
"(%p)->(%p, %p)
\n
"
,
This
,
pos
,
qpctime
);
if
(
!
pos
)
return
E_POINTER
;
params
.
stream
=
This
->
stream
;
params
.
pos
=
pos
;
params
.
qpctime
=
qpctime
;
UNIX_CALL
(
get_position
,
&
params
);
return
params
.
result
;
}
static
HRESULT
WINAPI
AudioClock_GetCharacteristics
(
IAudioClock
*
iface
,
DWORD
*
chars
)
{
ACImpl
*
This
=
impl_from_IAudioClock
(
iface
);
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
chars
);
if
(
!
chars
)
return
E_POINTER
;
*
chars
=
AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ
;
return
S_OK
;
}
static
const
IAudioClockVtbl
AudioClock_Vtbl
=
{
AudioClock_QueryInterface
,
AudioClock_AddRef
,
AudioClock_Release
,
AudioClock_GetFrequency
,
AudioClock_GetPosition
,
AudioClock_GetCharacteristics
};
static
HRESULT
WINAPI
AudioClock2_QueryInterface
(
IAudioClock2
*
iface
,
REFIID
riid
,
void
**
ppv
)
{
ACImpl
*
This
=
impl_from_IAudioClock2
(
iface
);
return
IAudioClock_QueryInterface
(
&
This
->
IAudioClock_iface
,
riid
,
ppv
);
}
static
ULONG
WINAPI
AudioClock2_AddRef
(
IAudioClock2
*
iface
)
{
ACImpl
*
This
=
impl_from_IAudioClock2
(
iface
);
return
IAudioClient3_AddRef
(
&
This
->
IAudioClient3_iface
);
}
static
ULONG
WINAPI
AudioClock2_Release
(
IAudioClock2
*
iface
)
{
ACImpl
*
This
=
impl_from_IAudioClock2
(
iface
);
return
IAudioClient3_Release
(
&
This
->
IAudioClient3_iface
);
}
static
HRESULT
WINAPI
AudioClock2_GetDevicePosition
(
IAudioClock2
*
iface
,
UINT64
*
pos
,
UINT64
*
qpctime
)
{
ACImpl
*
This
=
impl_from_IAudioClock2
(
iface
);
FIXME
(
"(%p)->(%p, %p)
\n
"
,
This
,
pos
,
qpctime
);
return
E_NOTIMPL
;
}
static
const
IAudioClock2Vtbl
AudioClock2_Vtbl
=
{
AudioClock2_QueryInterface
,
AudioClock2_AddRef
,
AudioClock2_Release
,
AudioClock2_GetDevicePosition
};
static
AudioSessionWrapper
*
AudioSessionWrapper_Create
(
ACImpl
*
client
)
static
AudioSessionWrapper
*
AudioSessionWrapper_Create
(
ACImpl
*
client
)
{
{
AudioSessionWrapper
*
ret
;
AudioSessionWrapper
*
ret
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment