Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
19b5b68c
Commit
19b5b68c
authored
May 20, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
May 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz/dsoundrender: Don't expose IAMFilterMiscFlags.
This reverts
0196da9b
. Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
75af3556
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
37 deletions
+1
-37
dsoundrender.c
dlls/quartz/dsoundrender.c
+0
-36
dsoundrender.c
dlls/quartz/tests/dsoundrender.c
+1
-1
No files found.
dlls/quartz/dsoundrender.c
View file @
19b5b68c
...
...
@@ -47,7 +47,6 @@ static const IBaseFilterVtbl DSoundRender_Vtbl;
static
const
IBasicAudioVtbl
IBasicAudio_Vtbl
;
static
const
IReferenceClockVtbl
IReferenceClock_Vtbl
;
static
const
IAMDirectSoundVtbl
IAMDirectSound_Vtbl
;
static
const
IAMFilterMiscFlagsVtbl
IAMFilterMiscFlags_Vtbl
;
typedef
struct
DSoundRenderImpl
{
...
...
@@ -56,7 +55,6 @@ typedef struct DSoundRenderImpl
IReferenceClock
IReferenceClock_iface
;
IAMDirectSound
IAMDirectSound_iface
;
IAMFilterMiscFlags
IAMFilterMiscFlags_iface
;
IDirectSound8
*
dsound
;
LPDIRECTSOUNDBUFFER
dsbuffer
;
...
...
@@ -100,11 +98,6 @@ static inline DSoundRenderImpl *impl_from_IAMDirectSound(IAMDirectSound *iface)
return
CONTAINING_RECORD
(
iface
,
DSoundRenderImpl
,
IAMDirectSound_iface
);
}
static
inline
DSoundRenderImpl
*
impl_from_IAMFilterMiscFlags
(
IAMFilterMiscFlags
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
DSoundRenderImpl
,
IAMFilterMiscFlags_iface
);
}
static
REFERENCE_TIME
time_from_pos
(
DSoundRenderImpl
*
This
,
DWORD
pos
)
{
WAVEFORMATEX
*
wfx
=
(
WAVEFORMATEX
*
)
This
->
renderer
.
pInputPin
->
pin
.
mtCurrent
.
pbFormat
;
REFERENCE_TIME
ret
=
10000000
;
...
...
@@ -642,7 +635,6 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv)
BasicAudio_Init
(
&
pDSoundRender
->
basicAudio
,
&
IBasicAudio_Vtbl
);
pDSoundRender
->
IReferenceClock_iface
.
lpVtbl
=
&
IReferenceClock_Vtbl
;
pDSoundRender
->
IAMDirectSound_iface
.
lpVtbl
=
&
IAMDirectSound_Vtbl
;
pDSoundRender
->
IAMFilterMiscFlags_iface
.
lpVtbl
=
&
IAMFilterMiscFlags_Vtbl
;
if
(
SUCCEEDED
(
hr
))
{
...
...
@@ -700,8 +692,6 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri
*
ppv
=
&
This
->
IReferenceClock_iface
;
else
if
(
IsEqualIID
(
riid
,
&
IID_IAMDirectSound
))
*
ppv
=
&
This
->
IAMDirectSound_iface
;
else
if
(
IsEqualIID
(
riid
,
&
IID_IAMFilterMiscFlags
))
*
ppv
=
&
This
->
IAMFilterMiscFlags_iface
;
else
{
HRESULT
hr
;
...
...
@@ -1284,29 +1274,3 @@ static const IAMDirectSoundVtbl IAMDirectSound_Vtbl =
AMDirectSound_SetFocusWindow
,
AMDirectSound_GetFocusWindow
};
static
HRESULT
WINAPI
AMFilterMiscFlags_QueryInterface
(
IAMFilterMiscFlags
*
iface
,
REFIID
riid
,
void
**
ppv
)
{
DSoundRenderImpl
*
This
=
impl_from_IAMFilterMiscFlags
(
iface
);
return
IBaseFilter_QueryInterface
(
&
This
->
renderer
.
filter
.
IBaseFilter_iface
,
riid
,
ppv
);
}
static
ULONG
WINAPI
AMFilterMiscFlags_AddRef
(
IAMFilterMiscFlags
*
iface
)
{
DSoundRenderImpl
*
This
=
impl_from_IAMFilterMiscFlags
(
iface
);
return
IBaseFilter_AddRef
(
&
This
->
renderer
.
filter
.
IBaseFilter_iface
);
}
static
ULONG
WINAPI
AMFilterMiscFlags_Release
(
IAMFilterMiscFlags
*
iface
)
{
DSoundRenderImpl
*
This
=
impl_from_IAMFilterMiscFlags
(
iface
);
return
IBaseFilter_Release
(
&
This
->
renderer
.
filter
.
IBaseFilter_iface
);
}
static
ULONG
WINAPI
AMFilterMiscFlags_GetMiscFlags
(
IAMFilterMiscFlags
*
iface
)
{
return
AM_FILTER_MISC_FLAGS_IS_RENDERER
;
}
static
const
IAMFilterMiscFlagsVtbl
IAMFilterMiscFlags_Vtbl
=
{
AMFilterMiscFlags_QueryInterface
,
AMFilterMiscFlags_AddRef
,
AMFilterMiscFlags_Release
,
AMFilterMiscFlags_GetMiscFlags
};
dlls/quartz/tests/dsoundrender.c
View file @
19b5b68c
...
...
@@ -144,7 +144,7 @@ static void test_interfaces(void)
check_interface
(
filter
,
&
IID_IReferenceClock
,
TRUE
);
check_interface
(
filter
,
&
IID_IUnknown
,
TRUE
);
todo_wine
check_interface
(
filter
,
&
IID_IAMFilterMiscFlags
,
FALSE
);
check_interface
(
filter
,
&
IID_IAMFilterMiscFlags
,
FALSE
);
check_interface
(
filter
,
&
IID_IBasicVideo
,
FALSE
);
check_interface
(
filter
,
&
IID_IDispatch
,
FALSE
);
check_interface
(
filter
,
&
IID_IKsPropertySet
,
FALSE
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment