marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

quartz/videorenderer: Use the renderer_init_stream() callback. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Zebediah Figura 2019-10-22 18:30:06 -05:00 committed by Alexandre Julliard
parent 675af1eb33
commit 601142bda6
1 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dlls/quartz/videorenderer.c
View File

@ -334,18 +334,11 @@ static void video_renderer_stop_stream(BaseRenderer *iface)
RedrawWindow(This->baseControlWindow.baseWindow.hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE); RedrawWindow(This->baseControlWindow.baseWindow.hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE);
} }
static void video_renderer_start_stream(BaseRenderer *iface) static void video_renderer_init_stream(BaseRenderer *iface)
{ {
VideoRendererImpl *This = impl_from_BaseRenderer(iface); VideoRendererImpl *filter = impl_from_BaseRenderer(iface);
TRACE("(%p)\n", This); VideoRenderer_AutoShowWindow(filter);
if (This->renderer.sink.pin.peer
&& (This->renderer.filter.state == State_Stopped || !This->renderer.sink.end_of_stream))
{
if (This->renderer.filter.state == State_Stopped)
VideoRenderer_AutoShowWindow(This);
}
} }
static RECT WINAPI VideoRenderer_GetDefaultRect(BaseWindow *iface) static RECT WINAPI VideoRenderer_GetDefaultRect(BaseWindow *iface)
@ -377,7 +370,7 @@ static const BaseRendererFuncTable BaseFuncTable =
{ {
.pfnCheckMediaType = VideoRenderer_CheckMediaType, .pfnCheckMediaType = VideoRenderer_CheckMediaType,
.pfnDoRenderSample = VideoRenderer_DoRenderSample, .pfnDoRenderSample = VideoRenderer_DoRenderSample,
.renderer_start_stream = video_renderer_start_stream, .renderer_init_stream = video_renderer_init_stream,
.renderer_stop_stream = video_renderer_stop_stream, .renderer_stop_stream = video_renderer_stop_stream,
.pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow,
.renderer_destroy = video_renderer_destroy, .renderer_destroy = video_renderer_destroy,
@ -550,31 +543,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = {
VideoRenderer_SetTargetRect VideoRenderer_SetTargetRect
}; };
/** IMediaFilter methods **/
static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface)
{
VideoRendererImpl *This = impl_from_IBaseFilter(iface);
TRACE("(%p/%p)->()\n", This, iface);
EnterCriticalSection(&This->renderer.csRenderLock);
if (This->renderer.filter.state != State_Paused)
{
if (This->renderer.filter.state == State_Stopped)
{
This->renderer.sink.end_of_stream = 0;
VideoRenderer_AutoShowWindow(This);
}
ResetEvent(This->renderer.flush_event);
This->renderer.filter.state = State_Paused;
}
LeaveCriticalSection(&This->renderer.csRenderLock);
return S_OK;
}
static const IBaseFilterVtbl VideoRenderer_Vtbl = static const IBaseFilterVtbl VideoRenderer_Vtbl =
{ {
BaseFilterImpl_QueryInterface, BaseFilterImpl_QueryInterface,
@ -582,7 +550,7 @@ static const IBaseFilterVtbl VideoRenderer_Vtbl =
BaseFilterImpl_Release, BaseFilterImpl_Release,
BaseFilterImpl_GetClassID, BaseFilterImpl_GetClassID,
BaseRendererImpl_Stop, BaseRendererImpl_Stop,
VideoRenderer_Pause, BaseRendererImpl_Pause,
BaseRendererImpl_Run, BaseRendererImpl_Run,
BaseRendererImpl_GetState, BaseRendererImpl_GetState,
BaseRendererImpl_SetSyncSource, BaseRendererImpl_SetSyncSource,