[xiph-commits] r8080 - trunk/oggdsf/src/lib/plugin/axAnxOggPlayer
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Sun Oct 24 02:15:22 PDT 2004
Author: illiminable
Date: 2004-10-24 02:15:22 -0700 (Sun, 24 Oct 2004)
New Revision: 8080
Modified:
trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/ControlDialog.h
trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.cpp
trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.h
trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj
trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer_i.c
trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayeridl.h
trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/stdafx.h
Log:
* Fixed some linking problems.
Modified: trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/ControlDialog.h
===================================================================
--- trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/ControlDialog.h 2004-10-24 08:25:04 UTC (rev 8079)
+++ trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/ControlDialog.h 2004-10-24 09:15:22 UTC (rev 8080)
@@ -1,5 +1,5 @@
#pragma once
-
+#include "DSPlayer.h"
#include <fstream>
using namespace std;
// CControlDialog dialog
@@ -19,6 +19,7 @@
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
IWebBrowser2* mBrowser;
fstream debugLog;
+ DSPlayer mPlayer;
DECLARE_MESSAGE_MAP()
public:
afx_msg void OnBnClickedButton1();
Modified: trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.cpp
===================================================================
--- trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.cpp 2004-10-24 08:25:04 UTC (rev 8079)
+++ trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.cpp 2004-10-24 09:15:22 UTC (rev 8080)
@@ -49,7 +49,26 @@
//mCMMLProxy = new CMMLCallbackProxy; //Need to delete this !
debugLog.open("G:\\logs\\DSPlayer.log", ios_base::out);
+
+ //Something about the way the activeX control links won't let us do the normal
+ // DEFINE_GUID macro... so this is manually assigning it to a memeber variable so it links.
+ Y_IID_ICMMLAppControl.Data1 = 0x6188ad0c;
+ Y_IID_ICMMLAppControl.Data2 = 0x62cb;
+ Y_IID_ICMMLAppControl.Data3 = 0x4658;
+ Y_IID_ICMMLAppControl.Data4[0] = 0xa1;
+ Y_IID_ICMMLAppControl.Data4[1] = 0x4e;
+ Y_IID_ICMMLAppControl.Data4[2] = 0xcd;
+ Y_IID_ICMMLAppControl.Data4[3] = 0x23;
+ Y_IID_ICMMLAppControl.Data4[4] = 0xcf;
+ Y_IID_ICMMLAppControl.Data4[5] = 0x84;
+ Y_IID_ICMMLAppControl.Data4[6] = 0xec;
+ Y_IID_ICMMLAppControl.Data4[7] = 0x31;
+
}
+// // {6188AD0C-62CB-4658-A14E-CD23CF84EC31}
+//DEFINE_GUID(Y_IID_ICMMLAppControl,
+//0x6188ad0c, 0x62cb, 0x4658, 0xa1, 0x4e, 0xcd, 0x23, 0xcf, 0x84, 0xec, 0x31);
+//}
bool DSPlayer::checkEvents() {
const DWORD TIMEOUT_WAIT = 0; //Wait this many ms for handle
@@ -131,7 +150,17 @@
debugLog<<"After graph release>.."<<endl;
//TODO::: Release everything !
}
+wstring DSPlayer::toWStr(string inString) {
+ wstring retVal;
+ //LPCWSTR retPtr = new wchar_t[retVal.length() + 1];
+ for (std::string::const_iterator i = inString.begin(); i != inString.end(); i++) {
+ retVal.append(1, *i);
+ }
+
+
+ return retVal;
+}
bool DSPlayer::loadFile(string inFileName) {
//Debugging only
@@ -144,7 +173,7 @@
debugLog<<"File = "<<inFileName<<endl;
- wstring locWFileName = StringHelper::toWStr(inFileName);
+ wstring locWFileName = toWStr(inFileName);
@@ -211,7 +240,7 @@
if (locCMMLFilter != NULL) {
ICMMLAppControl* locCMMLAppControl = NULL;
- locHR = locCMMLFilter->QueryInterface(X_IID_ICMMLAppControl, (void**)&locCMMLAppControl);
+ locHR = locCMMLFilter->QueryInterface(Y_IID_ICMMLAppControl, (void**)&locCMMLAppControl);
if (locCMMLAppControl != NULL) {
mCMMLAppControl = locCMMLAppControl;
Modified: trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.h
===================================================================
--- trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.h 2004-10-24 08:25:04 UTC (rev 8079)
+++ trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/DSPlayer.h 2004-10-24 09:15:22 UTC (rev 8080)
@@ -4,18 +4,22 @@
#include <uuids.h>
#include <dshow.h>
+//
#include <d3d9.h>
#include <vmr9.h>
+
+
#include <string>
#include "ICMMLCallbacks.h"
#include "ICMMLAppControl.h"
#include "libCMMLTags.h"
#include "IMediaEventNotification.h"
-#include "StringHelper.h"
+
+
#include <fstream>
#include <string>
@@ -23,16 +27,14 @@
using namespace std;
-// {6188AD0C-62CB-4658-A14E-CD23CF84EC31}
-DEFINE_GUID(X_IID_ICMMLAppControl,
-0x6188ad0c, 0x62cb, 0x4658, 0xa1, 0x4e, 0xcd, 0x23, 0xcf, 0x84, 0xec, 0x31);
+
class DSPlayer
{
public:
-
+
DSPlayer(void);
~DSPlayer(void);
- //static const GUID X_IID_ICMMLAppControl = {0x6188ad0c, 0x62cb, 0x4658, {0xa1, 0x4e, 0xcd, 0x23, 0xcf, 0x84, 0xec, 0x31};
+
bool loadFile(string inFileName);
bool play();
@@ -69,7 +71,9 @@
bool mIsLoaded;
bool isFileAnnodex(string inFilename);
+ wstring toWStr(string inString);
+ GUID Y_IID_ICMMLAppControl;
fstream debugLog;
};
Modified: trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj
===================================================================
--- trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj 2004-10-24 08:25:04 UTC (rev 8079)
+++ trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer.vcproj 2004-10-24 09:15:22 UTC (rev 8080)
@@ -29,13 +29,16 @@
UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="4"
+ CallingConvention="2"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="strmiids.lib"
OutputFile="$(OutDir)/axAnxOggPlayer.ocx"
LinkIncremental="2"
+ AdditionalLibraryDirectories="C:\DXSDK\Lib"
ModuleDefinitionFile=".\axAnxOggPlayer.def"
GenerateDebugInformation="TRUE"
SubSystem="2"
@@ -87,11 +90,13 @@
UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ CallingConvention="2"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="strmiids.lib"
OutputFile="$(OutDir)/axAnxOggPlayer.ocx"
LinkIncremental="1"
ModuleDefinitionFile=".\axAnxOggPlayer.def"
Modified: trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer_i.c
===================================================================
--- trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer_i.c 2004-10-24 08:25:04 UTC (rev 8079)
+++ trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayer_i.c 2004-10-24 09:15:22 UTC (rev 8080)
@@ -6,7 +6,7 @@
/* File created by MIDL compiler version 6.00.0361 */
-/* at Sun Oct 24 15:14:10 2004
+/* at Sun Oct 24 17:40:06 2004
*/
/* Compiler settings for .\axAnxOggPlayer.idl:
Oicf, W1, Zp8, env=Win32 (32b run)
Modified: trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayeridl.h
===================================================================
--- trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayeridl.h 2004-10-24 08:25:04 UTC (rev 8079)
+++ trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/axAnxOggPlayeridl.h 2004-10-24 09:15:22 UTC (rev 8080)
@@ -4,7 +4,7 @@
/* File created by MIDL compiler version 6.00.0361 */
-/* at Sun Oct 24 15:14:10 2004
+/* at Sun Oct 24 17:40:06 2004
*/
/* Compiler settings for .\axAnxOggPlayer.idl:
Oicf, W1, Zp8, env=Win32 (32b run)
Modified: trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/stdafx.h 2004-10-24 08:25:04 UTC (rev 8079)
+++ trunk/oggdsf/src/lib/plugin/axAnxOggPlayer/stdafx.h 2004-10-24 09:15:22 UTC (rev 8080)
@@ -41,3 +41,4 @@
#include <afxdao.h> // MFC DAO database classes
#include <afxwin.h>
+
More information about the commits
mailing list