[xiph-commits] r8702 - trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2005-01-09 00:51:25 -0800 (Sun, 09 Jan 2005)
New Revision: 8702

Modified:
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/CMMLParser.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/CMMLParser.h
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.vcproj
Log:
* Removed some warnings from the new platform neutral cmml parser.
* Documented new platform neutral parser.

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/CMMLParser.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/CMMLParser.cpp	2005-01-09 08:40:27 UTC (rev 8701)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/CMMLParser.cpp	2005-01-09 08:51:25 UTC (rev 8702)
@@ -129,7 +129,7 @@
 
 	// Look for a tag, any tag
 	XTag *locRootParser = NULL;
-	locRootParser = xtag_new_parse(locCMMLRootText.c_str(), locCMMLRootText.size());
+	locRootParser = xtag_new_parse(locCMMLRootText.c_str(), (int)locCMMLRootText.size());
 	if (locRootParser) {
 		// Is it a <cmml> tag?
 		if (strcmp(xtag_get_name(locRootParser), "cmml") == 0) {
@@ -162,7 +162,7 @@
 
 	// Look for a <cmml> tag
 	XTag *locClipParser = NULL;
-	locClipParser = xtag_new_parse(locClipText.c_str(), locClipText.size());
+	locClipParser = xtag_new_parse(locClipText.c_str(), (int)locClipText.size());
 	if (locClipParser) {
 		// Found some sort of tag
 		if (strcmp(xtag_get_name(locClipParser), "clip") == 0) {
@@ -195,7 +195,7 @@
 
 	// Set up an XTag parser
 	XTag *locHeadParser = NULL;
-	locHeadParser = xtag_new_parse(locHeadText.c_str(), locHeadText.size());
+	locHeadParser = xtag_new_parse(locHeadText.c_str(), (int)locHeadText.size());
 	if (locHeadParser) {
 		if (strcmp(xtag_get_name(locHeadParser), "head") == 0) {
 			locReturnValue = parseHeadTag(locHeadParser, outHead);

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/CMMLParser.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/CMMLParser.h	2005-01-09 08:40:27 UTC (rev 8701)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/CMMLParser.h	2005-01-09 08:51:25 UTC (rev 8702)
@@ -50,23 +50,53 @@
 	CMMLParser(void);
 	~CMMLParser(void);
 
+	/// Parse a string representation of a clip tag into the provided Clip object.
 	bool parseClipTag(wstring inClipText, C_ClipTag* outClip);
+
+	/// Parse a string representation of a head tag into the provided Head object.
 	bool parseHeadTag(wstring inHeadText, C_HeadTag* outHead);
+
+	/// Parse a string representation of a cmml root tag into the provided CMMLRoot object.
 	bool parseCMMLRootTag(wstring inCMMLRootText, C_CMMLRootTag* outCMMLRoot);
+
+	/// Parse a string representation of a cmml document into the provided CMMLDoc object.
 	bool parseDocFromFile(wstring inFilename, C_CMMLDoc* outCMMLDoc);
 
 protected:
+	/// Parse an XTag representation of a cmml root tag into the provided CMMLRoot object.
 	bool parseRootTag(XTag* inCMMLRootParser, C_CMMLRootTag* outCMMLRoot);
+
+	/// Parse an XTag representation of a stream tag into the provided Stream object.
 	bool parseStreamTag(XTag* inStreamParser, C_StreamTag* outStream);
+
+	/// Parse an XTag representation of a head tag into the provided Head object.
 	bool parseHeadTag(XTag* inHeadParser, C_HeadTag* outHead);
+
+	/// Parse an XTag representation of a clip tag into the provided Clip object.
 	bool parseClipTag(XTag* inClipParser, C_ClipTag* outClip);
+
+	/// Parse an XTag representation of an import tag into the provided Import object.
 	bool parseImportTag(XTag* inImportParser, C_ImportTag* outImport);
+
+	/// Parse an XTag representation of a base tag into the provided Base object.
 	bool parseBaseTag(XTag* inBaseParser, C_BaseTag* outBase);
+
+	/// Parse an XTag representation of a title tag into the provided Title object.
 	bool parseTitleTag(XTag* inTitleParser, C_TitleTag* outTitle);
+
+	/// Parse an XTag representation of a meta tag into the provided MetaTag object.
 	bool parseMetaTag(XTag* inMetaParser, C_MetaTag* outMeta);
+
+	/// Parse an XTag representation of an anchor tag into the provided Anchor object.
 	bool parseAnchorTag(XTag* inAnchorParser, C_AnchorTag* outAnchor);
+
+	/// Parse an XTag representation of an image tag into the provided Image object.
 	bool parseImageTag(XTag* inImageParser, C_ImageTag* outImage);
+
+	/// Parse an XTag representation of a desc tag into the provided Desc object.
 	bool parseDescTag(XTag* inDescParser, C_DescTag* outDesc);
+
+	/// Parse an XTag representation of a param tag into the provided ParamTag object.
 	bool parseParamTag(XTag* inParamParser, C_ParamTag* outParam);
 
 };

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.vcproj	2005-01-09 08:40:27 UTC (rev 8701)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.vcproj	2005-01-09 08:51:25 UTC (rev 8702)
@@ -28,7 +28,8 @@
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="4"
-				CallingConvention="2"/>
+				CallingConvention="2"
+				DisableSpecificWarnings="4251"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -76,7 +77,8 @@
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="3"
-				CallingConvention="2"/>
+				CallingConvention="2"
+				DisableSpecificWarnings="4251"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool