[xiph-commits] r10237 - branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2005-10-22 00:36:49 -0700 (Sat, 22 Oct 2005)
New Revision: 10237

Modified:
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.cpp
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/stdafx.h
Log:
* Fix build settings
* Include directshow files

Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.cpp	2005-10-22 07:32:15 UTC (rev 10236)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPageSourceFilter.cpp	2005-10-22 07:36:49 UTC (rev 10237)
@@ -37,8 +37,8 @@
 {
     { 
 		L"OggDemuxFilter",						// Name
-	    &CLSID_OggDemuxSourceFilter,            // CLSID
-	    OggDemuxSourceFilter::CreateInstance,	// Method to create an instance of MyComponent
+	    &CLSID_OggDemuxPageSourceFilter,            // CLSID
+	    OggDemuxPageSourceFilter::CreateInstance,	// Method to create an instance of MyComponent
         NULL,									// Initialization function
         NULL									// Set-up information (for filters)
     }

Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj	2005-10-22 07:32:15 UTC (rev 10236)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj	2005-10-22 07:36:49 UTC (rev 10237)
@@ -19,6 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;C:\DXSDK\Include;..\..\ogg;..\..\..\helper"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -67,6 +68,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;C:\DXSDK\Include;..\..\ogg;..\..\..\helper"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="3"

Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/stdafx.h
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/stdafx.h	2005-10-22 07:32:15 UTC (rev 10236)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/stdafx.h	2005-10-22 07:36:49 UTC (rev 10237)
@@ -51,7 +51,10 @@
 #else
 #define LIBOOOGG_API __declspec(dllimport)
 #endif
-
+#include <Dshow.h>
+#include <Initguid.h>
+#include <Qnetwork.h>
+#include "oggdllstuff.h"
 #include "OggDemuxPageSourceFilter.h"
 #include "ds_guids.h"
 #include "OggDemuxPageSourcePin.h"