Ignore:
Timestamp:
Oct 17, 2014, 8:23:55 AM (8 years ago)
Author:
roman
Message:

Fixed small issues with runtime property pages; Added named options for FG helper; Implemented AutomaticInitialCheck? and ProcessIdentifier? options in FG list

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/DirectShowSpy/RunPropertyBag.h

    r333 r348  
    284284                static CString GetPropertyBagText(IRunPropertyBagAware* pRunPropertyBagAware, ISpy* pSpy = NULL)
    285285                {
    286                         if(pSpy)
    287                         {
    288                                 CComVariantArray vValue;
    289                                 __C(pSpy->ReadRunPropertyBag(pRunPropertyBagAware, ATL_VARIANT_TRUE, &vValue));
    290                                 return GetPropertyBagText(vValue);
    291                         }
    292286                        if(!pRunPropertyBagAware)
    293287                                return _T("");
     
    296290                static CString GetPropertyBagText(IUnknown* pBaseFilterUnknown, ISpy* pSpy = NULL)
    297291                {
     292                        CComQIPtr<ISpy> pEffectiveSpy = pSpy;
     293                        if(!pEffectiveSpy && pBaseFilterUnknown)
     294                                pEffectiveSpy = _FilterGraphHelper::GetFilterGraph(CComQIPtr<IBaseFilter>(pBaseFilterUnknown));
     295                        if(pEffectiveSpy && pBaseFilterUnknown)
     296                        {
     297                                CComVariantArray vValue;
     298                                __C(pEffectiveSpy->ReadRunPropertyBag(pBaseFilterUnknown, ATL_VARIANT_TRUE, &vValue));
     299                                return GetPropertyBagText(vValue);
     300                        }
    298301                        const CComQIPtr<IRunPropertyBagAware> pRunPropertyBagAware = pBaseFilterUnknown;
    299                         CComQIPtr<ISpy> pEffectiveSpy = pSpy;
    300                         if(!pEffectiveSpy && pRunPropertyBagAware)
    301                                 pEffectiveSpy = _FilterGraphHelper::GetFilterGraph(CComQIPtr<IBaseFilter>(pBaseFilterUnknown));
    302302                        return GetPropertyBagText(pRunPropertyBagAware, pEffectiveSpy);
    303303                }
Note: See TracChangeset for help on using the changeset viewer.