[xiph-commits] r8272 - in trunk/oggdsf: build/oggcodecs docs
src/lib/core/directshow/libDirectshowAbstracts
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Tue Nov 23 11:20:57 PST 2004
Author: illiminable
Date: 2004-11-23 11:20:56 -0800 (Tue, 23 Nov 2004)
New Revision: 8272
Added:
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.cpp
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.h
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/docs/refactor.txt
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.h
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.cpp
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.h
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.cpp
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.h
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/libDirectshowAbstracts.vcproj
Log:
* Fix leaks with the media types not getting deleted from the abstract filter.
* Start moving the Seeking abstract class into the abstracts library.
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-11-23 18:34:42 UTC (rev 8271)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-11-23 19:20:56 UTC (rev 8272)
@@ -93,450 +93,408 @@
}
"Entry"
{
- "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
- "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
- "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_65EFE52655DF4119A626446C8F593760"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_B721259605524EFE965E8E131C1558D5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_695A6D70DADB417491C0662D82245C2B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_65EFE52655DF4119A626446C8F593760"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
+ "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
+ "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_68FAE41C2B024B34AD2DE52FA3109D38"
- "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
+ "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_695A6D70DADB417491C0662D82245C2B"
+ "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
+ "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
+ "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
+ "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_B721259605524EFE965E8E131C1558D5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
- "OwnerKey" = "8:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
- "OwnerKey" = "8:_695A6D70DADB417491C0662D82245C2B"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_65EFE52655DF4119A626446C8F593760"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8C7D05F60B4D4535952CC97F0BD5A61C"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
+ "MsmKey" = "8:_65EFE52655DF4119A626446C8F593760"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -567,6 +525,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_B2784574F1B848EABBE013669B46808C"
+ "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_B721259605524EFE965E8E131C1558D5"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -585,12 +549,6 @@
}
"Entry"
{
- "MsmKey" = "8:_D7835E050C942DE27CB20AF3D1EC70F4"
- "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_D9BE90D398094F15B881B22369C3A231"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -807,10 +765,10 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{A582A373-4685-4296-BEFE-614B80A702C3}:_4812D148C77C9833CE1C0D8D175B84A4"
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_46A378A9B03E4612A645053EDB884C20"
{
- "SourcePath" = "8:msxml3.dll"
- "TargetName" = "8:msxml3.dll"
+ "SourcePath" = "8:MSVCP71D.dll"
+ "TargetName" = "8:MSVCP71D.dll"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
"Condition" = "8:"
@@ -822,8 +780,8 @@
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
- "Register" = "3:4"
- "Exclude" = "11:TRUE"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
@@ -847,6 +805,26 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_655D5383153A6AB10D15352A7EABCC7A"
+ {
+ "SourcePath" = "8:MSVCR71D.dll"
+ "TargetName" = "8:MSVCR71D.dll"
+ "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:TRUE"
+ "IsolateTo" = "8:"
+ }
"{A582A373-4685-4296-BEFE-614B80A702C3}:_81A3CDB604B64763884C387192BE6771"
{
"SourcePath" = "8:..\\..\\COPYRIGHTS"
@@ -887,7 +865,7 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{A582A373-4685-4296-BEFE-614B80A702C3}:_D7835E050C942DE27CB20AF3D1EC70F4"
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_B2784574F1B848EABBE013669B46808C"
{
"SourcePath" = "8:libFLAC.dll"
"TargetName" = "8:libFLAC.dll"
@@ -983,7 +961,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oggcodecs"
"ProductCode" = "8:{EDCBAB86-104A-4A03-B7D6-DFD783573933}"
- "PackageCode" = "8:{630938C2-FEB1-42D2-8392-6C830AA9214A}"
+ "PackageCode" = "8:{4203124D-69B4-452A-84A5-5E61391379F3}"
"UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
@@ -2720,40 +2698,12 @@
}
"MergeModule"
{
- "{35A69C6E-5BA4-440D-803D-762B59A45393}:_68FAE41C2B024B34AD2DE52FA3109D38"
- {
- "UseDynamicProperties" = "11:TRUE"
- "IsDependency" = "11:TRUE"
- "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm"
- "Properties"
- {
- }
- "LanguageId" = "3:0"
- "Exclude" = "11:FALSE"
- "Folder" = "8:"
- "Feature" = "8:"
- "IsolateTo" = "8:"
- }
- "{35A69C6E-5BA4-440D-803D-762B59A45393}:_8C7D05F60B4D4535952CC97F0BD5A61C"
- {
- "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\\Release\\libCMMLTags.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTags\\Debug\\libCMMLTags.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2781,7 +2731,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0A1E63E5852E4F759F1A27E8F097727B"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggDump\\Release\\OOOggDump.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggDump\\Debug\\OOOggDump.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2809,7 +2759,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0D0DD40A31F842C68B09BE0CBDE1996B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACEncoder\\Release\\dsfFLACEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACEncoder\\Debug\\dsfFLACEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2837,7 +2787,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_13E9F6D7ED35430BA31BDDF95E6327B3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractVideoEncoder\\Release\\dsfAbstractVideoEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractVideoEncoder\\Debug\\dsfAbstractVideoEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2865,7 +2815,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_14E3067B71584FB5A245A2DA9D65D139"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libWinCMMLParse\\Release\\libWinCMMLParse.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libWinCMMLParse\\Debug\\libWinCMMLParse.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2893,7 +2843,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_24A1793CB89A464FB683A8A3BDA774DB"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Vorbis_Dynamic_Release\\vorbis.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Vorbis_Dynamic_Debug\\vorbis_d.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2921,7 +2871,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_273D851AE72C4D2EA8020A712DBFE5A3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfnativeflacsource\\release\\dsfNativeFLACSource.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfNativeFLACSource\\Debug\\dsfNativeFLACSource.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2949,7 +2899,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_3C7C3E6B832E481C8A36701A33FF3721"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Release\\OOOggStat.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Debug\\OOOggStat.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2977,7 +2927,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_408749AC43894882BEEBFF43737E505B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexDecoder\\Release\\dsfSpeexDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexDecoder\\Debug\\dsfSpeexDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3005,7 +2955,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_4EB6175B98B54613A5087D8EA257D00A"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libOOTheora\\Release\\libOOTheora.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libOOTheora\\Debug\\libOOTheora.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3033,7 +2983,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraDecoder\\Release\\dsfTheoraDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraDecoder\\Debug\\dsfTheoraDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3061,7 +3011,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_578B89273D59478F861AA5BC3600D074"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggMux\\Release\\dsfOggMux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggMux\\Debug\\dsfOggMux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3089,7 +3039,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_58F56CD02F64413B9459F3E151760A57"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOgg\\Release\\libOOOgg.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOgg\\Debug\\libOOOgg.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3117,7 +3067,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_5EB08DD30B564283AA9C9F27D80CF9E4"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOggSeek\\Release\\libOOOggSeek.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOggSeek\\Debug\\libOOOggSeek.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3145,7 +3095,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_65015192414F476999A68339F89BEA57"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLDecoder\\Release\\dsfCMMLDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLDecoder\\Debug\\dsfCMMLDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3173,7 +3123,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_65EFE52655DF4119A626446C8F593760"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractAudioEncoder\\Release\\dsfAbstractAudioEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractAudioEncoder\\Debug\\dsfAbstractAudioEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3199,65 +3149,9 @@
{
}
}
- "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_695A6D70DADB417491C0662D82245C2B"
- {
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractVideoDecoder\\Release\\dsfAbstractVideoDecoder.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:1"
- "OutputConfiguration" = "8:"
- "OutputGroupCanonicalName" = "8:Built"
- "OutputProjectGuid" = "8:{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}"
- "ShowKeyOutput" = "11:TRUE"
- "ExcludeFilters"
- {
- }
- }
- "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
- {
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractAudioDecoder\\Release\\dsfAbstracOggAudioDecoder.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:1"
- "OutputConfiguration" = "8:"
- "OutputGroupCanonicalName" = "8:Built"
- "OutputProjectGuid" = "8:{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}"
- "ShowKeyOutput" = "11:TRUE"
- "ExcludeFilters"
- {
- }
- }
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_83AF8D74700947168B69E69E5160F082"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\release\\bin\\libFLAC.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\debug\\bin\\libFLAC.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3285,7 +3179,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8976C400668B453CB941859C4F3C6E27"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACDecoder\\Release\\dsfFLACDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACDecoder\\Debug\\dsfFLACDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3313,7 +3207,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8D9A2E4C592D4118B80A4AE8394D8963"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexEncoder\\Release\\dsfSpeexEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexEncoder\\Debug\\dsfSpeexEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3341,7 +3235,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8F970C0B2593413CA2A3BBF5F2600387"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxDemux\\Release\\dsfAnxDemux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxDemux\\Debug\\dsfAnxDemux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3369,7 +3263,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_A5AAB8CB90C548F1820BC101A765616C"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSeeking\\Release\\dsfSeeking.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSeeking\\Debug\\dsfSeeking.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3397,7 +3291,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_AC8962A7F212481095173AB7C8C89025"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraEncoder\\Release\\dsfTheoraEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraEncoder\\Debug\\dsfTheoraEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3425,7 +3319,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_B721259605524EFE965E8E131C1558D5"
{
- "SourcePath" = "8:..\\..\\src\\lib\\helper\\libilliCore\\Release\\libilliCore.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\helper\\libilliCore\\Debug\\libilliCore.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3453,7 +3347,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggValidate\\Release\\OOOggValidate.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggValidate\\Debug\\OOOggValidate.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3481,7 +3375,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_D2048C8B212841C88E42F6ADDCA8B0A2"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSubtitleVMR9\\Release\\dsfSubtitleVMR9.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSubtitleVMR9\\Debug\\dsfSubtitleVMR9.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3509,7 +3403,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DB60960DC12343B89500B86D5AB10D02"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\release\\bin\\libFLAC++.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\debug\\bin\\libFLAC++.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3537,7 +3431,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DCF4ED7597F8492AA49DC521111ED0F5"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggDemux\\Release\\dsfOggDemux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggDemux\\Debug\\dsfOggDemux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3565,7 +3459,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_E1E372FA955046E6928BF533EA0AE6C3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libVorbisComment\\Release\\libVorbisComment.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libVorbisComment\\Debug\\libVorbisComment.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3593,7 +3487,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\helper\\libfishsound\\win32\\Release\\libfishsound.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\helper\\libfishsound\\win32\\Debug\\libfishsound.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3621,7 +3515,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EB09F87C612C40BCA34AC87060CFEFF1"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggCommentDump\\Release\\OOOggCommentDump.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggCommentDump\\Debug\\OOOggCommentDump.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3649,7 +3543,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EFEA71FFF2864107815DBDECCCCA1178"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisDecoder\\Release\\dsfVorbisDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisDecoder\\Debug\\dsfVorbisDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3677,7 +3571,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_FD547F0196C24DFBB9CAFCCEC06561BC"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisEncoder\\Release\\dsfVorbisEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisEncoder\\Debug\\dsfVorbisEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
Modified: trunk/oggdsf/docs/refactor.txt
===================================================================
--- trunk/oggdsf/docs/refactor.txt 2004-11-23 18:34:42 UTC (rev 8271)
+++ trunk/oggdsf/docs/refactor.txt 2004-11-23 19:20:56 UTC (rev 8272)
@@ -2,4 +2,15 @@
Fix the hardcoded buffer parameters in the decoders
-Fix the leaks caused by the accept media types.
\ No newline at end of file
+Fix the leaks caused by the accept media types.
+
+Move dsfSeeking to the Abstract DS library for all
+
+Finish converting the encoders to new abstraacts
+
+Check the CreateAndFillMediaType method... make it protected
+
+Make some of the small libraries static (libilliCore, libOOOggSeeking
+, libVorbisComment, libOOOgg??, libCMMLTags, winCMMLParse)
+
+Check the size by making the runtimes static
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.h 2004-11-23 18:34:42 UTC (rev 8271)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformFilter.h 2004-11-23 19:20:56 UTC (rev 8272)
@@ -35,8 +35,6 @@
//Local Includes
#include "directshowabstractsdllstuff.h"
-//External Includes
-#include "BasicSeekable.h"
//Forward Declarations
class AbstractTransformInputPin;
Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.cpp 2004-11-23 18:34:42 UTC (rev 8271)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.cpp 2004-11-23 19:20:56 UTC (rev 8272)
@@ -78,6 +78,10 @@
{
delete mStreamLock;
+ for (int i = 0; i < mAcceptableMediaTypes.size(); i++) {
+ delete mAcceptableMediaTypes[i];
+ }
+
}
Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.h 2004-11-23 18:34:42 UTC (rev 8271)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformInputPin.h 2004-11-23 19:20:56 UTC (rev 8272)
@@ -33,10 +33,8 @@
//Local Includes
#include "directshowabstractsdllstuff.h"
+#include "BasicSeekPassThrough.h"
-//External Includes
-#include "BasicSeekable.h"
-
//STL Includes
#include <vector>
//Debug only !
@@ -54,7 +52,7 @@
//Base Classes
: public CBaseInputPin
//http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directshow/htm/cbaseinputpinclass.asp
- , public BasicSeekable
+ , public BasicSeekPassThrough
{
public:
//Friend Classes
Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.cpp 2004-11-23 18:34:42 UTC (rev 8271)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.cpp 2004-11-23 19:20:56 UTC (rev 8272)
@@ -54,6 +54,10 @@
ReleaseDelegate();
delete mDataQueue;
mDataQueue = NULL;
+
+ for (int i = 0; i < mAcceptableMediaTypes.size(); i++) {
+ delete mAcceptableMediaTypes[i];
+ }
}
STDMETHODIMP AbstractTransformOutputPin::NonDelegatingQueryInterface(REFIID riid, void **ppv)
Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.h 2004-11-23 18:34:42 UTC (rev 8271)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.h 2004-11-23 19:20:56 UTC (rev 8272)
@@ -33,10 +33,8 @@
//Local Includes
#include "directshowabstractsdllstuff.h"
+#include "BasicSeekPassThrough.h"
-//External Includes
-#include "BasicSeekable.h"
-
//STL Includes
#include <vector>
using namespace std;
@@ -48,7 +46,7 @@
//Base Classes
: public CBaseOutputPin
//http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directshow/htm/cbaseoutputpinclass.asp
- , public BasicSeekable
+ , public BasicSeekPassThrough
{
public:
//COM Initialisation
Added: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.cpp 2004-11-23 18:34:42 UTC (rev 8271)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.cpp 2004-11-23 19:20:56 UTC (rev 8272)
@@ -0,0 +1,336 @@
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
+//Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
+//Organisation (CSIRO) Australia
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+//notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+//notice, this list of conditions and the following disclaimer in the
+//documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of CSIRO Australia nor the names of its
+//contributors may be used to endorse or promote products derived from
+//this software without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+#include "StdAfx.h"
+#include "BasicSeekPassThrough.h"
+
+BasicSeekPassThrough::BasicSeekPassThrough(IMediaSeeking* inDelegate)
+ //: CUnknown(NAME("Basic Seekable Thing"), NULL, &mHR)
+{
+ mSeekDelegate = inDelegate;
+ //mSeekTimeBase = 0;
+
+ mSeekingCap = 0;
+ mSeekingCap = AM_SEEKING_CanSeekAbsolute |
+ AM_SEEKING_CanSeekForwards |
+ AM_SEEKING_CanSeekBackwards |
+ //AM_SEEKING_CanGetCurrentPos |
+ AM_SEEKING_CanGetStopPos |
+ AM_SEEKING_CanGetDuration;
+
+ string x = "g:\\logs\\seeker.log";
+ seekDebug.open(x.c_str(), ios_base::out);
+
+}
+
+BasicSeekPassThrough::BasicSeekPassThrough(void)
+ //: CUnknown(NAME("Basic Seekable Thing"), NULL, &mHR)
+{
+ //mSeekTimeBase = 0;
+ mSeekDelegate = NULL;
+ mSeekingCap = AM_SEEKING_CanSeekAbsolute |
+ AM_SEEKING_CanSeekForwards |
+ AM_SEEKING_CanSeekBackwards |
+ //AM_SEEKING_CanGetCurrentPos |
+ AM_SEEKING_CanGetStopPos |
+ AM_SEEKING_CanGetDuration;
+
+ string x = "g:\\logs\\seeker.log";
+ seekDebug.open(x.c_str(), ios_base::out);
+
+
+}
+
+bool BasicSeekPassThrough::ReleaseDelegate() {
+ if (mSeekDelegate != NULL) {
+ mSeekDelegate->Release();
+ mSeekDelegate = NULL;
+ }
+ return true;
+}
+
+bool BasicSeekPassThrough::SetDelegate(IMediaSeeking* inDelegate) {
+ mSeekDelegate = inDelegate;
+ return true;
+}
+BasicSeekPassThrough::~BasicSeekPassThrough(void)
+{
+ //TODO::: FActor this... use the new releasedelegate function.
+ if (mSeekDelegate != NULL) {
+ mSeekDelegate->Release();
+ mSeekDelegate = NULL;
+ }
+ seekDebug.close();
+}
+//IMediaSeeking Interface
+STDMETHODIMP BasicSeekPassThrough::GetCapabilities(DWORD* inCapabilities) {
+//typedef
+//enum AM_SEEKING_SeekingCapabilities {
+// AM_SEEKING_CanSeekAbsolute = 0x1,
+// AM_SEEKING_CanSeekForwards = 0x2,
+// AM_SEEKING_CanSeekBackwards = 0x4,
+// AM_SEEKING_CanGetCurrentPos = 0x8,
+// AM_SEEKING_CanGetStopPos = 0x10,
+// AM_SEEKING_CanGetDuration = 0x20,
+// AM_SEEKING_CanPlayBackwards = 0x40,
+// AM_SEEKING_CanDoSegments = 0x80,
+// AM_SEEKING_Source = 0x100
+//} AM_SEEKING_SEEKING_CAPABILITIES;
+
+
+ //*inCapabilities = mSeekingCap;
+ //return S_OK;
+
+ if (mSeekDelegate != NULL) {
+ seekDebug<<"GetCaps : Passed on..."<<endl;
+ return mSeekDelegate->GetCapabilities(inCapabilities);
+ } else {
+ seekDebug<<"GetCaps : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+
+}
+STDMETHODIMP BasicSeekPassThrough::CheckCapabilities(DWORD* outCapabilities) {
+
+
+ //if (inCapabilities == NULL) {
+ // return E_POINTER;
+ //}
+ //*inCapabilities &= mSeekingCap;
+
+ //if (*inCapabilities == mSeekingCap) {
+ // return S_OK;
+ //} else {
+ // return E_NOTIMPL;
+ //}
+
+
+ if (mSeekDelegate != NULL) {
+ seekDebug<<"CheckCaps : Passed on..."<<endl;
+ return mSeekDelegate->CheckCapabilities(outCapabilities);
+ } else {
+ seekDebug<<"CheckCaps : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+
+}
+STDMETHODIMP BasicSeekPassThrough::IsFormatSupported(const GUID* inFormat) {
+
+ //if (inFormat == NULL) {
+ // return E_POINTER;
+ //}
+ //if (*inFormat == TIME_FORMAT_MEDIA_TIME) {
+ // return S_OK;
+ //} else {
+ // return S_FALSE;
+ //}
+
+ if (mSeekDelegate != NULL) {
+ //seekDebug<<"IsFromatsupp : Passed on..."<<endl;
+ return mSeekDelegate->IsFormatSupported(inFormat);
+ } else {
+ //seekDebug<<"IsFromatsupp : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+
+}
+STDMETHODIMP BasicSeekPassThrough::QueryPreferredFormat(GUID* outFormat) {
+ //if (inFormat == NULL) {
+ // return E_POINTER;
+ //}
+
+ //*outFormat = TIME_FORMAT_MEDIA_TIME;
+
+ //return S_OK;
+ if (mSeekDelegate != NULL) {
+ //seekDebug<<"Query preff : Passed on..."<<endl;
+ return mSeekDelegate->QueryPreferredFormat(outFormat);
+ } else {
+ //seekDebug<<"Query preff : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+
+}
+STDMETHODIMP BasicSeekPassThrough::SetTimeFormat(const GUID* inFormat) {
+
+ if (mSeekDelegate != NULL) {
+ //seekDebug<<"SetTimeformat :Passed on..."<<endl;
+ return mSeekDelegate->SetTimeFormat(inFormat);
+ } else {
+ //seekDebug<<"SetTimeformat : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+}
+
+STDMETHODIMP BasicSeekPassThrough::GetTimeFormat( GUID *outFormat) {
+ if (mSeekDelegate != NULL) {
+ //seekDebug<<"Gettimeformat : Passed on..."<<endl;
+ return mSeekDelegate->GetTimeFormat(outFormat);
+ } else {
+ //seekDebug<<"Gettimeformat : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+}
+STDMETHODIMP BasicSeekPassThrough::GetDuration(LONGLONG* outDuration) {
+
+ if (mSeekDelegate != NULL) {
+ //seekDebug<<"Getdureation : Passed on..."<<endl;
+ return mSeekDelegate->GetDuration(outDuration);
+ } else {
+ //seekDebug<<"Getdureation : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+ //return E_NOTIMPL;
+}
+STDMETHODIMP BasicSeekPassThrough::GetStopPosition(LONGLONG* inStop) {
+ if (mSeekDelegate != NULL) {
+ //seekDebug<<"Getstoppos : Passed on..."<<endl;
+ return mSeekDelegate->GetStopPosition(inStop);
+ } else {
+ //seekDebug<<"Getstoppos : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+ //return E_NOTIMPL;
+}
+STDMETHODIMP BasicSeekPassThrough::GetCurrentPosition(LONGLONG* outCurrent) {
+ //return E_NOTIMPL;
+
+ if (mSeekDelegate != NULL) {
+ //seekDebug<<"Getcurrpos : Passed on..."<<endl;
+ return mSeekDelegate->GetCurrentPosition(outCurrent);
+ } else {
+ //seekDebug<<"Getcurrpos : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+}
+STDMETHODIMP BasicSeekPassThrough::ConvertTimeFormat(LONGLONG* outTarget, const GUID* inTargetFormat, LONGLONG inSource, const GUID* inSourceFormat) {
+ //return E_NOTIMPL;
+ if (mSeekDelegate != NULL) {
+ //seekDebug<<"ConvTimeformat : Passed on..."<<endl;
+ return mSeekDelegate->ConvertTimeFormat(outTarget, inTargetFormat, inSource, inSourceFormat);
+ } else {
+ //seekDebug<<"ConvTimeformat : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+}
+STDMETHODIMP BasicSeekPassThrough::SetPositions(LONGLONG* inoutCurrent, DWORD inCurrentFlags, LONGLONG* inStop, DWORD inStopFlags) {
+ if (mSeekDelegate != NULL) {
+ //seekDebug<<"Set pos : Requested Time : "<<*inoutCurrent<<endl;
+ HRESULT locHR = mSeekDelegate->SetPositions(inoutCurrent, inCurrentFlags, inStop, inStopFlags);
+ if (locHR == S_OK) {
+ //mSeekTimeBase = *inoutCurrent;
+ //seekDebug<<"Set Pos : Actual Time : "<<*inoutCurrent<<endl;
+
+ }
+ return locHR;
+ } else {
+ //seekDebug<<"Set pos : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+
+}
+STDMETHODIMP BasicSeekPassThrough::GetPositions(LONGLONG* outCurrent, LONGLONG* outStop) {
+ if (mSeekDelegate != NULL) {
+ //seekDebug<<"GetPos : Passed on..."<<endl;
+ return mSeekDelegate->GetPositions(outCurrent, outStop);
+ } else {
+ //seekDebug<<"GetPos : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+
+}
+STDMETHODIMP BasicSeekPassThrough::GetAvailable(LONGLONG* outEarliest, LONGLONG* outLatest) {
+ if (mSeekDelegate != NULL) {
+ //seekDebug<<"Getavail : Passed on..."<<endl;
+ return mSeekDelegate->GetAvailable(outEarliest, outLatest);
+ } else {
+ //seekDebug<<"Getavail : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+}
+STDMETHODIMP BasicSeekPassThrough::SetRate(double inRate) {
+
+ if (mSeekDelegate != NULL) {
+ //seekDebug<<"Setrate : Passed on..."<<endl;
+ return mSeekDelegate->SetRate(inRate);
+ } else {
+ //seekDebug<<"Setrate : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+}
+STDMETHODIMP BasicSeekPassThrough::GetRate(double* outRate) {
+ if (mSeekDelegate != NULL) {
+ //seekDebug<<"Getrate : Passed on..."<<endl;
+ return mSeekDelegate->GetRate(outRate);
+ } else {
+ //seekDebug<<"Getrate : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+}
+STDMETHODIMP BasicSeekPassThrough::GetPreroll(LONGLONG* outPreroll) {
+ if (mSeekDelegate != NULL) {
+ //seekDebug<<"Getpreroll : Passed on..."<<endl;
+ return mSeekDelegate->GetPreroll(outPreroll);
+ } else {
+ //seekDebug<<"Getpreroll : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+}
+STDMETHODIMP BasicSeekPassThrough::IsUsingTimeFormat(const GUID* inFormat) {
+if (mSeekDelegate != NULL) {
+ //seekDebug<<"Isusingtimeformat : Passed on..."<<endl;
+ return mSeekDelegate->IsUsingTimeFormat(inFormat);
+ } else {
+ //seekDebug<<"Isusingtimeformat : NULL Delegate"<<endl;
+ //This is probably wrong.
+ return E_NOTIMPL;
+ }
+}
+//
\ No newline at end of file
Added: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.h 2004-11-23 18:34:42 UTC (rev 8271)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.h 2004-11-23 19:20:56 UTC (rev 8272)
@@ -0,0 +1,81 @@
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
+//Copyright (C) 2003, 2004 Commonwealth Scientific and Industrial Research
+//Organisation (CSIRO) Australia
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+//notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+//notice, this list of conditions and the following disclaimer in the
+//documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of CSIRO Australia nor the names of its
+//contributors may be used to endorse or promote products derived from
+//this software without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+#pragma once
+
+//STL Includes
+#include <fstream>
+using namespace std;
+
+class BasicSeekPassThrough
+ //Base classes.
+ : public IMediaSeeking
+{
+public:
+ //Constructors
+ BasicSeekPassThrough(void);
+ BasicSeekPassThrough(IMediaSeeking* inDelegate);
+ virtual ~BasicSeekPassThrough(void);
+
+ //Delegate Control Methods.
+ bool SetDelegate(IMediaSeeking* inDelegate);
+ bool ReleaseDelegate();
+
+ //IMediaSeeking Interface
+ virtual STDMETHODIMP GetCapabilities(DWORD *pCapabilities);
+ virtual STDMETHODIMP CheckCapabilities(DWORD *pCapabilities);
+ virtual STDMETHODIMP IsFormatSupported(const GUID *pFormat);
+ virtual STDMETHODIMP QueryPreferredFormat(GUID *pFormat);
+ virtual STDMETHODIMP SetTimeFormat(const GUID *pFormat);
+ virtual STDMETHODIMP GetTimeFormat( GUID *pFormat);
+ virtual STDMETHODIMP GetDuration(LONGLONG *pDuration);
+ virtual STDMETHODIMP GetStopPosition(LONGLONG *pStop);
+ virtual STDMETHODIMP GetCurrentPosition(LONGLONG *pCurrent);
+ virtual STDMETHODIMP ConvertTimeFormat(LONGLONG *pTarget, const GUID *pTargetFormat, LONGLONG Source, const GUID *pSourceFormat);
+ virtual STDMETHODIMP SetPositions(LONGLONG *pCurrent,DWORD dwCurrentFlags,LONGLONG *pStop,DWORD dwStopFlags);
+ virtual STDMETHODIMP GetPositions(LONGLONG *pCurrent, LONGLONG *pStop);
+ virtual STDMETHODIMP GetAvailable(LONGLONG *pEarliest, LONGLONG *pLatest);
+ virtual STDMETHODIMP SetRate(double dRate);
+ virtual STDMETHODIMP GetRate(double *dRate);
+ virtual STDMETHODIMP GetPreroll(LONGLONG *pllPreroll);
+ virtual STDMETHODIMP IsUsingTimeFormat(const GUID *pFormat);
+
+protected:
+ //Member data
+ IMediaSeeking* mSeekDelegate;
+ HRESULT mHR;
+ DWORD mSeekingCap;
+
+ //Debug only.
+ fstream seekDebug;
+};
Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/libDirectshowAbstracts.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/libDirectshowAbstracts.vcproj 2004-11-23 18:34:42 UTC (rev 8271)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/libDirectshowAbstracts.vcproj 2004-11-23 19:20:56 UTC (rev 8272)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""c:\dxsdk\Samples\C++\DirectShow\BaseClasses";..\dsfSeeking"
+ AdditionalIncludeDirectories=""c:\dxsdk\Samples\C++\DirectShow\BaseClasses""
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -61,7 +61,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""c:\dxsdk\Samples\C++\DirectShow\BaseClasses";..\dsfSeeking"
+ AdditionalIncludeDirectories=""c:\dxsdk\Samples\C++\DirectShow\BaseClasses""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
@@ -111,6 +111,9 @@
RelativePath=".\AbstractTransformOutputPin.cpp">
</File>
<File
+ RelativePath=".\BasicSeekPassThrough.cpp">
+ </File>
+ <File
RelativePath=".\stdafx.cpp">
<FileConfiguration
Name="Debug|Win32">
@@ -140,6 +143,9 @@
RelativePath=".\AbstractTransformOutputPin.h">
</File>
<File
+ RelativePath=".\BasicSeekPassThrough.h">
+ </File>
+ <File
RelativePath=".\directshowabstractsdllstuff.h">
</File>
<File
More information about the commits
mailing list