Module: wine Branch: master Commit: 4fe604a2baba629c980ac27b52cca904ff895cba URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fe604a2baba629c980ac27b5...
Author: Zebediah Figura z.figura12@gmail.com Date: Tue Nov 17 16:30:57 2020 -0600
strmbase: Get rid of strmbase_pin_get_media_type().
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/qcap/avico.c | 1 - dlls/qcap/avimux.c | 1 - dlls/quartz/acmwrapper.c | 1 - dlls/quartz/avidec.c | 1 - dlls/quartz/dsoundrender.c | 1 - dlls/strmbase/pin.c | 5 ----- include/wine/strmbase.h | 2 -- 7 files changed, 12 deletions(-)
diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 7b3c1ea3697..01a43c9577d 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -410,7 +410,6 @@ static void sink_disconnect(struct strmbase_sink *iface) static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .base.pin_query_interface = sink_query_interface, .pfnReceive = AVICompressorIn_Receive, .sink_connect = sink_connect, diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 3f4d0f2cd6e..7ae2d673676 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1475,7 +1475,6 @@ static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = sink_query_interface, .base.pin_query_accept = sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = AviMuxIn_Receive, .sink_connect = avi_mux_sink_connect, .sink_disconnect = avi_mux_sink_disconnect, diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 23ad235327a..ada8c474640 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -324,7 +324,6 @@ static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = acm_wrapper_sink_query_interface, .base.pin_query_accept = acm_wrapper_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = acm_wrapper_sink_Receive, .sink_connect = acm_wrapper_sink_connect, .sink_disconnect = acm_wrapper_sink_disconnect, diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index ef232673e56..72f69ef7c5a 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -287,7 +287,6 @@ static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = avi_decompressor_sink_query_interface, .base.pin_query_accept = avi_decompressor_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = avi_decompressor_sink_Receive, .sink_connect = avi_decompressor_sink_connect, .sink_disconnect = avi_decompressor_sink_disconnect, diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 8b914751e15..1c6b28512b0 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -542,7 +542,6 @@ static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = dsound_render_sink_query_interface, .base.pin_query_accept = dsound_render_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = dsound_render_sink_Receive, .sink_connect = dsound_render_sink_connect, .sink_disconnect = dsound_render_sink_disconnect, diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 406fba4165d..c08f04730e7 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -265,11 +265,6 @@ static HRESULT SendFurther(struct strmbase_sink *sink, SendPinFunc func, void *a return hr; }
-HRESULT strmbase_pin_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) -{ - return VFW_S_NO_MORE_ITEMS; -} - static HRESULT WINAPI pin_QueryInterface(IPin *iface, REFIID iid, void **out) { struct strmbase_pin *pin = impl_from_IPin(iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 39c556193ac..5bd181746a1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -106,8 +106,6 @@ struct strmbase_sink_ops };
/* Base Pin */ -HRESULT strmbase_pin_get_media_type(struct strmbase_pin *pin, unsigned int index, AM_MEDIA_TYPE *mt); - HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *pin, IMediaSample **sample, REFERENCE_TIME *start, REFERENCE_TIME *stop, DWORD flags); HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *pin, IMemAllocator **allocator);