[xiph-commits] r9722 - trunk/oggdsf/src/lib/core/directshow/dsfOggMux

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2005-08-09 15:42:10 -0700 (Tue, 09 Aug 2005)
New Revision: 9722

Modified:
   trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h
   trunk/oggdsf/src/lib/core/directshow/dsfOggMux/dsfOggMux.vcproj
Log:
* get rid of invalid references to properies pages.

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp	2005-08-09 02:55:38 UTC (rev 9721)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp	2005-08-09 22:42:10 UTC (rev 9722)
@@ -43,14 +43,15 @@
 	    OggMuxFilter::CreateInstance,	// Method to create an instance of MyComponent
         NULL,									// Initialization function
         NULL									// Set-up information (for filters)
-    },
-    { 
-		L"Ogg Muxer Properties",						// Name
-	    &CLSID_PropsOggMux,            // CLSID
-	    PropsOggMux::CreateInstance,	// Method to create an instance of MyComponent
-        NULL,									// Initialization function
-        NULL									// Set-up information (for filters)
     }
+	//,
+ //   { 
+	//	L"Ogg Muxer Properties",						// Name
+	//    &CLSID_PropsOggMux,            // CLSID
+	//    PropsOggMux::CreateInstance,	// Method to create an instance of MyComponent
+ //       NULL,									// Initialization function
+ //       NULL									// Set-up information (for filters)
+ //   }
 
 };
 
@@ -98,11 +99,12 @@
 		*ppv = (IOggMuxSettings*)this;
 		((IUnknown*)*ppv)->AddRef();
 		return NOERROR;
-	} else if (riid == IID_ISpecifyPropertyPages) {
-		*ppv = (ISpecifyPropertyPages*)this;
-		((IUnknown*)*ppv)->AddRef();
-		return NOERROR;
 	}
+	//else if (riid == IID_ISpecifyPropertyPages) {
+	//	*ppv = (ISpecifyPropertyPages*)this;
+	//	((IUnknown*)*ppv)->AddRef();
+	//	return NOERROR;
+	//}
 
 	return CBaseFilter::NonDelegatingQueryInterface(riid, ppv); 
 }
@@ -427,23 +429,23 @@
 }
 
 //SpecifyPropertyPages Implementation
-STDMETHODIMP OggMuxFilter::GetPages(CAUUID* outPropPages) {
-	if (outPropPages == NULL) return E_POINTER;
+//STDMETHODIMP OggMuxFilter::GetPages(CAUUID* outPropPages) {
+//	if (outPropPages == NULL) return E_POINTER;
+//
+//	const int NUM_PROP_PAGES = 1;
+//    outPropPages->cElems = NUM_PROP_PAGES;
+//    outPropPages->pElems = (GUID*)(CoTaskMemAlloc(sizeof(GUID) * NUM_PROP_PAGES));
+//    if (outPropPages->pElems == NULL) 
+//    {
+//        return E_OUTOFMEMORY;
+//    }
+//
+//	outPropPages->pElems[0] = CLSID_PropsOggMux;
+//    
+//    return S_OK;
+//
+//}
 
-	const int NUM_PROP_PAGES = 1;
-    outPropPages->cElems = NUM_PROP_PAGES;
-    outPropPages->pElems = (GUID*)(CoTaskMemAlloc(sizeof(GUID) * NUM_PROP_PAGES));
-    if (outPropPages->pElems == NULL) 
-    {
-        return E_OUTOFMEMORY;
-    }
-
-	outPropPages->pElems[0] = CLSID_PropsOggMux;
-    
-    return S_OK;
-
-}
-
 STDMETHODIMP_(bool) OggMuxFilter::setMaxPacketsPerPage(unsigned long inMaxPacketsPerPage) {
 	for (std::vector<OggMuxInputPin*>::iterator locPinIterator = mInputPins.begin();
 		 locPinIterator != mInputPins.end();

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h	2005-08-09 02:55:38 UTC (rev 9721)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h	2005-08-09 22:42:10 UTC (rev 9722)
@@ -56,7 +56,7 @@
 	,	public INotifyComplete
 	,	public IOggMuxProgress
 	,	public IOggMuxSettings
-	,	public ISpecifyPropertyPages
+	//,	public ISpecifyPropertyPages
 {
 public:
 	OggMuxFilter(void);
@@ -141,7 +141,7 @@
 	STDMETHODIMP_(bool) setMaxPacketsPerPage(unsigned long inMaxPacketsPerPage);
 
 	//SpecifyPropertyPages Implementation
-	STDMETHODIMP OggMuxFilter::GetPages(CAUUID* outPropPages);
+	//STDMETHODIMP OggMuxFilter::GetPages(CAUUID* outPropPages);
 
 protected:
 

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/dsfOggMux.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/dsfOggMux.vcproj	2005-08-09 02:55:38 UTC (rev 9721)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/dsfOggMux.vcproj	2005-08-09 22:42:10 UTC (rev 9722)
@@ -283,6 +283,30 @@
 			</File>
 			<File
 				RelativePath=".\PropsOggMux.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release_SSE2|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release_SSE|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="stdafx.cpp">
@@ -343,9 +367,6 @@
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-			<File
-				RelativePath=".\dsfOggMux.rc">
-			</File>
 		</Filter>
 		<File
 			RelativePath="ReadMe.txt">