Module: wine Branch: master Commit: b15c4113c0ad887cf7a85ddd405dda5ba4e130e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15c4113c0ad887cf7a85ddd40...
Author: Christian Costa titan.costa@gmail.com Date: Mon Mar 12 19:54:48 2012 +0100
amstream: Remove duplicate GraphBuilder member.
---
dlls/amstream/amstream.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 72ace4a..82dcd24 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -36,7 +36,6 @@ typedef struct { LONG ref; IGraphBuilder* pFilterGraph; IPin* ipin; - IGraphBuilder* GraphBuilder; ULONG nbStreams; IMediaStream** pStreams; STREAM_TYPE StreamType; @@ -313,10 +312,6 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac return ret; }
- ret = IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)&This->GraphBuilder); - if (ret != S_OK) - goto end; - ret = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IFileSourceFilter, (void**)&SourceFilter); if(ret != S_OK) return ret; @@ -357,7 +352,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac goto end; }
- ret = IGraphBuilder_AddSourceFilter(This->GraphBuilder, pszFileName, pszFileName, &BaseFilter); + ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter);
end: IBaseFilter_Release(BaseFilter); @@ -383,7 +378,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Render(IAMMultiMediaStream* iface, if(dwFlags != AMMSF_NOCLOCK) return E_INVALIDARG;
- return IGraphBuilder_Render(This->GraphBuilder, This->ipin); + return IGraphBuilder_Render(This->pFilterGraph, This->ipin); }
static const IAMMultiMediaStreamVtbl AM_Vtbl =