ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

quartz: Make removing filters work slightly better.

This commit is contained in:
Maarten Lankhorst 2008-06-26 10:59:10 -07:00 committed by Alexandre Julliard
parent 50b98a2946
commit 46f4c4b4d8
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/quartz/filtergraph.c
View File

@ -279,7 +279,8 @@ static ULONG WINAPI FilterGraphInner_AddRef(IUnknown * iface) {
return ref; return ref;
} }
static ULONG WINAPI FilterGraphInner_Release(IUnknown * iface) { static ULONG WINAPI FilterGraphInner_Release(IUnknown * iface)
{
ICOM_THIS_MULTI(IFilterGraphImpl, IInner_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IInner_vtbl, iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
@ -289,12 +290,13 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown * iface) {
int i; int i;
IMediaControl_Stop((IMediaControl*)&(This->IMediaControl_vtbl)); IMediaControl_Stop((IMediaControl*)&(This->IMediaControl_vtbl));
if (This->refClock)
IReferenceClock_Release(This->refClock);
while (This->nFilters) while (This->nFilters)
IFilterGraph2_RemoveFilter((IFilterGraph2*)This, This->ppFiltersInGraph[0]); IFilterGraph2_RemoveFilter((IFilterGraph2*)This, This->ppFiltersInGraph[0]);
if (This->refClock)
IReferenceClock_Release(This->refClock);
for (i = 0; i < This->nItfCacheEntries; i++) for (i = 0; i < This->nItfCacheEntries; i++)
{ {
if (This->ItfCacheEntries[i].iface) if (This->ItfCacheEntries[i].iface)
@ -439,8 +441,8 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface,
return hr; return hr;
} }
static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilter *pFilter)
IBaseFilter *pFilter) { {
ICOM_THIS_MULTI(IFilterGraphImpl, IFilterGraph2_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IFilterGraph2_vtbl, iface);
int i; int i;
HRESULT hr = E_FAIL; HRESULT hr = E_FAIL;
@ -453,12 +455,21 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface,
{ {
if (This->ppFiltersInGraph[i] == pFilter) if (This->ppFiltersInGraph[i] == pFilter)
{ {
IEnumPins *penumpins; IEnumPins *penumpins = NULL;
IBaseFilter_Stop(pFilter); FILTER_STATE state;
TRACE("Removing filter %s\n", debugstr_w(This->pFilterNames[i]));
IBaseFilter_GetState(pFilter, 0, &state);
if (state == State_Running)
IBaseFilter_Pause(pFilter);
if (state != State_Stopped)
IBaseFilter_Stop(pFilter);
hr = IBaseFilter_EnumPins(pFilter, &penumpins); hr = IBaseFilter_EnumPins(pFilter, &penumpins);
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
IPin *ppin; IPin *ppin;
while(IEnumPins_Next(penumpins, 1, &ppin, NULL) == S_OK) { while(IEnumPins_Next(penumpins, 1, &ppin, NULL) == S_OK)
{
IPin *victim = NULL; IPin *victim = NULL;
HRESULT h; HRESULT h;
IPin_ConnectedTo(ppin, &victim); IPin_ConnectedTo(ppin, &victim);
@ -470,6 +481,10 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface,
{ {
PIN_INFO pinfo; PIN_INFO pinfo;
IPin_QueryPinInfo(victim, &pinfo); IPin_QueryPinInfo(victim, &pinfo);
IBaseFilter_GetState(pinfo.pFilter, 0, &state);
if (state == State_Running)
IBaseFilter_Pause(pinfo.pFilter);
IBaseFilter_Stop(pinfo.pFilter); IBaseFilter_Stop(pinfo.pFilter);
IBaseFilter_Release(pinfo.pFilter); IBaseFilter_Release(pinfo.pFilter);
h = IPin_Disconnect(victim); h = IPin_Disconnect(victim);