[xiph-commits] r8825 - in trunk/oggdsf: build/oggcodecs
src/lib/codecs/cmml/libCMMLTags
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Thu Feb 3 02:39:19 PST 2005
Author: illiminable
Date: 2005-02-03 02:38:51 -0800 (Thu, 03 Feb 2005)
New Revision: 8825
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.h
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp
trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp
Log:
* Escape xml entities when converting cmml to strings
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2005-02-03 01:37:08 UTC (rev 8824)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2005-02-03 10:38:51 UTC (rev 8825)
@@ -424,6 +424,12 @@
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
@@ -639,12 +645,6 @@
}
"Entry"
{
- "MsmKey" = "8:_74B3FBD0A65F4B89B275F48EBE351877"
- "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1185,7 +1185,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oggcodecs"
"ProductCode" = "8:{D65F0073-A820-4085-B997-A061171595A7}"
- "PackageCode" = "8:{890606D6-30E7-4D3A-A35E-B1D7C132CC84}"
+ "PackageCode" = "8:{DB84ADEA-CB46-46DA-BCE1-9FA0D7409C02}"
"UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
@@ -3362,26 +3362,12 @@
}
"MergeModule"
{
- "{35A69C6E-5BA4-440D-803D-762B59A45393}:_74B3FBD0A65F4B89B275F48EBE351877"
- {
- "UseDynamicProperties" = "11:TRUE"
- "IsDependency" = "11:TRUE"
- "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm"
- "Properties"
- {
- }
- "LanguageId" = "3:0"
- "Exclude" = "11:FALSE"
- "Folder" = "8:"
- "Feature" = "8:"
- "IsolateTo" = "8:"
- }
}
"ProjectOutput"
{
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_02E7D9728C8944F1BD021329177F5140"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTags\\Debug\\libCMMLTags.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTags\\Release\\libCMMLTags.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3409,7 +3395,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_054BE8EA6F5E45A7AB2066734E998570"
{
- "SourcePath" = "8:..\\..\\src\\lib\\helper\\libOOOggChef\\Debug\\libOOOggChef.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\helper\\libOOOggChef\\Release\\libOOOggChef.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3437,7 +3423,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0A1E63E5852E4F759F1A27E8F097727B"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggDump\\Debug\\OOOggDump.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggDump\\Release\\OOOggDump.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3465,7 +3451,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0D0DD40A31F842C68B09BE0CBDE1996B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACEncoder\\Debug\\dsfFLACEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACEncoder\\Release\\dsfFLACEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3493,7 +3479,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_141113E874984C0483C694B14F3C16A3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxMux\\Debug\\dsfAnxMux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxMux\\Release\\dsfAnxMux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3521,7 +3507,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_1FDED4DADD384431A22FF1C26BE42207"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLParse\\Debug\\libCMMLParse.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLParse\\Release\\libCMMLParse.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3549,7 +3535,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_24A1793CB89A464FB683A8A3BDA774DB"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Vorbis_Dynamic_Debug\\vorbis_d.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Vorbis_Dynamic_Release\\vorbis.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3577,7 +3563,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_27330A8D56F34785A52342ADD956700F"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggSeekFileQuery\\Debug\\OOOggSeekFileQuery.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggSeekFileQuery\\Release\\OOOggSeekFileQuery.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3605,7 +3591,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_273D851AE72C4D2EA8020A712DBFE5A3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfNativeFLACSource\\Debug\\dsfNativeFLACSource.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfNativeFLACSource\\Release\\dsfNativeFLACSource.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3633,7 +3619,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_3243E453AFD94BB88B5A1014BDFCBAAE"
{
- "SourcePath" = "8:..\\..\\src\\tests\\testLibOOOgg\\Debug\\testLibOOOgg.exe"
+ "SourcePath" = "8:..\\..\\src\\tests\\testLibOOOgg\\Release\\testLibOOOgg.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3661,7 +3647,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_3A86D30B7A3948869605033FC8CEA4B2"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggPageInfo\\Debug\\OOOggPageInfo.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggPageInfo\\Release\\OOOggPageInfo.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3689,7 +3675,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_3C7C3E6B832E481C8A36701A33FF3721"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Debug\\OOOggStat.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Release\\OOOggStat.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3717,7 +3703,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_408749AC43894882BEEBFF43737E505B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexDecoder\\Debug\\dsfSpeexDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexDecoder\\Release\\dsfSpeexDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3745,7 +3731,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_4EB6175B98B54613A5087D8EA257D00A"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libOOTheora\\Debug\\libOOTheora.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libOOTheora\\Release\\libOOTheora.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3773,7 +3759,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_52EEBD17D1BC463493F06DCBC4C2CD44"
{
- "SourcePath" = "8:..\\..\\src\\lib\\helper\\libTemporalURI\\Debug\\libTemporalURI.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\helper\\libTemporalURI\\Release\\libTemporalURI.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3801,7 +3787,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraDecoder\\Debug\\dsfTheoraDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraDecoder\\Release\\dsfTheoraDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3829,7 +3815,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_578B89273D59478F861AA5BC3600D074"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggMux\\Debug\\dsfOggMux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggMux\\Release\\dsfOggMux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3857,7 +3843,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_58F56CD02F64413B9459F3E151760A57"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOgg\\Debug\\libOOOgg.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOgg\\Release\\libOOOgg.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3885,7 +3871,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_5EB08DD30B564283AA9C9F27D80CF9E4"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOggSeek\\Debug\\libOOOggSeek.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOggSeek\\Release\\libOOOggSeek.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3913,7 +3899,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_5F037C77C35B4B5098153851ADDB7B6A"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLRawSource\\Debug\\dsfCMMLRawSource.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLRawSource\\Release\\dsfCMMLRawSource.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3941,7 +3927,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_65015192414F476999A68339F89BEA57"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLDecoder\\Debug\\dsfCMMLDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLDecoder\\Release\\dsfCMMLDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3969,7 +3955,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_83AF8D74700947168B69E69E5160F082"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\debug\\bin\\libFLAC.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\release\\bin\\libFLAC.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3997,7 +3983,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8976C400668B453CB941859C4F3C6E27"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACDecoder\\Debug\\dsfFLACDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACDecoder\\Release\\dsfFLACDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4025,7 +4011,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8D9A2E4C592D4118B80A4AE8394D8963"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexEncoder\\Debug\\dsfSpeexEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexEncoder\\Release\\dsfSpeexEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4053,7 +4039,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8F970C0B2593413CA2A3BBF5F2600387"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxDemux\\Debug\\dsfAnxDemux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxDemux\\Release\\dsfAnxDemux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4081,7 +4067,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_950B983745EC40EF9FF08E742A6E9510"
{
- "SourcePath" = "8:..\\..\\src\\tools\\AnxCutter\\Debug\\AnxCutter.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\AnxCutter\\Release\\AnxCutter.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4109,7 +4095,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_9F87CF49E6BC48AE9DECD5A3F35FEC24"
{
- "SourcePath" = "8:..\\..\\src\\tests\\testTemporal\\Debug\\testTemporal.exe"
+ "SourcePath" = "8:..\\..\\src\\tests\\testTemporal\\Release\\testTemporal.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4137,7 +4123,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_A0E68123D9D541DFA9691752981C903A"
{
- "SourcePath" = "8:..\\..\\src\\tests\\testCMMLParser\\Debug\\testCMMLParser.exe"
+ "SourcePath" = "8:..\\..\\src\\tests\\testCMMLParser\\Release\\testCMMLParser.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4165,7 +4151,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_A5AAB8CB90C548F1820BC101A765616C"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSeeking\\Debug\\dsfSeeking.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSeeking\\Release\\dsfSeeking.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4193,7 +4179,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_AC8962A7F212481095173AB7C8C89025"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraEncoder\\Debug\\dsfTheoraEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraEncoder\\Release\\dsfTheoraEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4221,7 +4207,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_B9749E2A902A46BEAE555C07E32980BB"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggSeekFileMaker\\Debug\\OOOggSeekFileMaker.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggSeekFileMaker\\Release\\OOOggSeekFileMaker.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4249,7 +4235,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggValidate\\Debug\\OOOggValidate.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggValidate\\Release\\OOOggValidate.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4277,7 +4263,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_D2048C8B212841C88E42F6ADDCA8B0A2"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSubtitleVMR9\\Debug\\dsfSubtitleVMR9.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSubtitleVMR9\\Release\\dsfSubtitleVMR9.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4305,7 +4291,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_D3E41A5878FC4EC0B0F443CF3E5991BA"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggSeekFileReader\\Debug\\OOOggSeekFileReader.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggSeekFileReader\\Release\\OOOggSeekFileReader.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4333,7 +4319,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DB60960DC12343B89500B86D5AB10D02"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\debug\\bin\\libFLAC++.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\release\\bin\\libFLAC++.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4361,7 +4347,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DCF4ED7597F8492AA49DC521111ED0F5"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggDemux\\Debug\\dsfOggDemux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggDemux\\Release\\dsfOggDemux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4389,7 +4375,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_E1E372FA955046E6928BF533EA0AE6C3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libVorbisComment\\Debug\\libVorbisComment.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libVorbisComment\\Release\\libVorbisComment.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4417,7 +4403,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\helper\\libfishsound\\win32\\Debug\\libfishsound.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\helper\\libfishsound\\win32\\Release\\libfishsound.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4445,7 +4431,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_E6B7C1CA6BF74C998B68B4C3379FB830"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggPacketise\\Debug\\OOOggPacketise.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggPacketise\\Release\\OOOggPacketise.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4473,7 +4459,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EB09F87C612C40BCA34AC87060CFEFF1"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggCommentDump\\Debug\\OOOggCommentDump.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggCommentDump\\Release\\OOOggCommentDump.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4501,7 +4487,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EFEA71FFF2864107815DBDECCCCA1178"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisDecoder\\Debug\\dsfVorbisDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisDecoder\\Release\\dsfVorbisDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4529,7 +4515,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_FD547F0196C24DFBB9CAFCCEC06561BC"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisEncoder\\Debug\\dsfVorbisEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisEncoder\\Release\\dsfVorbisEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp 2005-02-03 01:37:08 UTC (rev 8824)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_AnchorTag.cpp 2005-02-03 10:38:51 UTC (rev 8825)
@@ -80,10 +80,10 @@
wstring retStr = L"<a";
- retStr += makeElement(L"id", mId);
+ retStr += makeAttribute(L"id", mId);
retStr += makeLangElements();
- retStr += makeElement(L"class", mCls);
- retStr += makeRequiredElement(L"href", mHref);
+ retStr += makeAttribute(L"class", mCls);
+ retStr += makeRequiredAttribute(L"href", mHref);
retStr += L">";
retStr += mText;
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.cpp 2005-02-03 01:37:08 UTC (rev 8824)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_BaseTag.cpp 2005-02-03 10:38:51 UTC (rev 8825)
@@ -70,10 +70,10 @@
wstring retStr = L"<base";
if (mId.size() != 0) {
- retStr += makeElement(L"id", mId);
+ retStr += makeAttribute(L"id", mId);
}
- retStr += makeElement(L"href", mHref);
+ retStr += makeAttribute(L"href", mHref);
retStr += L"/>\n";
return retStr;
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp 2005-02-03 01:37:08 UTC (rev 8824)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLRootTag.cpp 2005-02-03 10:38:51 UTC (rev 8825)
@@ -103,10 +103,10 @@
wstring retStr;
retStr = L"<cmml";
- retStr += makeElement(L"id", mId);
+ retStr += makeAttribute(L"id", mId);
retStr += makeLangElements();
//TODO::: This shouldn't be hardcoded here !
- retStr += makeElement(L"xmlns", L"http://www.annodex.net/cmml");
+ retStr += makeAttribute(L"xmlns", L"http://www.annodex.net/cmml");
retStr += L">\n";
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.cpp 2005-02-03 01:37:08 UTC (rev 8824)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.cpp 2005-02-03 10:38:51 UTC (rev 8825)
@@ -53,7 +53,7 @@
}
//Protected Helper Methods
-wstring C_CMMLTag::makeElement(wstring inElemName, wstring inElemContent) {
+wstring C_CMMLTag::makeAttribute(wstring inElemName, wstring inElemContent) {
if (inElemContent != L"") {
wstring retStr;
retStr = L" " + inElemName + L"=\"" + inElemContent + L"\"";
@@ -63,13 +63,47 @@
}
}
-wstring C_CMMLTag::makeRequiredElement(wstring inElemName, wstring inElemContent) {
+wstring C_CMMLTag::makeRequiredAttribute(wstring inElemName, wstring inElemContent) {
wstring retStr;
retStr = L" " + inElemName + L"=\"" + inElemContent + L"\"";
return retStr;
}
+wstring C_CMMLTag::replaceAll(wstring inOriginal, wchar_t inReplaceThis, wstring inWithThis)
+{
+ size_t locPos = 0;
+
+ while ((locPos = inOriginal.find(inReplaceThis,locPos)) != wstring::npos)
+ {
+ inOriginal.replace( locPos++, 1, inWithThis );
+ }
+ return inOriginal;
+
+}
+
+//Character Name Entity Reference
+//Ampersand (&) &
+//Left angle bracket (<) <
+//Right angle bracket (>) >
+//Straight quotation mark (") "
+//Apostrophe (') '
+
+wstring C_CMMLTag::escapeEntities(wstring inString)
+{
+ wstring retStr = inString;
+ //Do the ampersand first !!
+ retStr = replaceAll(retStr, L'&', L"&");
+ retStr = replaceAll(retStr, L'<', L"<");
+ retStr = replaceAll(retStr, L'>', L">");
+ retStr = replaceAll(retStr, L'"', L""");
+ retStr = replaceAll(retStr, L'\'', L"'");
+
+ return retStr;
+
+}
+
+
void C_CMMLTag::privateClone(C_CMMLTag* outTag) {
outTag->setId(mId);
}
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.h 2005-02-03 01:37:08 UTC (rev 8824)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLTag.h 2005-02-03 10:38:51 UTC (rev 8825)
@@ -93,9 +93,14 @@
virtual void privateClone(C_CMMLTag* outTag);
/// Makes an attribute of the form name="content" and returns a string.
- wstring makeElement(wstring inElemName, wstring inElemContent);
+ wstring makeAttribute(wstring inElemName, wstring inElemContent);
+ wstring makeRequiredAttribute(wstring inElemName, wstring inElemContent);
- wstring makeRequiredElement(wstring inElemName, wstring inElemContent);
+ /// Escapes out & " < > ' and turns it into an entity reference
+ wstring escapeEntities(wstring inString);
+
+ /// Implements the missing functionality from an stl string... ie replace
+ wstring replaceAll(wstring inOriginal, wchar_t inReplaceThis, wstring inWithThis);
};
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp 2005-02-03 01:37:08 UTC (rev 8824)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ClipTag.cpp 2005-02-03 10:38:51 UTC (rev 8825)
@@ -152,21 +152,21 @@
//Id element
if (mId != L"") {
- retStr += makeElement(L"id", mId);
+ retStr += makeAttribute(L"id", mId);
}
retStr += makeLangElements();
//track Element
if (mTrack != L"") {
- retStr += makeElement(L"track", mTrack);
+ retStr += makeAttribute(L"track", mTrack);
}
//TO DO::: Sort out what to do about start and end
- retStr += makeElement(L"start", mStart);
+ retStr += makeAttribute(L"start", mStart);
if (mEnd != L"") {
- retStr += makeElement(L"end", mEnd);
+ retStr += makeAttribute(L"end", mEnd);
}
retStr += L">\n";
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp 2005-02-03 01:37:08 UTC (rev 8824)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_DescTag.cpp 2005-02-03 10:38:51 UTC (rev 8825)
@@ -49,7 +49,7 @@
//FIX ::: Make this do something
wstring retStr = L"<desc";
if (mId.size() != 0) {
- retStr += makeElement(L"id", mId);
+ retStr += makeAttribute(L"id", mId);
}
retStr += makeLangElements();
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.cpp 2005-02-03 01:37:08 UTC (rev 8824)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_HumReadCMMLTag.cpp 2005-02-03 10:38:51 UTC (rev 8825)
@@ -70,11 +70,11 @@
wstring retStr = L"";
if (mLang.size() != 0) {
- retStr += makeElement(L"lang", mLang);
+ retStr += makeAttribute(L"lang", mLang);
}
if (mDirn.size() != 0) {
- retStr += makeElement(L"dir", mDirn);
+ retStr += makeAttribute(L"dir", mDirn);
}
return retStr;
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp 2005-02-03 01:37:08 UTC (rev 8824)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImageTag.cpp 2005-02-03 10:38:51 UTC (rev 8825)
@@ -80,15 +80,15 @@
wstring C_ImageTag::toString() {
wstring retStr = L"<img";
if (mId.size() != 0) {
- retStr += makeElement(L"id", mId);
+ retStr += makeAttribute(L"id", mId);
}
retStr += makeLangElements();
- retStr += makeElement(L"src", mSrc);
+ retStr += makeAttribute(L"src", mSrc);
if (mAlt.size() != 0) {
- retStr += makeElement(L"alt", mAlt);
+ retStr += makeAttribute(L"alt", mAlt);
}
retStr += L"/>\n";
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp 2005-02-03 01:37:08 UTC (rev 8824)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ImportTag.cpp 2005-02-03 10:38:51 UTC (rev 8825)
@@ -128,27 +128,27 @@
retStr = L"<import";
if (mId.size() != 0) {
- retStr += makeElement(L"id", mId);
+ retStr += makeAttribute(L"id", mId);
}
retStr += makeLangElements();
if (mGranuleRate.size() != 0) {
- retStr += makeElement(L"granulerate", mGranuleRate);
+ retStr += makeAttribute(L"granulerate", mGranuleRate);
}
if (mContentType.size() != 0) {
- retStr += makeElement(L"contenttype", mContentType);
+ retStr += makeAttribute(L"contenttype", mContentType);
}
- retStr += makeElement(L"src", mSrc);
- retStr += makeElement(L"start", mStart);
+ retStr += makeAttribute(L"src", mSrc);
+ retStr += makeAttribute(L"start", mStart);
if (mEnd.size() != 0) {
- retStr += makeElement(L"end", mEnd);
+ retStr += makeAttribute(L"end", mEnd);
}
if (mTitle.size() != 0) {
- retStr += makeElement(L"title", mTitle);
+ retStr += makeAttribute(L"title", mTitle);
}
retStr += L">\n";
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp 2005-02-03 01:37:08 UTC (rev 8824)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_MetaTag.cpp 2005-02-03 10:38:51 UTC (rev 8825)
@@ -76,15 +76,15 @@
wstring retStr = L"<meta";
if (mId.size() != 0) {
- retStr += makeElement(L"id", mId);
+ retStr += makeAttribute(L"id", mId);
}
retStr += makeLangElements();
- retStr += makeElement(L"name", mName);
- retStr += makeElement(L"content", mContent);
+ retStr += makeAttribute(L"name", mName);
+ retStr += makeAttribute(L"content", mContent);
if (mScheme != L"") {
- retStr += makeElement(L"scheme", mScheme);
+ retStr += makeAttribute(L"scheme", mScheme);
}
retStr += L"/>\n";
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp 2005-02-03 01:37:08 UTC (rev 8824)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_ParamTag.cpp 2005-02-03 10:38:51 UTC (rev 8825)
@@ -46,12 +46,12 @@
wstring retStr;
retStr = L"<param";
if (mId.size() != 0) {
- retStr += makeElement(L"id", mId);
+ retStr += makeAttribute(L"id", mId);
}
retStr += makeLangElements();
- retStr += makeElement(L"name", mName);
- retStr += makeElement(L"value", mContent);
+ retStr += makeAttribute(L"name", mName);
+ retStr += makeAttribute(L"value", mContent);
retStr += L"/>\n";
return retStr;
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp 2005-02-03 01:37:08 UTC (rev 8824)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_StreamTag.cpp 2005-02-03 10:38:51 UTC (rev 8825)
@@ -96,11 +96,11 @@
retStr = L"<stream";
if (mId.size() != 0) {
- retStr += makeElement(L"id", mId);
+ retStr += makeAttribute(L"id", mId);
}
- retStr += makeElement(L"timebase", mTimebase);
+ retStr += makeAttribute(L"timebase", mTimebase);
if (mUtc.size() != 0) {
- retStr += makeElement(L"utc", mUtc);
+ retStr += makeAttribute(L"utc", mUtc);
}
retStr += L">\n";
retStr += mImportList->toString();
Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp 2005-02-03 01:37:08 UTC (rev 8824)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_TitleTag.cpp 2005-02-03 10:38:51 UTC (rev 8825)
@@ -48,7 +48,7 @@
wstring retStr = L"<title";
if (mId.size() != 0) {
- retStr += makeElement(L"id", mId);
+ retStr += makeAttribute(L"id", mId);
}
retStr += makeLangElements();
More information about the commits
mailing list