[xiph-commits] r8283 - in trunk/oggdsf: sln/oggdsf_all src/lib/core/directshow/dsfOggMux

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-11-25 00:22:54 -0800 (Thu, 25 Nov 2004)
New Revision: 8283

Modified:
   trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
   trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h
   trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h
   trunk/oggdsf/src/lib/core/directshow/dsfOggMux/dsfOggMux.vcproj
Log:
* Partially converted muxer to new abstracts

Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-11-25 08:21:14 UTC (rev 8282)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-11-25 08:22:54 UTC (rev 8283)
@@ -56,8 +56,8 @@
 	ProjectSection(ProjectDependencies) = postProject
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
-		{A882A968-3013-4A27-B653-E18CF5C791FE} = {A882A968-3013-4A27-B653-E18CF5C791FE}
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h	2004-11-25 08:21:14 UTC (rev 8282)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h	2004-11-25 08:22:54 UTC (rev 8283)
@@ -32,7 +32,7 @@
 #pragma once
 #include "oggmuxdllstuff.h"
 #include "OggMuxInputPin.h"
-#include "BasicSeekable.h"
+#include "BasicSeekPassThrough.h"
 #include "OggPageInterleaver.h"
 #include "INotifyComplete.h"
 
@@ -49,7 +49,7 @@
 	,	public CBaseFilter
 	,	public IOggCallback
 	,	public IAMFilterMiscFlags
-	,	public BasicSeekable
+	,	public BasicSeekPassThrough
 	,	public INotifyComplete
 {
 public:

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h	2004-11-25 08:21:14 UTC (rev 8282)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h	2004-11-25 08:22:54 UTC (rev 8283)
@@ -33,7 +33,7 @@
 #include "OggMuxFilter.h"
 #include "OggPaginator.h"
 #include "OggMuxStream.h"
-#include "BasicSeekable.h"
+#include "BasicSeekPassThrough.h"
 #include "FLACMetadataSplitter.h"
 #include <time.h>
 #include <fstream>
@@ -44,7 +44,7 @@
 
 class OggMuxInputPin
 	:	public CBaseInputPin
-	,	public BasicSeekable
+	,	public BasicSeekPassThrough
 {
 public:
 	OggMuxInputPin(OggMuxFilter* inParentFilter, CCritSec* inFilterLock, HRESULT* inHR, OggMuxStream* inMuxStream);

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/dsfOggMux.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/dsfOggMux.vcproj	2004-11-25 08:21:14 UTC (rev 8282)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/dsfOggMux.vcproj	2004-11-25 08:22:54 UTC (rev 8283)
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="C:\DXSDK\Include;&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;..\..\ogg\libOOOgg;..\dsfSeeking;..\..\..\helper\libilliCore;..\..\..\codecs\flac\libs\libFLACHelper"
+				AdditionalIncludeDirectories="C:\DXSDK\Include;&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;..\..\ogg\libOOOgg;..\libDirectshowAbstracts;..\..\..\helper\libilliCore;..\..\..\codecs\flac\libs\libFLACHelper"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFOGGMUX_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -80,7 +80,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="3"
-				AdditionalIncludeDirectories="C:\DXSDK\Include;&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;..\..\ogg\libOOOgg;..\dsfSeeking;..\..\..\helper\libilliCore;..\..\..\codecs\flac\libs\libFLACHelper"
+				AdditionalIncludeDirectories="C:\DXSDK\Include;&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;..\..\ogg\libOOOgg;..\libDirectshowAbstracts;..\..\..\helper\libilliCore;..\..\..\codecs\flac\libs\libFLACHelper"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFOGGMUX_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -143,7 +143,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="3"
-				AdditionalIncludeDirectories="C:\DXSDK\Include;&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;..\..\ogg\libOOOgg;..\dsfSeeking;..\..\..\helper\libilliCore;..\..\..\codecs\flac\libs\libFLACHelper"
+				AdditionalIncludeDirectories="C:\DXSDK\Include;&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;..\..\ogg\libOOOgg;..\libDirectshowAbstracts;..\..\..\helper\libilliCore;..\..\..\codecs\flac\libs\libFLACHelper"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFOGGMUX_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -207,7 +207,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="3"
-				AdditionalIncludeDirectories="C:\DXSDK\Include;&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;..\..\ogg\libOOOgg;..\dsfSeeking;..\..\..\helper\libilliCore;..\..\..\codecs\flac\libs\libFLACHelper"
+				AdditionalIncludeDirectories="C:\DXSDK\Include;&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;..\..\ogg\libOOOgg;..\libDirectshowAbstracts;..\..\..\helper\libilliCore;..\..\..\codecs\flac\libs\libFLACHelper"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFOGGMUX_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"