From: Elizabeth Figura zfigura@codeweavers.com
--- dlls/quartz/dsoundrender.c | 7 ------- dlls/quartz/tests/dsoundrender.c | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index bf750d417ac..7ee4a680b5b 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -353,7 +353,6 @@ static HRESULT render_sample(struct dsound_render *filter, IMediaSample *pSample static HRESULT WINAPI dsound_render_sink_Receive(struct strmbase_sink *iface, IMediaSample *sample) { struct dsound_render *filter = impl_from_strmbase_pin(&iface->pin); - REFERENCE_TIME start, stop; HRESULT hr;
TRACE("filter %p, sample %p.\n", filter, sample); @@ -367,9 +366,6 @@ static HRESULT WINAPI dsound_render_sink_Receive(struct strmbase_sink *iface, IM if (FAILED(hr = configure_buffer(filter, sample))) return hr;
- if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) - strmbase_passthrough_update_time(&filter->passthrough, start); - if (filter->filter.state == State_Paused) SetEvent(filter->state_event);
@@ -469,7 +465,6 @@ static HRESULT dsound_render_sink_eos(struct strmbase_sink *iface) (LONG_PTR)&filter->filter.IBaseFilter_iface); IMediaEventSink_Release(event_sink); } - strmbase_passthrough_eos(&filter->passthrough); SetEvent(filter->state_event);
handle_eos(filter); @@ -496,7 +491,6 @@ static HRESULT dsound_render_sink_end_flush(struct strmbase_sink *iface) EnterCriticalSection(&filter->filter.stream_cs);
filter->eos = FALSE; - strmbase_passthrough_invalidate_time(&filter->passthrough); ResetEvent(filter->flush_event);
if (filter->dsbuffer) @@ -638,7 +632,6 @@ static HRESULT dsound_render_cleanup_stream(struct strmbase_filter *iface) { struct dsound_render *filter = impl_from_strmbase_filter(iface);
- strmbase_passthrough_invalidate_time(&filter->passthrough); SetEvent(filter->state_event); SetEvent(filter->flush_event);
diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index c1952d0dd89..1864c0fcf01 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -738,7 +738,7 @@ static HRESULT WINAPI testseek_GetCurrentPosition(IMediaSeeking *iface, LONGLONG static HRESULT WINAPI testseek_ConvertTimeFormat(IMediaSeeking *iface, LONGLONG *target, const GUID *target_format, LONGLONG source, const GUID *source_format) { - todo_wine ok(0, "Unexpected call.\n"); + ok(0, "Unexpected call.\n"); return E_NOTIMPL; }
@@ -980,7 +980,7 @@ static void test_filter_state(IMemInputPin *input, IMediaSeeking *seeking, IMedi ok(hr == S_OK, "Got hr %#lx.\n", hr);
hr = IMediaSeeking_GetCurrentPosition(seeking, &time); - todo_wine ok(hr == 0xdeadbeef, "Got hr %#lx.\n", hr); + ok(hr == 0xdeadbeef, "Got hr %#lx.\n", hr);
hr = IMediaControl_GetState(control, 0, &state); ok(hr == S_OK, "Got hr %#lx.\n", hr);