Changeset 348 for trunk/DirectShowSpy/RunPropertyBag.h

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:

• trunk/DirectShowSpy/RunPropertyBag.h (modified) (2 diffs)

trunk/DirectShowSpy/RunPropertyBag.h

@@ -284 +284 @@
                 static CString GetPropertyBagText(IRunPropertyBagAware* pRunPropertyBagAware, ISpy* pSpy = NULL)
                 {
-                        if(pSpy)
-                        {
-                                CComVariantArray vValue;
-                                __C(pSpy->ReadRunPropertyBag(pRunPropertyBagAware, ATL_VARIANT_TRUE, &vValue));
-                                return GetPropertyBagText(vValue);
-                        }
                         if(!pRunPropertyBagAware)
                                 return _T("");
@@ -296 +290 @@
                 static CString GetPropertyBagText(IUnknown* pBaseFilterUnknown, ISpy* pSpy = NULL)
                 {
+                        CComQIPtr<ISpy> pEffectiveSpy = pSpy;
+                        if(!pEffectiveSpy && pBaseFilterUnknown)
+                                pEffectiveSpy = _FilterGraphHelper::GetFilterGraph(CComQIPtr<IBaseFilter>(pBaseFilterUnknown));
+                        if(pEffectiveSpy && pBaseFilterUnknown)
+                        {
+                                CComVariantArray vValue;
+                                __C(pEffectiveSpy->ReadRunPropertyBag(pBaseFilterUnknown, ATL_VARIANT_TRUE, &vValue));
+                                return GetPropertyBagText(vValue);
+                        }
                         const CComQIPtr<IRunPropertyBagAware> pRunPropertyBagAware = pBaseFilterUnknown;
-                        CComQIPtr<ISpy> pEffectiveSpy = pSpy;
-                        if(!pEffectiveSpy && pRunPropertyBagAware)
-                                pEffectiveSpy = _FilterGraphHelper::GetFilterGraph(CComQIPtr<IBaseFilter>(pBaseFilterUnknown));
                         return GetPropertyBagText(pRunPropertyBagAware, pEffectiveSpy);
                 }