[xiph-commits] r8336 - in trunk/oggdsf/src/lib/codecs/cmml: libCMMLTags libCMMLTagsDotNET

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-12-06 04:02:08 -0800 (Mon, 06 Dec 2004)
New Revision: 8336

Modified:
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.cpp
Log:
* Fixed cloning problem with clip tags ignoring metatags.

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp	2004-12-06 10:45:10 UTC (rev 8335)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp	2004-12-06 12:02:08 UTC (rev 8336)
@@ -126,6 +126,10 @@
 	locTag->setDesc(mDesc->clone());
 	locTag->setStart(mStart);
 	locTag->setEnd(mEnd);
+	//locTag->mMetaList = mMetaList->clone();
+	for (int i = 0; i < mMetaList->numTags(); i++) {
+		locTag->metaList()->addTag(mMetaList->getTag(i)->clone());
+	}
 }
 wstring C_ClipTag::toString() {
 	wstring retStr = L"<clip";

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.cpp	2004-12-06 10:45:10 UTC (rev 8335)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/ClipTag.cpp	2004-12-06 12:02:08 UTC (rev 8336)
@@ -87,7 +87,8 @@
 	//Mutators
 	void ClipTag::setTrack(String* inTrack) {
 		wchar_t* tc = Wrappers::netStrToWStr( inTrack );
-		getMe()->setTrack( tc );
+		wstring locStr = tc;
+		getMe()->setTrack( locStr );
 		Wrappers::releaseWStr( tc );
 	}
 	void ClipTag::setAnchor(AnchorTag* inAnchor) {

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.cpp	2004-12-06 10:45:10 UTC (rev 8335)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTagsDotNET/MetaTagList.cpp	2004-12-06 12:02:08 UTC (rev 8336)
@@ -59,6 +59,7 @@
 
 
 	void MetaTagList::addTag(MetaTag* inTag) {
+		getMe()->addTag(inTag->getMe()->clone());
 
 	}
 	void MetaTagList::addTag(String* inName, String* inContent) {