[xiph-commits] r8401 - in trunk/oggdsf: build/oggcodecs
sln/oggdsf_all src/lib/codecs/cmml/dsfCMMLRawSource
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Tue Dec 14 21:02:29 PST 2004
Author: illiminable
Date: 2004-12-14 21:02:29 -0800 (Tue, 14 Dec 2004)
New Revision: 8401
Added:
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.def
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/stdafx.h
Log:
* CMML Raw source filter works.
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-12-15 04:10:15 UTC (rev 8400)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-12-15 05:02:29 UTC (rev 8401)
@@ -100,30 +100,18 @@
"Entry"
{
"MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
+ "OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
@@ -148,12 +136,6 @@
"Entry"
{
"MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
@@ -184,6 +166,12 @@
"Entry"
{
"MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
@@ -232,12 +220,30 @@
"Entry"
{
"MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
@@ -279,55 +285,37 @@
}
"Entry"
{
- "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
+ "MsmKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
+ "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
+ "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
+ "OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
@@ -358,7 +346,7 @@
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -400,6 +388,18 @@
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
@@ -448,6 +448,18 @@
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
"MsmSig" = "8:_UNDEFINED"
}
@@ -466,6 +478,12 @@
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
@@ -929,7 +947,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oggcodecs"
"ProductCode" = "8:{D65F0073-A820-4085-B997-A061171595A7}"
- "PackageCode" = "8:{19A22B6B-90C0-4ADD-902D-CD45E6237E13}"
+ "PackageCode" = "8:{B77771F9-ECAA-4D96-8026-22240D8116B4}"
"UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
@@ -3057,7 +3075,7 @@
{
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_02E7D9728C8944F1BD021329177F5140"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libcmmltags\\debug\\libCMMLTags.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTags\\Debug\\libCMMLTags.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3085,7 +3103,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0A1E63E5852E4F759F1A27E8F097727B"
{
- "SourcePath" = "8:..\\..\\src\\tools\\oooggdump\\debug\\OOOggDump.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggDump\\Debug\\OOOggDump.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3113,7 +3131,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\\Debug\\dsfFLACEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3141,7 +3159,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_13E9F6D7ED35430BA31BDDF95E6327B3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfabstractvideoencoder\\debug\\dsfAbstractVideoEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractVideoEncoder\\Debug\\dsfAbstractVideoEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3169,7 +3187,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_14E3067B71584FB5A245A2DA9D65D139"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libwincmmlparse\\debug\\libWinCMMLParse.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libWinCMMLParse\\Debug\\libWinCMMLParse.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3197,7 +3215,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_Debug\\vorbis_d.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3225,7 +3243,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\\Debug\\dsfNativeFLACSource.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3253,7 +3271,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_3243E453AFD94BB88B5A1014BDFCBAAE"
{
- "SourcePath" = "8:..\\..\\src\\tests\\testlibooogg\\debug\\testLibOOOgg.exe"
+ "SourcePath" = "8:..\\..\\src\\tests\\testLibOOOgg\\Debug\\testLibOOOgg.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3281,7 +3299,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_3C7C3E6B832E481C8A36701A33FF3721"
{
- "SourcePath" = "8:..\\..\\src\\tools\\oooggstat\\debug\\OOOggStat.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Debug\\OOOggStat.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3309,7 +3327,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\\Debug\\dsfSpeexDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3337,7 +3355,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\\Debug\\libOOTheora.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3365,7 +3383,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\\Debug\\dsfTheoraDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3393,7 +3411,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_578B89273D59478F861AA5BC3600D074"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfoggmux\\debug\\dsfOggMux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggMux\\Debug\\dsfOggMux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3421,7 +3439,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_58F56CD02F64413B9459F3E151760A57"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libooogg\\debug\\libOOOgg.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOgg\\Debug\\libOOOgg.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3449,7 +3467,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_5EB08DD30B564283AA9C9F27D80CF9E4"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\liboooggseek\\debug\\libOOOggSeek.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOggSeek\\Debug\\libOOOggSeek.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3475,9 +3493,37 @@
{
}
}
+ "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_5F037C77C35B4B5098153851ADDB7B6A"
+ {
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfcmmlrawsource\\debug\\dsfCMMLRawSource.dll"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ "ProjectOutputGroupRegister" = "3:4"
+ "OutputConfiguration" = "8:"
+ "OutputGroupCanonicalName" = "8:Built"
+ "OutputProjectGuid" = "8:{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}"
+ "ShowKeyOutput" = "11:TRUE"
+ "ExcludeFilters"
+ {
+ }
+ }
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_65015192414F476999A68339F89BEA57"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfcmmldecoder\\debug\\dsfCMMLDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLDecoder\\Debug\\dsfCMMLDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3533,7 +3579,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\\Debug\\dsfFLACDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3561,7 +3607,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\\Debug\\dsfSpeexEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3589,7 +3635,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8F970C0B2593413CA2A3BBF5F2600387"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfanxdemux\\debug\\dsfAnxDemux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxDemux\\Debug\\dsfAnxDemux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3617,7 +3663,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_A5AAB8CB90C548F1820BC101A765616C"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfseeking\\debug\\dsfSeeking.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSeeking\\Debug\\dsfSeeking.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3645,7 +3691,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\\Debug\\dsfTheoraEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3673,7 +3719,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
{
- "SourcePath" = "8:..\\..\\src\\tools\\oooggvalidate\\debug\\OOOggValidate.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggValidate\\Debug\\OOOggValidate.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3701,7 +3747,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_D2048C8B212841C88E42F6ADDCA8B0A2"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfsubtitlevmr9\\debug\\dsfSubtitleVMR9.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSubtitleVMR9\\Debug\\dsfSubtitleVMR9.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3757,7 +3803,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DCF4ED7597F8492AA49DC521111ED0F5"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfoggdemux\\debug\\dsfOggDemux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggDemux\\Debug\\dsfOggDemux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3785,7 +3831,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_E1E372FA955046E6928BF533EA0AE6C3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libvorbiscomment\\debug\\libVorbisComment.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libVorbisComment\\Debug\\libVorbisComment.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3813,7 +3859,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\\Debug\\libfishsound.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3841,7 +3887,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EB09F87C612C40BCA34AC87060CFEFF1"
{
- "SourcePath" = "8:..\\..\\src\\tools\\oooggcommentdump\\debug\\OOOggCommentDump.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggCommentDump\\Debug\\OOOggCommentDump.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3869,7 +3915,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\\Debug\\dsfVorbisDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3897,7 +3943,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\\Debug\\dsfVorbisEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-12-15 04:10:15 UTC (rev 8400)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-12-15 05:02:29 UTC (rev 8401)
@@ -1116,6 +1116,9 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfCMMLRawSource", "..\..\src\lib\codecs\cmml\dsfCMMLRawSource\dsfCMMLRawSource.vcproj", "{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}"
ProjectSection(ProjectDependencies) = postProject
+ {23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+ {AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iDSHelper", "..\..\src\lib\helper\iDSHelper\iDSHelper.vcproj", "{053D669F-E874-44C6-9705-8A1DEF40C4E9}"
@@ -1195,36 +1198,48 @@
EndProjectSection
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiracCommon", "..\..\src\lib\codecs\dirac\lib\libdirac\windows\VS2003\DiracCommon\DiracCommon.vcproj", "{A45B7D48-9E8D-4475-BED4-CBE3E3CCAD21}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiracDecoder", "..\..\src\lib\codecs\dirac\lib\libdirac\windows\VS2003\DiracDecoder\DiracDecoder.vcproj", "{89EC2AEB-8284-4213-874B-29D549893FC9}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiracEncoder", "..\..\src\lib\codecs\dirac\lib\libdirac\windows\VS2003\DiracEncoder\DiracEncoder.vcproj", "{9076B578-583A-493D-96C4-776DCEC0FFBD}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiracMotionEst", "..\..\src\lib\codecs\dirac\lib\libdirac\windows\VS2003\DiracMotionEst\DiracMotionEst.vcproj", "{C6A615BF-D4EB-4D50-9638-2C715E0695C6}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EncodeDirac", "..\..\src\lib\codecs\dirac\lib\libdirac\windows\VS2003\EncodeDirac\EncodeDirac.vcproj", "{547FE1E9-70EF-48D4-B45B-2FF39B39855D}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libDirectshowAbstracts", "..\..\src\lib\core\directshow\libDirectshowAbstracts\libDirectshowAbstracts.vcproj", "{EA7091BB-9906-41DF-9738-F4858A136086}"
ProjectSection(ProjectDependencies) = postProject
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp 2004-12-15 04:10:15 UTC (rev 8400)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp 2004-12-15 05:02:29 UTC (rev 8401)
@@ -39,7 +39,9 @@
CMMLRawSourceFilter::CMMLRawSourceFilter(void)
: CBaseFilter(NAME("CMMLRawSourceFilter"), NULL, m_pLock, CLSID_CMMLRawSourceFilter)
, mCMMLDoc(NULL)
+ , mUptoTag(0)
{
+ m_pLock = new CCritSec;
mCMMLSourcePin = new CMMLRawSourcePin( this
, this->m_pLock);
@@ -49,8 +51,10 @@
CMMLRawSourceFilter::~CMMLRawSourceFilter(void)
{
+
delete mCMMLSourcePin;
delete mCMMLDoc;
+ delete m_pLock;
}
//BaseFilter Interface
@@ -92,6 +96,8 @@
mCMMLDoc = new C_CMMLDoc;
bool retVal = mCMMLParser.parseDocFromFile(mFileName, mCMMLDoc);
+ mUptoTag = -1;
+
if (retVal) {
return S_OK;
} else {
@@ -136,11 +142,11 @@
}
if (mUptoTag == -1) {
- deliverTag(mCMMLDoc->root()->head());
+ mCMMLSourcePin->deliverTag(mCMMLDoc->root()->head());
} else if (mUptoTag < mCMMLDoc->root()->clipList()->numTags()) {
- deliverTag(mCMMLDoc->root()->clipList()->getTag(mUptoTag));
+ mCMMLSourcePin->deliverTag(mCMMLDoc->root()->clipList()->getTag(mUptoTag));
} else {
- DeliverEOS();
+ mCMMLSourcePin->DeliverEndOfStream();
}
mUptoTag++;
@@ -148,3 +154,32 @@
return S_OK;
}
+//IMEdiaStreaming
+STDMETHODIMP CMMLRawSourceFilter::Run(REFERENCE_TIME tStart) {
+ CAutoLock locLock(m_pLock);
+ return CBaseFilter::Run(tStart);
+}
+STDMETHODIMP CMMLRawSourceFilter::Pause(void) {
+ CAutoLock locLock(m_pLock);
+ if (m_State == State_Stopped) {
+ if (ThreadExists() == FALSE) {
+ Create();
+ }
+ CallWorker(THREAD_RUN);
+ }
+
+ HRESULT locHR = CBaseFilter::Pause();
+ return locHR;
+
+}
+STDMETHODIMP CMMLRawSourceFilter::Stop(void) {
+ CAutoLock locLock(m_pLock);
+ CallWorker(THREAD_EXIT);
+ Close();
+ //mJustSeeked = true;
+ //mSeekRequest = 0;
+ mUptoTag = -1;
+ mCMMLSourcePin->DeliverBeginFlush();
+ mCMMLSourcePin->DeliverEndFlush();
+ return CBaseFilter::Stop();
+}
\ No newline at end of file
Added: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.def
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.def 2004-12-15 04:10:15 UTC (rev 8400)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.def 2004-12-15 05:02:29 UTC (rev 8401)
@@ -0,0 +1,7 @@
+LIBRARY dsfAnxDemux
+EXPORTS
+ DllMain PRIVATE
+ DllGetClassObject PRIVATE
+ DllCanUnloadNow PRIVATE
+ DllRegisterServer PRIVATE
+ DllUnregisterServer PRIVATE
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h 2004-12-15 04:10:15 UTC (rev 8400)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h 2004-12-15 05:02:29 UTC (rev 8401)
@@ -1,6 +1,9 @@
#pragma once
#include <string>
+#include "libWinCMMLParse.h"
+#include "CMMLParser.h"
+#include "CMMLRawSourcePin.h"
using namespace std;
class CMMLRawSourcePin;
@@ -43,6 +46,11 @@
//CAMThread
virtual DWORD ThreadProc(void);
+
+ STDMETHODIMP Run(REFERENCE_TIME tStart);
+ STDMETHODIMP Pause(void);
+ STDMETHODIMP Stop(void);
+
protected:
virtual HRESULT DataProcessLoop();
@@ -51,4 +59,6 @@
C_CMMLDoc* mCMMLDoc;
wstring mFileName;
+
+ long mUptoTag;
};
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp 2004-12-15 04:10:15 UTC (rev 8400)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp 2004-12-15 05:02:29 UTC (rev 8401)
@@ -3,7 +3,11 @@
CMMLRawSourcePin::CMMLRawSourcePin(CMMLRawSourceFilter* inParentFilter, CCritSec* inFilterLock)
: CBaseOutputPin(NAME("CMML Raw Source Pin"), inParentFilter, inFilterLock, &mFilterHR, L"CMML Source")
+
{
+ mCMMLFormatBlock.granuleDenominator = 1;
+ mCMMLFormatBlock.granuleNumerator = 1000;
+
}
CMMLRawSourcePin::~CMMLRawSourcePin(void)
@@ -76,8 +80,11 @@
locMediaType.majortype = MEDIATYPE_Text;
locMediaType.subtype = MEDIASUBTYPE_CMML;
locMediaType.formattype = FORMAT_CMML;
- locMediaType.cbFormat = sizeof(sCMMLFormatBlock); //0;//sizeof(sSpeexFormatBlock);
- locMediaType.pbFormat = (BYTE*)mCMMLFormatBlock; //(BYTE*)locSpeexFormatInfo;
+
+ BYTE* locFB = locMediaType.AllocFormatBuffer(sizeof(sCMMLFormatBlock)); //0;//sizeof(sSpeexFormatBlock);
+
+ //locMediaType.pbFormat = (BYTE*)&mCMMLFormatBlock; //(BYTE*)locSpeexFormatInfo;
+ memcpy((void*)locFB, (const void*)&mCMMLFormatBlock, sizeof(sCMMLFormatBlock));
locMediaType.pUnk = NULL;
*outMediaType = locMediaType;
return S_OK;
@@ -132,6 +139,29 @@
return locHR;
}
+ BYTE* locOutBuffer = NULL;
+ locHR = locSample->GetPointer(&locOutBuffer);
- //locSample->
+ if (locHR != S_OK) {
+ //debugLog<<"Failure... No buffer"<<endl;
+ return locHR;
+ }
+
+ wstring locStr = inTag->toString();
+
+
+ //TODO::: For now, this narrowfies the string... to ascii, instead of sending
+ // 2 byte chars.
+
+ string locNarrowStr = StringHelper::toNarrowStr(locStr);
+
+ memcpy((void*)locOutBuffer, (const void*)locNarrowStr.c_str(), locNarrowStr.size());
+
+ locSample->SetActualDataLength(locNarrowStr.size());
+
+
+
+ return Deliver(locSample);
+
+
}
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h 2004-12-15 04:10:15 UTC (rev 8400)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h 2004-12-15 05:02:29 UTC (rev 8401)
@@ -34,9 +34,12 @@
#pragma once
#include "cmmlrawsourcedllstuff.h"
-
+#include "StringHelper.h"
#include <fstream>
using namespace std;
+
+class CMMLRawSourceFilter;
+
class CMMLRawSourcePin
: public CBaseOutputPin
{
@@ -71,5 +74,5 @@
//fstream debugLog;
HRESULT mFilterHR;
COutputQueue* mDataQueue;
- sCMMLFormatBlock* mCMMLFormatBlock;
+ sCMMLFormatBlock mCMMLFormatBlock;
};
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj 2004-12-15 04:10:15 UTC (rev 8400)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj 2004-12-15 05:02:29 UTC (rev 8401)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper\libilliCore;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFCMMLRAWSOURCE_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -37,6 +37,7 @@
OutputFile="$(OutDir)/dsfCMMLRawSource.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses\Debug""
+ ModuleDefinitionFile="CMMLRawSourceFilter.def"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/dsfCMMLRawSource.pdb"
SubSystem="2"
@@ -71,7 +72,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper\libilliCore;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLRAWSOURCE_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
@@ -87,6 +88,7 @@
OutputFile="$(OutDir)/dsfCMMLRawSource.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\DXSDK\Lib;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses\Release""
+ ModuleDefinitionFile="CMMLRawSourceFilter.def"
GenerateDebugInformation="TRUE"
SubSystem="2"
OptimizeReferences="2"
@@ -123,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper\libilliCore;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLRAWSOURCE_EXPORTS"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="2"
@@ -140,6 +142,7 @@
OutputFile="$(OutDir)/dsfCMMLRawSource.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\DXSDK\Lib;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses\Release""
+ ModuleDefinitionFile="CMMLRawSourceFilter.def"
GenerateDebugInformation="TRUE"
SubSystem="2"
OptimizeReferences="2"
@@ -176,7 +179,7 @@
<Tool
Name="VCCLCompilerTool"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\helper\libilliCore;..\..\cmml\libWinCMMLParse;..\..\cmml\libCMMLTags"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLRAWSOURCE_EXPORTS"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="1"
@@ -193,6 +196,7 @@
OutputFile="$(OutDir)/dsfCMMLRawSource.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\DXSDK\Lib;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses\Release""
+ ModuleDefinitionFile="CMMLRawSourceFilter.def"
GenerateDebugInformation="TRUE"
SubSystem="2"
OptimizeReferences="2"
@@ -235,6 +239,9 @@
RelativePath=".\CMMLRawSourceFilter.cpp">
</File>
<File
+ RelativePath=".\CMMLRawSourceFilter.def">
+ </File>
+ <File
RelativePath=".\CMMLRawSourcePin.cpp">
</File>
<File
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/stdafx.h 2004-12-15 04:10:15 UTC (rev 8400)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/stdafx.h 2004-12-15 05:02:29 UTC (rev 8401)
@@ -13,4 +13,4 @@
// TODO: reference additional headers your program requires here
#include "cmmlrawsourcedllstuff.h"
#include "CMMLRawSourceFilter.h"
-#include "CMMLRawSourcePin.H"
\ No newline at end of file
+#include "CMMLRawSourcePin.h"
\ No newline at end of file
More information about the commits
mailing list