revert r1783

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1785 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 99 insertions, 129 deletions

diff --git a/src/DSUtil/DSMPropertyBag.h b/src/DSUtil/DSMPropertyBag.h
index 4b32c975a..0eeb11751 100644
--- a/src/DSUtil/DSMPropertyBag.h
+++ b/src/DSUtil/DSMPropertyBag.h
@@ -5,199 +5,169 @@
 // IDSMPropertyBag

 

 [uuid("232FD5D2-4954-41E7-BF9B-09E1257B1A95")]

-interface IDSMPropertyBag :

-public IPropertyBag2

+interface IDSMPropertyBag : public IPropertyBag2

 {

-    STDMETHOD(SetProperty)(LPCWSTR key, LPCWSTR value) = 0;

-    STDMETHOD(SetProperty)(LPCWSTR key, VARIANT* var) = 0;

-    STDMETHOD(GetProperty)(LPCWSTR key, BSTR* value) = 0;

-    STDMETHOD(DelAllProperties)() = 0;

-    STDMETHOD(DelProperty)(LPCWSTR key) = 0;

+	STDMETHOD(SetProperty) (LPCWSTR key, LPCWSTR value) = 0;

+	STDMETHOD(SetProperty) (LPCWSTR key, VARIANT* var) = 0;

+	STDMETHOD(GetProperty) (LPCWSTR key, BSTR* value) = 0;

+	STDMETHOD(DelAllProperties) () = 0;

+	STDMETHOD(DelProperty) (LPCWSTR key) = 0;

 };

 

 class IDSMPropertyBagImpl : public ATL::CSimpleMap<CStringW, CStringW>, public IDSMPropertyBag, public IPropertyBag

 {

-    BOOL Add(const CStringW& key, const CStringW& val)

-    {

-        return __super::Add(key, val);

-    }

-    BOOL SetAt(const CStringW& key, const CStringW& val)

-    {

-        return __super::SetAt(key, val);

-    }

+	BOOL Add(const CStringW& key, const CStringW& val) {return __super::Add(key, val);}

+	BOOL SetAt(const CStringW& key, const CStringW& val) {return __super::SetAt(key, val);}

 

 public:

-    IDSMPropertyBagImpl();

-    virtual ~IDSMPropertyBagImpl();

+	IDSMPropertyBagImpl();

+	virtual ~IDSMPropertyBagImpl();

 

-    // IPropertyBag

+	// IPropertyBag

 

     STDMETHODIMP Read(LPCOLESTR pszPropName, VARIANT* pVar, IErrorLog* pErrorLog);

     STDMETHODIMP Write(LPCOLESTR pszPropName, VARIANT* pVar);

 

-    // IPropertyBag2

+	// IPropertyBag2

 

-    STDMETHODIMP Read(ULONG cProperties, PROPBAG2* pPropBag, IErrorLog* pErrLog, VARIANT* pvarValue, HRESULT* phrError);

-    STDMETHODIMP Write(ULONG cProperties, PROPBAG2* pPropBag, VARIANT* pvarValue);

-    STDMETHODIMP CountProperties(ULONG* pcProperties);

-    STDMETHODIMP GetPropertyInfo(ULONG iProperty, ULONG cProperties, PROPBAG2* pPropBag, ULONG* pcProperties);

-    STDMETHODIMP LoadObject(LPCOLESTR pstrName, DWORD dwHint, IUnknown* pUnkObject, IErrorLog* pErrLog);

+	STDMETHODIMP Read(ULONG cProperties, PROPBAG2* pPropBag, IErrorLog* pErrLog, VARIANT* pvarValue, HRESULT* phrError);

+	STDMETHODIMP Write(ULONG cProperties, PROPBAG2* pPropBag, VARIANT* pvarValue);

+	STDMETHODIMP CountProperties(ULONG* pcProperties);

+	STDMETHODIMP GetPropertyInfo(ULONG iProperty, ULONG cProperties, PROPBAG2* pPropBag, ULONG* pcProperties);

+	STDMETHODIMP LoadObject(LPCOLESTR pstrName, DWORD dwHint, IUnknown* pUnkObject, IErrorLog* pErrLog);

 

-    // IDSMPropertyBag

+	// IDSMPropertyBag

 

-    STDMETHODIMP SetProperty(LPCWSTR key, LPCWSTR value);

-    STDMETHODIMP SetProperty(LPCWSTR key, VARIANT* var);

-    STDMETHODIMP GetProperty(LPCWSTR key, BSTR* value);

-    STDMETHODIMP DelAllProperties();

-    STDMETHODIMP DelProperty(LPCWSTR key);

+	STDMETHODIMP SetProperty(LPCWSTR key, LPCWSTR value);

+	STDMETHODIMP SetProperty(LPCWSTR key, VARIANT* var);

+	STDMETHODIMP GetProperty(LPCWSTR key, BSTR* value);

+	STDMETHODIMP DelAllProperties();

+	STDMETHODIMP DelProperty(LPCWSTR key);

 };

 

 // IDSMResourceBag

 

 [uuid("EBAFBCBE-BDE0-489A-9789-05D5692E3A93")]

-interface IDSMResourceBag :

-public IUnknown

+interface IDSMResourceBag : public IUnknown

 {

-    STDMETHOD_(DWORD, ResGetCount)() = 0;

-    STDMETHOD(ResGet)(DWORD iIndex, BSTR* ppName, BSTR* ppDesc, BSTR* ppMime, BYTE** ppData, DWORD* pDataLen, DWORD_PTR* pTag) = 0;

-    STDMETHOD(ResSet)(DWORD iIndex, LPCWSTR pName, LPCWSTR pDesc, LPCWSTR pMime, BYTE* pData, DWORD len, DWORD_PTR tag) = 0;

-    STDMETHOD(ResAppend)(LPCWSTR pName, LPCWSTR pDesc, LPCWSTR pMime, BYTE* pData, DWORD len, DWORD_PTR tag) = 0;

-    STDMETHOD(ResRemoveAt)(DWORD iIndex) = 0;

-    STDMETHOD(ResRemoveAll)(DWORD_PTR tag) = 0;

+	STDMETHOD_(DWORD, ResGetCount) () = 0;

+	STDMETHOD(ResGet) (DWORD iIndex, BSTR* ppName, BSTR* ppDesc, BSTR* ppMime, BYTE** ppData, DWORD* pDataLen, DWORD_PTR* pTag) = 0;

+	STDMETHOD(ResSet) (DWORD iIndex, LPCWSTR pName, LPCWSTR pDesc, LPCWSTR pMime, BYTE* pData, DWORD len, DWORD_PTR tag) = 0;

+	STDMETHOD(ResAppend) (LPCWSTR pName, LPCWSTR pDesc, LPCWSTR pMime, BYTE* pData, DWORD len, DWORD_PTR tag) = 0;

+	STDMETHOD(ResRemoveAt) (DWORD iIndex) = 0;

+	STDMETHOD(ResRemoveAll) (DWORD_PTR tag) = 0;

 };

 

 class CDSMResource

 {

 public:

-    DWORD_PTR tag;

-    CStringW name, desc, mime;

-    CAtlArray<BYTE> data;

-    CDSMResource();

-    CDSMResource(const CDSMResource& r);

-    CDSMResource(LPCWSTR name, LPCWSTR desc, LPCWSTR mime, BYTE* pData, int len, DWORD_PTR tag = 0);

-    virtual ~CDSMResource();

-    CDSMResource& operator = (const CDSMResource& r);

-

-    // global access to all resources

-    static CCritSec m_csResources;

-    static CAtlMap<DWORD, CDSMResource*> m_resources;

+	DWORD_PTR tag;

+	CStringW name, desc, mime;

+	CAtlArray<BYTE> data;

+	CDSMResource();

+	CDSMResource(const CDSMResource& r);

+	CDSMResource(LPCWSTR name, LPCWSTR desc, LPCWSTR mime, BYTE* pData, int len, DWORD_PTR tag = 0);

+	virtual ~CDSMResource();

+	CDSMResource& operator = (const CDSMResource& r);

+

+	// global access to all resources

+	static CCritSec m_csResources;

+	static CAtlMap<DWORD, CDSMResource*> m_resources;

 };

 

 class IDSMResourceBagImpl : public IDSMResourceBag

 {

 protected:

-    CAtlArray<CDSMResource> m_resources;

+	CAtlArray<CDSMResource> m_resources;

 

 public:

-    IDSMResourceBagImpl();

+	IDSMResourceBagImpl();

 

-    void operator += (const CDSMResource& r)

-    {

-        m_resources.Add(r);

-    }

+	void operator += (const CDSMResource& r) {m_resources.Add(r);}

 

-    // IDSMResourceBag

+	// IDSMResourceBag

 

-    STDMETHODIMP_(DWORD) ResGetCount();

-    STDMETHODIMP ResGet(DWORD iIndex, BSTR* ppName, BSTR* ppDesc, BSTR* ppMime, BYTE** ppData, DWORD* pDataLen, DWORD_PTR* pTag = NULL);

-    STDMETHODIMP ResSet(DWORD iIndex, LPCWSTR pName, LPCWSTR pDesc, LPCWSTR pMime, BYTE* pData, DWORD len, DWORD_PTR tag = 0);

-    STDMETHODIMP ResAppend(LPCWSTR pName, LPCWSTR pDesc, LPCWSTR pMime, BYTE* pData, DWORD len, DWORD_PTR tag = 0);

-    STDMETHODIMP ResRemoveAt(DWORD iIndex);

-    STDMETHODIMP ResRemoveAll(DWORD_PTR tag = 0);

+	STDMETHODIMP_(DWORD) ResGetCount();

+	STDMETHODIMP ResGet(DWORD iIndex, BSTR* ppName, BSTR* ppDesc, BSTR* ppMime, BYTE** ppData, DWORD* pDataLen, DWORD_PTR* pTag = NULL);

+	STDMETHODIMP ResSet(DWORD iIndex, LPCWSTR pName, LPCWSTR pDesc, LPCWSTR pMime, BYTE* pData, DWORD len, DWORD_PTR tag = 0);

+	STDMETHODIMP ResAppend(LPCWSTR pName, LPCWSTR pDesc, LPCWSTR pMime, BYTE* pData, DWORD len, DWORD_PTR tag = 0);

+	STDMETHODIMP ResRemoveAt(DWORD iIndex);

+	STDMETHODIMP ResRemoveAll(DWORD_PTR tag = 0);

 };

 

 // IDSMChapterBag

 

 [uuid("2D0EBE73-BA82-4E90-859B-C7C48ED3650F")]

-interface IDSMChapterBag :

-public IUnknown

+interface IDSMChapterBag : public IUnknown

 {

-    STDMETHOD_(DWORD, ChapGetCount)() = 0;

-    STDMETHOD(ChapGet)(DWORD iIndex, REFERENCE_TIME* prt, BSTR* ppName) = 0;

-    STDMETHOD(ChapSet)(DWORD iIndex, REFERENCE_TIME rt, LPCWSTR pName) = 0;

-    STDMETHOD(ChapAppend)(REFERENCE_TIME rt, LPCWSTR pName) = 0;

-    STDMETHOD(ChapRemoveAt)(DWORD iIndex) = 0;

-    STDMETHOD(ChapRemoveAll)() = 0;

-    STDMETHOD_(long, ChapLookup)(REFERENCE_TIME* prt, BSTR* ppName) = 0;

-    STDMETHOD(ChapSort)() = 0;

+	STDMETHOD_(DWORD, ChapGetCount) () = 0;

+	STDMETHOD(ChapGet) (DWORD iIndex, REFERENCE_TIME* prt, BSTR* ppName) = 0;

+	STDMETHOD(ChapSet) (DWORD iIndex, REFERENCE_TIME rt, LPCWSTR pName) = 0;

+	STDMETHOD(ChapAppend) (REFERENCE_TIME rt, LPCWSTR pName) = 0;

+	STDMETHOD(ChapRemoveAt) (DWORD iIndex) = 0;

+	STDMETHOD(ChapRemoveAll) () = 0;

+	STDMETHOD_(long, ChapLookup) (REFERENCE_TIME* prt, BSTR* ppName) = 0;

+	STDMETHOD(ChapSort) () = 0;

 };

 

 class CDSMChapter

 {

-    static int counter;

-    int order;

+	static int counter;

+	int order;

 

 public:

-    REFERENCE_TIME rt;

-    CStringW name;

-    CDSMChapter();

-    CDSMChapter(REFERENCE_TIME rt, LPCWSTR name);

-    CDSMChapter& operator = (const CDSMChapter& c);

-    static int Compare(const void* a, const void* b);

+	REFERENCE_TIME rt;

+	CStringW name;

+	CDSMChapter();

+	CDSMChapter(REFERENCE_TIME rt, LPCWSTR name);

+	CDSMChapter& operator = (const CDSMChapter& c);

+	static int Compare(const void* a, const void* b);

 };

 

 class IDSMChapterBagImpl : public IDSMChapterBag

 {

 protected:

-    CAtlArray<CDSMChapter> m_chapters;

-    bool m_fSorted;

+	CAtlArray<CDSMChapter> m_chapters;

+	bool m_fSorted;

 

 public:

-    IDSMChapterBagImpl();

-

-    void operator += (const CDSMChapter& c)

-    {

-        m_chapters.Add(c);

-        m_fSorted = false;

-    }

-

-    // IDSMChapterBag

-

-    STDMETHODIMP_(DWORD) ChapGetCount();

-    STDMETHODIMP ChapGet(DWORD iIndex, REFERENCE_TIME* prt, BSTR* ppName = NULL);

-    STDMETHODIMP ChapSet(DWORD iIndex, REFERENCE_TIME rt, LPCWSTR pName);

-    STDMETHODIMP ChapAppend(REFERENCE_TIME rt, LPCWSTR pName);

-    STDMETHODIMP ChapRemoveAt(DWORD iIndex);

-    STDMETHODIMP ChapRemoveAll();

-    STDMETHODIMP_(long) ChapLookup(REFERENCE_TIME* prt, BSTR* ppName = NULL);

-    STDMETHODIMP ChapSort();

+	IDSMChapterBagImpl();

+

+	void operator += (const CDSMChapter& c) {m_chapters.Add(c); m_fSorted = false;}

+

+	// IDSMChapterBag

+

+	STDMETHODIMP_(DWORD) ChapGetCount();

+	STDMETHODIMP ChapGet(DWORD iIndex, REFERENCE_TIME* prt, BSTR* ppName = NULL);

+	STDMETHODIMP ChapSet(DWORD iIndex, REFERENCE_TIME rt, LPCWSTR pName);

+	STDMETHODIMP ChapAppend(REFERENCE_TIME rt, LPCWSTR pName);

+	STDMETHODIMP ChapRemoveAt(DWORD iIndex);

+	STDMETHODIMP ChapRemoveAll();

+	STDMETHODIMP_(long) ChapLookup(REFERENCE_TIME* prt, BSTR* ppName = NULL);

+	STDMETHODIMP ChapSort();

 };

 

 class CDSMChapterBag : public CUnknown, public IDSMChapterBagImpl

 {

 public:

-    CDSMChapterBag(LPUNKNOWN pUnk, HRESULT* phr);

+	CDSMChapterBag(LPUNKNOWN pUnk, HRESULT* phr);

 

-    DECLARE_IUNKNOWN;

-    STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

+	DECLARE_IUNKNOWN;

+	STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

 };

 

 template<class T>

 int range_bsearch(const CAtlArray<T>& array, REFERENCE_TIME rt)

 {

-    int i = 0, j = array.GetCount() - 1, ret = -1;

-    if(j >= 0 && rt >= array[j].rt) return j;

-    while(i < j)

-    {

-        int mid = (i + j) >> 1;

-        REFERENCE_TIME midrt = array[mid].rt;

-        if(rt == midrt)

-        {

-            ret = mid;

-            break;

-        }

-        else if(rt < midrt)

-        {

-            ret = -1;

-            if(j == mid) mid--;

-            j = mid;

-        }

-        else if(rt > midrt)

-        {

-            ret = mid;

-            if(i == mid) mid++;

-            i = mid;

-        }

-    }

-    return ret;

+	int i = 0, j = array.GetCount() - 1, ret = -1;

+	if(j >= 0 && rt >= array[j].rt) return j;

+	while(i < j)

+	{

+		int mid = (i + j) >> 1;

+		REFERENCE_TIME midrt = array[mid].rt;

+		if(rt == midrt) {ret = mid; break;}

+		else if(rt < midrt) {ret = -1; if(j == mid) mid--; j = mid;}

+		else if(rt > midrt) {ret = mid; if(i == mid) mid++; i = mid;}

+	}

+	return ret;

 }