Changeset 333 for trunk/DirectShowSpy/RunPropertyBag.h

Timestamp:

Oct 5, 2014, 1:57:35 PM (8 years ago)

Author:

roman

Message:

Added filter graph runtime property bag and events through IRegisterServiceProvider

File:

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

trunk/DirectShowSpy/RunPropertyBag.h

@@ -282 +282 @@
         __if_exists(ISpy)
         {
+                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("");
+                        return GetPropertyBagText(ReadRunPropertyBag(pRunPropertyBagAware));
+                }
                 static CString GetPropertyBagText(IUnknown* pBaseFilterUnknown, ISpy* pSpy = NULL)
                 {
@@ -288 +300 @@
                         if(!pEffectiveSpy && pRunPropertyBagAware)
                                 pEffectiveSpy = _FilterGraphHelper::GetFilterGraph(CComQIPtr<IBaseFilter>(pBaseFilterUnknown));
-                        if(pEffectiveSpy)
-                        {
-                                CComVariantArray vValue;
-                                __C(pEffectiveSpy->ReadRunPropertyBag(pBaseFilterUnknown, ATL_VARIANT_TRUE, &vValue));
-                                return GetPropertyBagText(vValue);
-                        }
-                        if(!pRunPropertyBagAware)
-                                return _T("");
-                        return GetPropertyBagText(ReadRunPropertyBag(pRunPropertyBagAware));
+                        return GetPropertyBagText(pRunPropertyBagAware, pEffectiveSpy);
+                }
+                static CString GetPropertyBagText(IFilterGraph* pFilterGraph, ISpy* pSpy = NULL)
+                {
+                        const CComQIPtr<IServiceProvider> pServiceProvider = pFilterGraph;
+                        if(pServiceProvider)
+                        {
+                                CComPtr<IRunPropertyBagAware> pRunPropertyBagAware;
+                                pServiceProvider->QueryService<IRunPropertyBagAware>(__uuidof(IRunPropertyBagAware), &pRunPropertyBagAware);
+                                if(pRunPropertyBagAware)
+                                        return GetPropertyBagText(pRunPropertyBagAware, pSpy);
+                        }
+                        return _T("");
                 }
         }