[xiph-commits] r8077 - in trunk/oggdsf: docs src/lib/plugin/axAnxOggPlayer

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-10-24 00:41:46 -0700 (Sun, 24 Oct 2004)
New Revision: 8077

Added:
   trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.cpp
   trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.h
Modified:
   trunk/oggdsf/docs/activeX.txt
   trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj
Log:
* Translate the .NET directshow library headers to native code, so it can be used in the control

Modified: trunk/oggdsf/docs/activeX.txt
===================================================================
--- trunk/oggdsf/docs/activeX.txt	2004-10-24 07:29:23 UTC (rev 8076)
+++ trunk/oggdsf/docs/activeX.txt	2004-10-24 07:41:46 UTC (rev 8077)
@@ -89,6 +89,9 @@
 
 Repeat procedure for adding play button to add pause and stop button.
 
+Add a generic class class called DSPlayer... steal all the internal code from DSPlay (the .NET player library for DNPlay)
+Change all the managed code parts back to unmanaged equivalents.
 
 
 
+

Added: trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.cpp
===================================================================
--- trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.cpp	2004-10-24 07:29:23 UTC (rev 8076)
+++ trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.cpp	2004-10-24 07:41:46 UTC (rev 8077)
@@ -0,0 +1,10 @@
+#include "StdAfx.h"
+#include ".\dsplayer.h"
+
+DSPlayer::DSPlayer(void)
+{
+}
+
+DSPlayer::~DSPlayer(void)
+{
+}

Added: trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.h
===================================================================
--- trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.h	2004-10-24 07:29:23 UTC (rev 8076)
+++ trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.h	2004-10-24 07:41:46 UTC (rev 8077)
@@ -0,0 +1,65 @@
+#pragma once
+
+
+#include <uuids.h>
+#include <dshow.h>
+
+#include <d3d9.h>
+#include <vmr9.h>
+#include <string>
+
+#include "ICMMLCallbacks.h"
+#include "ICMMLAppControl.h"
+#include "libCMMLTags.h"
+
+
+
+#include <fstream>
+
+
+
+using namespace std;
+class DSPlayer
+{
+public:
+	DSPlayer(void);
+	~DSPlayer(void);
+
+		bool loadFile(string inFileName);
+		bool play();
+		bool pause();
+		bool stop();
+		__int64 seek(__int64 inTime);
+		__int64 seekStart();
+		__int64 queryPosition();
+
+		bool isLoaded();
+		__int64 fileSize();
+		__int64 fileDuration();
+	
+
+		//bool setMediaEventCallback(IDNMediaEvent* inMediaEventCallback);
+		//IDNMediaEvent* getMediaEventCallback();
+
+		//bool setCMMLCallbacks(IDNCMMLCallbacks* inCMMLCallbacks);
+		bool checkEvents();
+
+		void releaseInterfaces();
+	protected:
+		//static wstring toWStr(std::string inString);
+		IGraphBuilder* mGraphBuilder;
+		IMediaControl* mMediaControl;
+		IMediaSeeking* mMediaSeeking;
+		IMediaEvent* mMediaEvent;
+		ICMMLAppControl* mCMMLAppControl;
+
+		HANDLE mEventHandle;
+
+		bool mIsLoaded;
+		bool isFileAnnodex(string inFilename);
+
+
+		fstream debugLog;
+};
+
+

Modified: trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj
===================================================================
--- trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj	2004-10-24 07:29:23 UTC (rev 8076)
+++ trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj	2004-10-24 07:41:46 UTC (rev 8077)
@@ -20,6 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml\libCMMLTags;C:\DXSDK\Include"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -79,6 +80,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\codecs\cmml\dsfCMMLDecoder;..\..\codecs\cmml\libCMMLTags;C:\DXSDK\Include"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="TRUE"
@@ -156,6 +158,9 @@
 				RelativePath=".\ControlDialog.cpp">
 			</File>
 			<File
+				RelativePath=".\DSPlayer.cpp">
+			</File>
+			<File
 				RelativePath=".\stdafx.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -188,6 +193,9 @@
 				RelativePath=".\ControlDialog.h">
 			</File>
 			<File
+				RelativePath=".\DSPlayer.h">
+			</File>
+			<File
 				RelativePath=".\Resource.h">
 			</File>
 			<File