[xiph-commits] r8645 - in trunk/oggdsf/src/lib/codecs/cmml: libCMMLTags libWinCMMLParse

[ozone at motherfish-iii.xiph.org]

Author: ozone
Date: 2005-01-06 22:07:51 -0800 (Thu, 06 Jan 2005)
New Revision: 8645

Modified:
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.h
Log:
oggdsf:
 * Warnings--
 * Make all MSXML-related methods in the CMMLParser class as protected, rather than public (better data encapsulation)

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp	2005-01-06 14:06:52 UTC (rev 8644)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp	2005-01-07 06:07:51 UTC (rev 8645)
@@ -141,7 +141,7 @@
 	locTag->setStart(mStart);
 	locTag->setEnd(mEnd);
 	//locTag->mMetaList = mMetaList->clone();
-	for (int i = 0; i < mMetaList->numTags(); i++) {
+	for (unsigned int i = 0; i < mMetaList->numTags(); i++) {
 		locTag->metaList()->addTag(mMetaList->getTag(i)->clone());
 	}
 }

Modified: trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.cpp	2005-01-06 14:06:52 UTC (rev 8644)
+++ trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.cpp	2005-01-07 06:07:51 UTC (rev 8645)
@@ -281,7 +281,6 @@
 }
 
 bool CMMLParser::parseClipTag(wstring inClipText, C_ClipTag* outClip) {
-	HRESULT						locHR			= S_FALSE;
 	MSXML2::IXMLDOMDocument*	locXMLClipFrag	= NULL;
 	MSXML2::IXMLDOMNode*		locClipNode		= NULL;
 		
@@ -417,7 +416,6 @@
 
 
 bool CMMLParser::parseCMMLRootTag(wstring inCMMLRootText, C_CMMLRootTag* outCMMLRoot) {
-	HRESULT						locHR				= S_FALSE;
 	MSXML2::IXMLDOMDocument*	locXMLCMMLRootFrag	= NULL;
 	MSXML2::IXMLDOMNode*		locCMMLRootNode			= NULL;
 		
@@ -528,7 +526,6 @@
 }
 
 bool CMMLParser::parseHeadTag(wstring inHeadText, C_HeadTag* outHead) {
-	HRESULT locHR = S_FALSE;
 	MSXML2::IXMLDOMDocument* locXMLHeadFrag = NULL;
 	MSXML2::IXMLDOMNode* locHeadNode  = NULL;
 		

Modified: trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.h	2005-01-06 14:06:52 UTC (rev 8644)
+++ trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.h	2005-01-07 06:07:51 UTC (rev 8645)
@@ -52,14 +52,21 @@
 	CMMLParser(void);
 	~CMMLParser(void);
 
-	/// Parses the given string at inText and places the result in outDoc.
-	bool setupXMLHandles(wstring inText, MSXML2::IXMLDOMDocument** outDoc);
 	//C_CMMLTag* genericParseTag(string inCMMLText);
 	//bool parseCMMLDoc(string inCMMLDocText, C_CMMLDoc* outDoc);
 	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);
+
+
+
+protected:
+	/// Parses the given string at inText and places the result in outDoc.
+	bool setupXMLHandles(wstring inText, MSXML2::IXMLDOMDocument** outDoc);
+
 	bool parseHeadTag(MSXML2::IXMLDOMNode* inHeadNode, C_HeadTag* outHead);
 	bool parseAnchorTag(MSXML2::IXMLDOMNode* inAnchorNode, C_AnchorTag* outAnchor);
 	bool parseStreamTag(MSXML2::IXMLDOMNode* inStreamNode, C_StreamTag* outStream);
@@ -73,12 +80,6 @@
 	bool parseParamTag(MSXML2::IXMLDOMNode* inParamNode, C_ParamTag* outParam);
 	bool parseCMMLRootTag(MSXML2::IXMLDOMNode* inCMMLRootNode, C_CMMLRootTag* outCMMLRoot);
 
-	
-	bool parseDocFromFile(wstring inFilename, C_CMMLDoc* outCMMLDoc);
-
-
-
-protected:
 	wstring getNamedAttribValue(wstring inAttribName, MSXML2::IXMLDOMNamedNodeMap* inAttribMap);
 	MSXML2::IXMLDOMNode* getNamedNode(wstring inXPath, MSXML2::IXMLDOMDocument* inDoc);
 	//string toNarrowStr(wstring inString);