[xiph-commits] r8615 - in trunk/oggdsf: sln/oggdsf_all src/lib/codecs/cmml src/lib/codecs/cmml/libCMMLParseDotNET src/lib/codecs/cmml/libWinCMMLParse src/tests/testVideoImageGrab

illiminable at motherfish-iii.xiph.org illiminable at motherfish-iii.xiph.org
Wed Jan 5 00:13:45 PST 2005


Author: illiminable
Date: 2005-01-05 00:13:44 -0800 (Wed, 05 Jan 2005)
New Revision: 8615

Added:
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/AssemblyInfo.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/CMML_Parser.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/CMML_Parser.h
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/ReadMe.txt
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/Stdafx.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/Stdafx.h
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/app.ico
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/app.rc
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/libCMMLParseDotNET.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/libCMMLParseDotNET.h
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/libCMMLParseDotNET.vcproj
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/resource.h
Modified:
   trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
   trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.h
   trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj
Log:
* .NETify CMML parser.

Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2005-01-05 01:12:42 UTC (rev 8614)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2005-01-05 08:13:44 UTC (rev 8615)
@@ -1139,6 +1139,12 @@
 		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCMMLParseDotNET", "..\..\src\lib\codecs\cmml\libCMMLParseDotNET\libCMMLParseDotNET.vcproj", "{150940C1-A4EF-474D-8703-DF7100ABDA52}"
+	ProjectSection(ProjectDependencies) = postProject
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -2528,6 +2534,26 @@
 		{DCABCE43-DCF2-4F31-85D3-BEA3163B32D2}.Release_SSE.Build.0 = Release|Win32
 		{DCABCE43-DCF2-4F31-85D3-BEA3163B32D2}.Release_SSE2.ActiveCfg = Release|Win32
 		{DCABCE43-DCF2-4F31-85D3-BEA3163B32D2}.Release_SSE2.Build.0 = Release|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Debug.ActiveCfg = Debug|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Debug.Build.0 = Debug|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Debug Unicode.ActiveCfg = Debug|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Debug Unicode.Build.0 = Debug|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Debug__cdecl.ActiveCfg = Debug|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Debug__cdecl.Build.0 = Debug|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.MakeFile.ActiveCfg = Release|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.MakeFile.Build.0 = Release|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Release.ActiveCfg = Release|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Release.Build.0 = Release|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Release Unicode.ActiveCfg = Release|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Release Unicode.Build.0 = Release|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Release__cdecl.ActiveCfg = Release|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Release__cdecl.Build.0 = Release|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Release_NoDotNET.Build.0 = Release|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Release_SSE.ActiveCfg = Release|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Release_SSE.Build.0 = Release|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Release_SSE2.ActiveCfg = Release|Win32
+		{150940C1-A4EF-474D-8703-DF7100ABDA52}.Release_SSE2.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionItems) = postSolution
 	EndGlobalSection

Added: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/AssemblyInfo.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/AssemblyInfo.cpp	2005-01-05 01:12:42 UTC (rev 8614)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/AssemblyInfo.cpp	2005-01-05 08:13:44 UTC (rev 8615)
@@ -0,0 +1,58 @@
+#include "stdafx.h"
+
+using namespace System::Reflection;
+using namespace System::Runtime::CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly:AssemblyTitleAttribute("")];
+[assembly:AssemblyDescriptionAttribute("")];
+[assembly:AssemblyConfigurationAttribute("")];
+[assembly:AssemblyCompanyAttribute("")];
+[assembly:AssemblyProductAttribute("")];
+[assembly:AssemblyCopyrightAttribute("")];
+[assembly:AssemblyTrademarkAttribute("")];
+[assembly:AssemblyCultureAttribute("")];		
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the value or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly:AssemblyVersionAttribute("1.0.*")];
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//        When specifying the KeyFile, the location of the KeyFile should be
+//        relative to the project directory.
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly:AssemblyDelaySignAttribute(false)];
+[assembly:AssemblyKeyFileAttribute("")];
+[assembly:AssemblyKeyNameAttribute("")];
+

Added: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/CMML_Parser.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/CMML_Parser.cpp	2005-01-05 01:12:42 UTC (rev 8614)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/CMML_Parser.cpp	2005-01-05 08:13:44 UTC (rev 8615)
@@ -0,0 +1,29 @@
+#include "StdAfx.h"
+#include ".\cmml_parser.h"
+#using <mscorlib.dll>
+
+
+namespace illiminable {
+namespace libCMMLParserDotNET {
+CMML_Parser::CMML_Parser(void)
+{
+}
+
+CMML_Parser::~CMML_Parser(void)
+{
+}
+
+bool CMML_Parser::parseDocFromFile(String* inFileName, CMMLDoc* outCMMLDoc) 
+{
+	wchar_t* locWS = Wrappers::netStrToWStr(inFileName);
+	wstring locFileName = locWS;
+
+	bool retVal = mCMMLParser->parseDocFromFile(locFileName, outCMMLDoc->getMe());
+	
+	Wrappers::releaseWStr(locWS);
+	
+	return retVal;
+}
+
+}	//End libCMMLParserDotNNET
+}	//End illiminable
\ No newline at end of file

Added: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/CMML_Parser.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/CMML_Parser.h	2005-01-05 01:12:42 UTC (rev 8614)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/CMML_Parser.h	2005-01-05 08:13:44 UTC (rev 8615)
@@ -0,0 +1,44 @@
+#pragma once
+
+#pragma unmanaged
+#include <string>
+#include "libWinCMMLParse/CMMLParser.h"
+using namespace std;
+
+#pragma managed
+//#include "libCMMLTagsDotNET/CMMLDoc.h"
+using namespace illiminable::libCMMLTagsDotNET;
+using namespace illiminable::libiWrapper;
+using namespace System;
+
+namespace illiminable {
+namespace libCMMLParserDotNET {
+
+	
+
+//Original interface
+//==============
+	//bool parseClipTag(wstring inClipText, C_ClipTag* outClip);
+	//bool parseHeadTag(wstring inHeadText, C_HeadTag* outHead);
+	//bool parseCMMLRootTag(wstring inCMMLRootText, C_CMMLRootTag* outCMMLRoot);
+
+	//bool parseDocFromFile(wstring inFilename, C_CMMLDoc* outCMMLDoc);
+
+public __gc class CMML_Parser
+{
+public:
+	CMML_Parser(void);
+	~CMML_Parser(void);
+
+	//bool parseClipTag(wstring inClipText, C_ClipTag* outClip);
+	//bool parseHeadTag(wstring inHeadText, C_HeadTag* outHead);
+	//bool parseCMMLRootTag(wstring inCMMLRootText, CMMLRootTag* outCMMLRoot);
+
+	bool parseDocFromFile(String* inFileName, CMMLDoc* outCMMLDoc);
+protected:
+	CMMLParser* mCMMLParser;
+};
+
+
+}	//End libCMMLParserDotNNET
+}	//End illiminable
\ No newline at end of file

Added: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/ReadMe.txt
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/ReadMe.txt	2005-01-05 01:12:42 UTC (rev 8614)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/ReadMe.txt	2005-01-05 08:13:44 UTC (rev 8615)
@@ -0,0 +1,31 @@
+========================================================================
+    DYNAMIC LINK LIBRARY : libCMMLParseDotNET Project Overview
+========================================================================
+
+AppWizard has created this libCMMLParseDotNET DLL for you.  
+
+This file contains a summary of what you will find in each of the files that
+make up your libCMMLParseDotNET application.
+
+libCMMLParseDotNET.vcproj
+    This is the main project file for VC++ projects generated using an Application Wizard. 
+    It contains information about the version of Visual C++ that generated the file, and 
+    information about the platforms, configurations, and project features selected with the
+    Application Wizard.
+
+libCMMLParseDotNET.cpp
+    This is the main DLL source file.
+
+libCMMLParseDotNET.h
+    This file contains a class declaration.
+
+AssemblyInfo.cpp
+	Contains custom attributes for modifying assembly metadata.
+
+/////////////////////////////////////////////////////////////////////////////
+Other notes:
+
+AppWizard uses "TODO:" to indicate parts of the source code you
+should add to or customize.
+
+/////////////////////////////////////////////////////////////////////////////

Added: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/Stdafx.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/Stdafx.cpp	2005-01-05 01:12:42 UTC (rev 8614)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/Stdafx.cpp	2005-01-05 08:13:44 UTC (rev 8615)
@@ -0,0 +1,5 @@
+// stdafx.cpp : source file that includes just the standard includes
+// libCMMLParseDotNET.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"

Added: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/Stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/Stdafx.h	2005-01-05 01:12:42 UTC (rev 8614)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/Stdafx.h	2005-01-05 08:13:44 UTC (rev 8615)
@@ -0,0 +1,6 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently,
+// but are changed infrequently
+
+#pragma once
+

Added: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/app.ico
===================================================================
(Binary files differ)


Property changes on: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/app.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/app.rc
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/app.rc	2005-01-05 01:12:42 UTC (rev 8614)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/app.rc	2005-01-05 08:13:44 UTC (rev 8615)
@@ -0,0 +1,52 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon placed first or with lowest ID value becomes application icon
+
+LANGUAGE 9, 1
+#pragma code_page(1252)
+1           ICON         "app.ico"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE  
+BEGIN
+    "resource.h\0"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

Added: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/libCMMLParseDotNET.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/libCMMLParseDotNET.cpp	2005-01-05 01:12:42 UTC (rev 8614)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/libCMMLParseDotNET.cpp	2005-01-05 08:13:44 UTC (rev 8615)
@@ -0,0 +1,6 @@
+// This is the main DLL file.
+
+#include "stdafx.h"
+
+#include "libCMMLParseDotNET.h"
+

Added: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/libCMMLParseDotNET.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/libCMMLParseDotNET.h	2005-01-05 01:12:42 UTC (rev 8614)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/libCMMLParseDotNET.h	2005-01-05 08:13:44 UTC (rev 8615)
@@ -0,0 +1,8 @@
+// libCMMLParseDotNET.h
+
+#pragma once
+
+#pragma managed
+
+using namespace System;
+

Added: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/libCMMLParseDotNET.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/libCMMLParseDotNET.vcproj	2005-01-05 01:12:42 UTC (rev 8614)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/libCMMLParseDotNET.vcproj	2005-01-05 08:13:44 UTC (rev 8615)
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="libCMMLParseDotNET"
+	ProjectGUID="{150940C1-A4EF-474D-8703-DF7100ABDA52}"
+	RootNamespace="libCMMLParseDotNET"
+	Keyword="ManagedCProj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			ManagedExtensions="TRUE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="WIN32;_DEBUG"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CallingConvention="2"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/noentry"
+				AdditionalDependencies="nochkclr.obj mscoree.lib"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				AssemblyDebug="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			ManagedExtensions="TRUE">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="WIN32;NDEBUG"
+				MinimalRebuild="FALSE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CallingConvention="2"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/noentry"
+				AdditionalDependencies="nochkclr.obj mscoree.lib"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}"
+			Name="libCMMLTagsDotNET"/>
+		<ProjectReference
+			ReferencedProjectIdentifier="{FCFE729D-EADE-45BA-9506-7E82A46403F7}"
+			Name="libiWrapper"/>
+		<AssemblyReference
+			RelativePath="mscorlib.dll"/>
+		<AssemblyReference
+			RelativePath="System.dll"/>
+		<AssemblyReference
+			RelativePath="System.Data.dll"/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\AssemblyInfo.cpp">
+			</File>
+			<File
+				RelativePath=".\CMML_Parser.cpp">
+			</File>
+			<File
+				RelativePath=".\libCMMLParseDotNET.cpp">
+			</File>
+			<File
+				RelativePath=".\Stdafx.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\CMML_Parser.h">
+			</File>
+			<File
+				RelativePath=".\libCMMLParseDotNET.h">
+			</File>
+			<File
+				RelativePath=".\resource.h">
+			</File>
+			<File
+				RelativePath=".\Stdafx.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			<File
+				RelativePath=".\app.ico">
+			</File>
+			<File
+				RelativePath=".\app.rc">
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\ReadMe.txt">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Added: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/resource.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/resource.h	2005-01-05 01:12:42 UTC (rev 8614)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/resource.h	2005-01-05 08:13:44 UTC (rev 8615)
@@ -0,0 +1,3 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by app.rc

Modified: trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.h	2005-01-05 01:12:42 UTC (rev 8614)
+++ trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.h	2005-01-05 08:13:44 UTC (rev 8615)
@@ -74,7 +74,7 @@
 	bool parseCMMLRootTag(MSXML2::IXMLDOMNode* inCMMLRootNode, C_CMMLRootTag* outCMMLRoot);
 
 	
-	bool CMMLParser::parseDocFromFile(wstring inFilename, C_CMMLDoc* outCMMLDoc);
+	bool parseDocFromFile(wstring inFilename, C_CMMLDoc* outCMMLDoc);
 
 
 

Modified: trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj
===================================================================
--- trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj	2005-01-05 01:12:42 UTC (rev 8614)
+++ trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj	2005-01-05 08:13:44 UTC (rev 8615)
@@ -86,7 +86,7 @@
                 />
                 <Reference
                     Name = "System.XML"
-                    AssemblyName = "System.XML"
+                    AssemblyName = "System.Xml"
                     HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
                 />
                 <Reference
@@ -104,6 +104,7 @@
                 />
                 <File
                     RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File



More information about the commits mailing list