Zebediah Figura : strmbase: Remove some no longer used callbacks.
Alexandre Julliard
julliard at winehq.org
Wed Jan 29 16:24:06 CST 2020
Module: wine
Branch: master
Commit: 38291846f306dd5c6bd8bc5ed6a1634022d1dd2b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=38291846f306dd5c6bd8bc5ed6a1634022d1dd2b
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Jan 28 23:36:52 2020 -0600
strmbase: Remove some no longer used callbacks.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/strmbase/transform.c | 28 ++++++----------------------
include/wine/strmbase.h | 4 ----
2 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c
index 74be6b107e..2c75156c1b 100644
--- a/dlls/strmbase/transform.c
+++ b/dlls/strmbase/transform.c
@@ -38,14 +38,6 @@ static inline TransformFilter *impl_from_sink_IPin(IPin *iface)
static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *pmt)
{
- TransformFilter *pTransform = impl_from_sink_IPin(&iface->IPin_iface);
-
- TRACE("%p\n", iface);
-
- if (pTransform->pFuncsTable->pfnCheckInputType)
- return pTransform->pFuncsTable->pfnCheckInputType(pTransform, pmt);
- /* Assume OK if there's no query method (the connection will fail if
- needed) */
return S_OK;
}
@@ -239,13 +231,9 @@ static HRESULT sink_eos(struct strmbase_sink *iface)
static HRESULT sink_begin_flush(struct strmbase_sink *iface)
{
TransformFilter *filter = impl_from_sink_IPin(&iface->pin.IPin_iface);
- HRESULT hr = S_OK;
-
- if (filter->pFuncsTable->pfnBeginFlush)
- hr = filter->pFuncsTable->pfnBeginFlush(filter);
- if (SUCCEEDED(hr) && filter->source.pin.peer)
- hr = IPin_BeginFlush(filter->source.pin.peer);
- return hr;
+ if (filter->source.pin.peer)
+ return IPin_BeginFlush(filter->source.pin.peer);
+ return S_OK;
}
static HRESULT sink_end_flush(struct strmbase_sink *iface)
@@ -264,13 +252,9 @@ static HRESULT sink_new_segment(struct strmbase_sink *iface,
REFERENCE_TIME start, REFERENCE_TIME stop, double rate)
{
TransformFilter *filter = impl_from_sink_IPin(&iface->pin.IPin_iface);
- HRESULT hr = S_OK;
-
- if (filter->pFuncsTable->pfnNewSegment)
- hr = filter->pFuncsTable->pfnNewSegment(filter, start, stop, rate);
- if (SUCCEEDED(hr) && filter->source.pin.peer)
- hr = IPin_NewSegment(filter->source.pin.peer, start, stop, rate);
- return hr;
+ if (filter->source.pin.peer)
+ return IPin_NewSegment(filter->source.pin.peer, start, stop, rate);
+ return S_OK;
}
static const struct strmbase_sink_ops sink_ops =
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index 48d7638ae1..abb04a8384 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -195,13 +195,9 @@ typedef struct TransformFilterFuncTable {
TransformFilter_StartStreaming pfnStartStreaming;
TransformFilter_Receive pfnReceive;
TransformFilter_StopStreaming pfnStopStreaming;
- TransformFilter_CheckInputType pfnCheckInputType;
HRESULT (*transform_connect_sink)(TransformFilter *filter, const AM_MEDIA_TYPE *mt);
TransformFilter_BreakConnect pfnBreakConnect;
- TransformFilter_EndOfStream pfnEndOfStream;
- TransformFilter_BeginFlush pfnBeginFlush;
TransformFilter_EndFlush pfnEndFlush;
- TransformFilter_NewSegment pfnNewSegment;
TransformFilter_Notify pfnNotify;
} TransformFilterFuncTable;
More information about the wine-cvs
mailing list