amstream: Remove duplicate GraphBuilder member.
This commit is contained in:
parent
8b5f6bf3f4
commit
b15c4113c0
|
@ -36,7 +36,6 @@ typedef struct {
|
||||||
LONG ref;
|
LONG ref;
|
||||||
IGraphBuilder* pFilterGraph;
|
IGraphBuilder* pFilterGraph;
|
||||||
IPin* ipin;
|
IPin* ipin;
|
||||||
IGraphBuilder* GraphBuilder;
|
|
||||||
ULONG nbStreams;
|
ULONG nbStreams;
|
||||||
IMediaStream** pStreams;
|
IMediaStream** pStreams;
|
||||||
STREAM_TYPE StreamType;
|
STREAM_TYPE StreamType;
|
||||||
|
@ -313,10 +312,6 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac
|
||||||
return ret;
|
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);
|
ret = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IFileSourceFilter, (void**)&SourceFilter);
|
||||||
if(ret != S_OK)
|
if(ret != S_OK)
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -357,7 +352,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = IGraphBuilder_AddSourceFilter(This->GraphBuilder, pszFileName, pszFileName, &BaseFilter);
|
ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter);
|
||||||
|
|
||||||
end:
|
end:
|
||||||
IBaseFilter_Release(BaseFilter);
|
IBaseFilter_Release(BaseFilter);
|
||||||
|
@ -383,7 +378,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Render(IAMMultiMediaStream* iface,
|
||||||
if(dwFlags != AMMSF_NOCLOCK)
|
if(dwFlags != AMMSF_NOCLOCK)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
return IGraphBuilder_Render(This->GraphBuilder, This->ipin);
|
return IGraphBuilder_Render(This->pFilterGraph, This->ipin);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const IAMMultiMediaStreamVtbl AM_Vtbl =
|
static const IAMMultiMediaStreamVtbl AM_Vtbl =
|
||||||
|
|
Loading…
Reference in New Issue