[xiph-commits] r8718 - in trunk/oggdsf: sln/oggdsf_all src/lib/codecs/cmml/dsfCMMLDecoder src/lib/codecs/cmml/dsfCMMLRawSource src/lib/codecs/cmml/libCMMLParseDotNET src/tests/testCMMLParser src/tests/testOOOggChef

illiminable at motherfish-iii.xiph.org illiminable at motherfish-iii.xiph.org
Mon Jan 10 07:04:05 PST 2005 

Author: illiminable
Date: 2005-01-10 07:04:04 -0800 (Mon, 10 Jan 2005)
New Revision: 8718

Modified:
   trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/CMML_Parser.h
   trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.cpp
   trunk/oggdsf/src/tests/testOOOggChef/testOOOggChef.cpp
Log:
* Switch everything over to the platform neutral parser ozone wrote so we don't rely on MSXML any more.

Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2005-01-10 11:56:48 UTC (rev 8717)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2005-01-10 15:04:04 UTC (rev 8718)
@@ -864,7 +864,7 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfCMMLDecoder", "..\..\src\lib\codecs\cmml\dsfCMMLDecoder\dsfCMMLDecoder.vcproj", "{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
 		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
@@ -1149,7 +1149,7 @@
 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}
+		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
 		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 	EndProjectSection
 EndProject
@@ -1161,8 +1161,8 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testOOOggChef", "..\..\src\tests\testOOOggChef\testOOOggChef.vcproj", "{1D3F3520-FD46-4C72-B2AA-A917AB368053}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3D55194E-6732-4A74-A947-EDFF585A0F19} = {3D55194E-6732-4A74-A947-EDFF585A0F19}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
 		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
+		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
 		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h	2005-01-10 11:56:48 UTC (rev 8717)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h	2005-01-10 15:04:04 UTC (rev 8718)
@@ -37,8 +37,8 @@
 #include <string>
 #include <fstream>
 #include <libilliCore/StringHelper.h>
-#include <libWinCMMLParse/libWinCMMLParse.h>
-#include <libWinCMMLParse/CMMLParser.h>
+#include <libCMMLParse/libCMMLParse.h>
+#include <libCMMLParse/CMMLParser.h>
 #include <libCMMLTags/libCMMLTags.h>
 #include "ICMMLAppControl.h"
 using namespace std;

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h	2005-01-10 11:56:48 UTC (rev 8717)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h	2005-01-10 15:04:04 UTC (rev 8718)
@@ -2,8 +2,8 @@
 
 #include <string>
 #include <map>
-#include <libWinCMMLParse/libWinCMMLParse.h>
-#include <libWinCMMLParse/CMMLParser.h>
+#include <libCMMLParse/libCMMLParse.h>
+#include <libCMMLParse/CMMLParser.h>
 #include "CMMLRawSourcePin.h"
 using namespace std;
 

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/CMML_Parser.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/CMML_Parser.h	2005-01-10 11:56:48 UTC (rev 8717)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParseDotNET/CMML_Parser.h	2005-01-10 15:04:04 UTC (rev 8718)
@@ -2,7 +2,7 @@
 
 #pragma unmanaged
 #include <string>
-#include "libWinCMMLParse/CMMLParser.h"
+#include "libCMMLParse/CMMLParser.h"
 using namespace std;
 
 #pragma managed

Modified: trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.cpp
===================================================================
--- trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.cpp	2005-01-10 11:56:48 UTC (rev 8717)
+++ trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.cpp	2005-01-10 15:04:04 UTC (rev 8718)
@@ -194,7 +194,20 @@
 	wstring head_6 = L"<head id=\"headID\" lang=\"en\" dir=\"ltr\" profile=\"some profile\"><base href=\"http://baseurl.com\"/><title lang=\"fr\">Types of fish</title><meta name=\"Producer\" content=\"Joe Ordinary\" scheme=\"some scheme\"/><meta name=\"DC.Author\" content=\"Joe's friend\"></head>";
 	testHeadParse(head_6, false);
 
+	//Valid use many
+	wstring head_7 = L"<head id=\"headID\" lang=\"en\" dir=\"ltr\" profile=\"some profile\"><base id=\"baseID\" href=\"http://baseurl.com\"/><title id=\"titleid\" lang=\"fr\">Types of fish</title><meta name=\"Producer\" content=\"Joe Ordinary\" scheme=\"some scheme\"/><meta name=\"DC.Author\" content=\"Joe's friend\"/></head>";
+	testHeadParse(head_7, true);
 
+	//Empty string
+	wstring head_8 = L"";
+	testHeadParse(head_8, false);
+
+	//Valid use many - but one random unknown tag
+	wstring head_9 = L"<head id=\"headID\" lang=\"en\" dir=\"ltr\" profile=\"some profile\"><red>hello</red><base id=\"baseID\" href=\"http://baseurl.com\"/><title id=\"titleid\" lang=\"fr\">Types of fish</title><meta name=\"Producer\" content=\"Joe Ordinary\" scheme=\"some scheme\"/><meta name=\"DC.Author\" content=\"Joe's friend\"/></head>";
+	testHeadParse(head_9, true);
+
+
+
 	//Valid minimal
 	wstring clip_1 = L"<clip id=\"dolphin\" start=\"npt:3.5\" end=\"npt:5:5.9\"><img src=\"dolphin.jpg\"/><desc>Here, Joe caught sight of a dolphin in the ocean.</desc><meta name=\"Subject\" content=\"dolphin\"/></clip>";
 	testClipParse(clip_1, true);

Modified: trunk/oggdsf/src/tests/testOOOggChef/testOOOggChef.cpp
===================================================================
--- trunk/oggdsf/src/tests/testOOOggChef/testOOOggChef.cpp	2005-01-10 11:56:48 UTC (rev 8717)
+++ trunk/oggdsf/src/tests/testOOOggChef/testOOOggChef.cpp	2005-01-10 15:04:04 UTC (rev 8718)
@@ -7,8 +7,8 @@
 #include <libilliCore/illicoreconfig.h>
 #include <libilliCore/StringHelper.h>
 #include <libTemporalURI/C_TimeStamp.h>
-#include <libWinCMMLParse/CMMLParser.h>
-#include <libWinCMMLParse/CMMLTagUtils.h>
+#include <libCMMLParse/CMMLParser.h>
+#include <libCMMLParse/CMMLTagUtils.h>
 
 int __cdecl _tmain(int argc, _TCHAR* argv[])
 {

More information about the commits mailing list