Module: wine Branch: master Commit: 21ac839711f766098e5b9d5164fe11e9e1a1f0b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ac839711f766098e5b9d516...
Author: Zebediah Figura z.figura12@gmail.com Date: Sat Nov 16 11:20:14 2019 -0600
strmbase: Get rid of the unused segment fields from struct strmbase_pin.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/strmbase/pin.c | 23 +++++++---------------- include/wine/strmbase.h | 2 -- 2 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 2d98168418..9a88246a7f 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -333,16 +333,10 @@ HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, return E_NOTIMPL; /* to tell caller that all input pins connected to all output pins */ }
-HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) +HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { - struct strmbase_pin *This = impl_from_IPin(iface); - TRACE("iface %p, start %s, stop %s, rate %.16e.\n", - iface, debugstr_time(tStart), debugstr_time(tStop), dRate); - - This->tStart = tStart; - This->tStop = tStop; - This->dRate = dRate; + iface, debugstr_time(start), debugstr_time(stop), rate);
return S_OK; } @@ -696,7 +690,6 @@ void strmbase_source_init(struct strmbase_source *pin, const IPinVtbl *vtbl, str { memset(pin, 0, sizeof(*pin)); pin->pin.IPin_iface.lpVtbl = vtbl; - pin->pin.dRate = 1.0; pin->pin.filter = filter; pin->pin.dir = PINDIR_OUTPUT; lstrcpyW(pin->pin.name, name); @@ -843,17 +836,16 @@ static HRESULT deliver_newsegment(IPin *pin, LPVOID data) return IPin_NewSegment(pin, args->tStart, args->tStop, args->rate); }
-HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) +HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { - BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); newsegmentargs args;
TRACE("iface %p, start %s, stop %s, rate %.16e.\n", - iface, debugstr_time(tStart), debugstr_time(tStop), dRate); + iface, debugstr_time(start), debugstr_time(stop), rate);
- args.tStart = This->pin.tStart = tStart; - args.tStop = This->pin.tStop = tStop; - args.rate = This->pin.dRate = dRate; + args.tStart = start; + args.tStop = stop; + args.rate = rate;
return SendFurther( iface, deliver_newsegment, &args, NULL ); } @@ -994,7 +986,6 @@ void strmbase_sink_init(BaseInputPin *pin, const IPinVtbl *vtbl, struct strmbase { memset(pin, 0, sizeof(*pin)); pin->pin.IPin_iface.lpVtbl = vtbl; - pin->pin.dRate = 1.0; pin->pin.filter = filter; pin->pin.dir = PINDIR_INPUT; lstrcpyW(pin->pin.name, name); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 7f9d2cb64d..f87b726d0a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -38,8 +38,6 @@ struct strmbase_pin WCHAR name[128]; IPin *peer; AM_MEDIA_TYPE mtCurrent; - REFERENCE_TIME tStart, tStop; - double dRate;
const struct BasePinFuncTable* pFuncsTable; };