Zebediah Figura : qedit/samplegrabber: Use BaseFilterImpl_JoinFilterGraph().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3ee43f85b0d504286958086e3a0ed22885575845
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3ee43f85b0d504286958086e3...

Author: Zebediah Figura 
Date:   Tue Dec  3 22:03:31 2019 -0600

qedit/samplegrabber: Use BaseFilterImpl_JoinFilterGraph().

Manual testing shows that adding or removing the filter does not affect whether
it is in one-shot mode.

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/qedit/samplegrabber.c | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c
index 9dd8c02b23..af05966c14 100644
--- a/dlls/qedit/samplegrabber.c
+++ b/dlls/qedit/samplegrabber.c
@@ -66,11 +66,6 @@ static inline SG_Impl *impl_from_strmbase_filter(struct strmbase_filter *iface)
     return CONTAINING_RECORD(iface, SG_Impl, filter);
 }

-static inline SG_Impl *impl_from_IBaseFilter(IBaseFilter *iface)
-{
-    return CONTAINING_RECORD(iface, SG_Impl, filter.IBaseFilter_iface);
-}
-
 static inline SG_Impl *impl_from_ISampleGrabber(ISampleGrabber *iface)
 {
     return CONTAINING_RECORD(iface, SG_Impl, ISampleGrabber_iface);
@@ -198,22 +193,6 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample)
     }
 }

-/* IBaseFilter */
-static HRESULT WINAPI
-SampleGrabber_IBaseFilter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *graph, LPCWSTR name)
-{
-    SG_Impl *This = impl_from_IBaseFilter(iface);
-
-    TRACE("(%p)->(%p, %s)\n", This, graph, debugstr_w(name));
-
-    BaseFilterImpl_JoinFilterGraph(iface, graph, name);
-    This->oneShot = OneShot_None;
-
-    return S_OK;
-}
-
-/* SampleGrabber implementation of ISampleGrabber interface */
-
 /* IUnknown */
 static HRESULT WINAPI
 SampleGrabber_ISampleGrabber_QueryInterface(ISampleGrabber *iface, REFIID riid, void **ppv)
@@ -525,7 +504,7 @@ static const IBaseFilterVtbl IBaseFilter_VTable =
     BaseFilterImpl_EnumPins,
     BaseFilterImpl_FindPin,
     BaseFilterImpl_QueryFilterInfo,
-    SampleGrabber_IBaseFilter_JoinFilterGraph,
+    BaseFilterImpl_JoinFilterGraph,
     BaseFilterImpl_QueryVendorInfo,
 };