[xiph-commits] r6897 - in trunk/oggdsf: . build/oggcodecs
illiminable at dactyl.lonelymoon.com
illiminable
Sun Jun 27 02:09:48 PDT 2004
src/lib/codecs/flac/libs/libflac/src/libFLAC++/Debug_dynamic
src/lib/core/directshow/dsfOggDemux
Message-ID: <20040627090948.BAB399AAAB at dactyl.lonelymoon.com>
Author: illiminable
Date: Sun Jun 27 02:09:48 2004
New Revision: 6897
Modified:
trunk/oggdsf/README
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Debug_dynamic/BuildLog.htm
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FilterFileSource.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/IFilterDataSource.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj
Log:
* Inconsistent State
* Untested HTTP source for filters now semi-complete.
Modified: trunk/oggdsf/README
===================================================================
--- trunk/oggdsf/README 2004-06-26 21:01:28 UTC (rev 6896)
+++ trunk/oggdsf/README 2004-06-27 09:09:45 UTC (rev 6897)
@@ -6,6 +6,7 @@
In order to build these...
+
You need visual studio 2002 or 2003. There are no VC6 files.
You need NASM for FLAC to build. (lifes easier if it's at C:\NASM)
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-06-26 21:01:28 UTC (rev 6896)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-06-27 09:09:45 UTC (rev 6897)
@@ -45,12 +45,6 @@
}
"Entry"
{
- "MsmKey" = "8:_3593176E38AC1AC05CC9DB1224E63E5F"
- "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
- "MsmSig" = "8:G:\\DEV\\OGGDSF\\SRC\\LIB\\CODECS\\CMML\\DSFCMMLDECODER\\DEBUG\\LIBCMMLTAGS.DLL"
- }
- "Entry"
- {
"MsmKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:G:\\DEV\\OGGDSF\\SRC\\TOOLS\\OOOGGSTAT\\RELEASE\\OOOGGSTAT.EXE"
@@ -75,6 +69,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\WSOCK32.DLL"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:E:\\PROJECTS\\C++\\OGG\\LIBOOOGG\\DSFOGGMUX\\RELEASE\\DSFOGGMUX.DLL"
@@ -88,31 +88,31 @@
"Entry"
{
"MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
- "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
}
"Entry"
{
"MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
- "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
+ "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
}
"Entry"
{
"MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
}
"Entry"
{
"MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
- "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
+ "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
}
"Entry"
{
"MsmKey" = "8:_57E27F72FF7790C3FF18D6AB1F49D444"
- "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCP70D.DLL"
}
"Entry"
@@ -189,12 +189,6 @@
}
"Entry"
{
- "MsmKey" = "8:_5A8B344642EDF62A751438F4BCDA896B"
- "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
- "MsmSig" = "8:G:\\DEV\\OGGDSF\\SRC\\LIB\\CODECS\\CMML\\DSFCMMLDECODER\\DEBUG\\LIBWINCMMLPARSE.DLL"
- }
- "Entry"
- {
"MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:E:\\PROJECTS\\C++\\OGG\\LIBOOOGG\\LIBOOOGGSEEK\\RELEASE\\LIBOOOGGSEEK.DLL"
@@ -268,13 +262,13 @@
"Entry"
{
"MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
- "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
}
"Entry"
{
"MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
- "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
+ "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
}
"Entry"
@@ -292,19 +286,25 @@
"Entry"
{
"MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
+ "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
+ "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
"OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
}
"Entry"
{
"MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
- "OwnerKey" = "8:_DD3F37DC11D54B5996F597343A185E03"
+ "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
}
"Entry"
{
"MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "OwnerKey" = "8:_DD3F37DC11D54B5996F597343A185E03"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
}
"Entry"
@@ -334,12 +334,6 @@
"Entry"
{
"MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
- "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
- "MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
- }
- "Entry"
- {
- "MsmKey" = "8:_9A2ADE669A100D71F9E0B3753CDA677A"
"OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:C:\\WINDOWS\\SYSTEM32\\MSVCR70D.DLL"
}
@@ -609,11 +603,11 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{54DA9790-1474-11D3-8E00-00C04F6837D0}:_3593176E38AC1AC05CC9DB1224E63E5F"
+ "{54DA9790-1474-11D3-8E00-00C04F6837D0}:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
{
- "Signature" = "8:200000000ef56eff905ac4010e370ea4645bc4019c5b1772d24ac4010000000000c0020000000000000000006c006900620043004d004d004c0054006100670073002e0064006c006c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c004900420043004d004d007e0031002e0044004c004c0000000000"
- "SourcePath" = "8:libCMMLTags.dll"
- "TargetName" = "8:libCMMLTags.dll"
+ "Signature" = "8:2000000000207c22cb2bc101ead961c11e5cc40100207c22cb2bc10100000000005400000000000000000000770073006f0063006b00330032002e0064006c006c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+ "SourcePath" = "8:WSOCK32.dll"
+ "TargetName" = "8:WSOCK32.dll"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
"Condition" = "8:"
@@ -632,7 +626,7 @@
}
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_57E27F72FF7790C3FF18D6AB1F49D444"
{
- "Signature" = "8:2000000080dd2a10d295c101065bada2645bc40180dd2a10d295c1010000000000400b0000000000000000006d0073007600630070003700300064002e0064006c006c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+ "Signature" = "8:2000000080dd2a10d295c10110a1b6cc265cc40180dd2a10d295c1010000000000400b0000000000000000006d0073007600630070003700300064002e0064006c006c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"SourcePath" = "8:MSVCP70D.dll"
"TargetName" = "8:MSVCP70D.dll"
"Tag" = "8:"
@@ -651,27 +645,6 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{54DA9790-1474-11D3-8E00-00C04F6837D0}:_5A8B344642EDF62A751438F4BCDA896B"
- {
- "Signature" = "8:2000000084a57fff905ac401c2fb12a4645bc4013cdb9f74d24ac401000000000000010000000000000000006c0069006200570069006e0043004d004d004c00500061007200730065002e0064006c006c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c0049004200570049004e007e0031002e0044004c004c0000000000"
- "SourcePath" = "8:libWinCMMLParse.dll"
- "TargetName" = "8:libWinCMMLParse.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:TRUE"
- "IsDependency" = "11:TRUE"
- "IsolateTo" = "8:"
- }
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_81A3CDB604B64763884C387192BE6771"
{
"SourcePath" = "8:..\\..\\COPYRIGHTS"
@@ -694,7 +667,7 @@
}
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_9A2ADE669A100D71F9E0B3753CDA677A"
{
- "Signature" = "8:20000000803a49fed195c101ba1fb2a2645bc401803a49fed195c101000000000030080000000000000000006d0073007600630072003700300064002e0064006c006c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+ "Signature" = "8:20000000803a49fed195c1016a03b9cc265cc401803a49fed195c101000000000030080000000000000000006d0073007600630072003700300064002e0064006c006c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"SourcePath" = "8:MSVCR70D.dll"
"TargetName" = "8:MSVCR70D.dll"
"Tag" = "8:"
@@ -715,7 +688,7 @@
}
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_B2784574F1B848EABBE013669B46808C"
{
- "Signature" = "8:2000000036307013915ac4018cc37fa5645bc4018bcc02bbd95ac401000000000080030000000000000000006c006900620046004c00410043002e0064006c006c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+ "Signature" = "8:2000000010047b48bb5bc401501934ce265cc401726969bd265cc401000000000080030000000000000000006c006900620046004c00410043002e0064006c006c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"SourcePath" = "8:libFLAC.dll"
"TargetName" = "8:libFLAC.dll"
"Tag" = "8:"
@@ -1719,7 +1692,7 @@
}
"{B1E2BB22-187D-11D3-8E02-00C04F6837D0}:_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"
@@ -1868,7 +1841,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oggcodecs"
"ProductCode" = "8:{778DA93A-8AE4-4AD8-BF3E-43DA8AC06994}"
- "PackageCode" = "8:{16122CD2-DEE5-469E-963A-49A846EA2B53}"
+ "PackageCode" = "8:{6C6D0FCA-F606-4062-A79E-C544384B2D47}"
"UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Debug_dynamic/BuildLog.htm
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Debug_dynamic/BuildLog.htm 2004-06-26 21:01:28 UTC (rev 6896)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Debug_dynamic/BuildLog.htm 2004-06-27 09:09:45 UTC (rev 6897)
@@ -25,6 +25,7 @@
LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib
LIBPATH=
LOGONSERVER=\\TIGER
+ NM_BOUNDSCHECKER_ENABLED=1
NUMBER_OF_PROCESSORS=1
OS=Windows_NT
Path=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel
@@ -46,209 +47,10 @@
VSCOMNTOOLS="C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\"
windir=C:\WINDOWS
_ACP_ATLPROV=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\ATLPROV.DLL
- _ACP_INCLUDE=C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\..\lib\core\ogg\libOOOgg;..\..\lib\core\ogg\libVorbisComment;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg\libOOOgg;..\..\ogg\libOOOggSeek;..\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\ogg\libOOOgg;..\..\ogg\libOOOggSeek;..\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
_ACP_PATH=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Command Lines
-</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP00002C.rsp" with contents
-[
-/Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "FLACPP_API_EXPORTS" /D "_WINDOWS" /D "WIN32" /D "_USRDLL" /D "_WINDLL" /FD /EHsc /MDd /GR /Fp".\Debug_dynamic/libFLAC++_dynamic.pch" /Fo".\Debug_dynamic/" /Fd".\Debug_dynamic/" /FR".\Debug_dynamic/" /W3 /c /ZI /Gd
-"stream_encoder.cpp"
-"stream_decoder.cpp"
-"seekable_stream_encoder.cpp"
-"seekable_stream_decoder.cpp"
-"metadata.cpp"
-"file_encoder.cpp"
-"file_decoder.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP00002C.rsp /nologo"
-Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP00002D.rsp" with contents
-[
-/OUT:"..\..\obj\debug\bin/libFLAC++.dll" /INCREMENTAL /NOLOGO /DLL /DEBUG /PDB:".\..\..\obj\debug\lib/libFLAC++.pdb" /SUBSYSTEM:WINDOWS /IMPLIB:".\..\..\obj\debug\lib/libFLAC++.lib" /MACHINE:I386 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\obj\debug\lib\libFLAC.lib"
-"Debug_dynamic\file_decoder.obj"
-"Debug_dynamic\file_encoder.obj"
-"Debug_dynamic\metadata.obj"
-"Debug_dynamic\seekable_stream_decoder.obj"
-"Debug_dynamic\seekable_stream_encoder.obj"
-"Debug_dynamic\stream_decoder.obj"
-"Debug_dynamic\stream_encoder.obj"
-]
-Creating command line "link.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP00002D.rsp"
-</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
-Output Window
-</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Compiling...
-stream_encoder.cpp
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(54) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(60) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(66) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(72) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(78) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(84) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(90) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(96) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(102) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(108) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(114) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(120) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(126) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(132) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(138) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(144) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(150) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(156) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(180) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(186) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(192) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(198) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(240) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(246) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(252) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(297) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_encoder.cpp(303) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-stream_decoder.cpp
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_decoder.cpp(51) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_decoder.cpp(57) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_decoder.cpp(63) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_decoder.cpp(69) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_decoder.cpp(75) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_decoder.cpp(81) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_decoder.cpp(140) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_decoder.cpp(146) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_decoder.cpp(152) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_decoder.cpp(158) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\stream_decoder.cpp(164) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-seekable_stream_encoder.cpp
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(60) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(66) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(72) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(78) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(84) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(90) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(96) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(102) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(108) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(114) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(120) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(126) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(132) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(138) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(144) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(150) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(156) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(162) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(192) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(198) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(204) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(210) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(252) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(258) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(264) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(309) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_encoder.cpp(315) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-seekable_stream_decoder.cpp
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_decoder.cpp(54) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_decoder.cpp(60) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_decoder.cpp(66) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_decoder.cpp(72) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_decoder.cpp(78) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_decoder.cpp(84) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_decoder.cpp(90) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_decoder.cpp(108) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_decoder.cpp(159) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_decoder.cpp(165) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_decoder.cpp(171) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_decoder.cpp(177) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_decoder.cpp(183) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_decoder.cpp(189) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\seekable_stream_decoder.cpp(195) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-metadata.cpp
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\include\FLAC++\metadata.h(198) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\include\FLAC++\metadata.h(201) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\include\FLAC++\metadata.h(204) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(164) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(370) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(376) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(415) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(422) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(428) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(726) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(733) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(740) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(747) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(890) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(898) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(906) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(914) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(921) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(927) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(951) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(957) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(1008) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(1025) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(1031) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(1037) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(1056) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(1063) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(1069) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(1110) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(1116) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(1163) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(1169) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(1191) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(1202) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(1209) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\metadata.cpp(1221) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-file_encoder.cpp
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(64) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(70) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(76) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(82) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(88) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(94) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(100) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(106) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(112) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(118) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(124) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(130) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(136) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(142) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(148) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(154) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(160) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(166) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(172) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(208) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(214) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(220) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(226) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(268) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(274) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(280) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(324) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_encoder.cpp(330) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-file_decoder.cpp
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_decoder.cpp(59) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_decoder.cpp(65) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_decoder.cpp(71) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_decoder.cpp(77) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_decoder.cpp(83) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_decoder.cpp(89) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_decoder.cpp(95) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_decoder.cpp(101) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_decoder.cpp(125) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_decoder.cpp(171) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_decoder.cpp(177) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_decoder.cpp(183) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_decoder.cpp(189) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\file_decoder.cpp(195) : warning C4800: 'FLAC__bool' : forcing value to bool 'true' or 'false' (performance warning)
-Generating Code...
-Linking...
- Creating library .\..\..\obj\debug\lib/libFLAC++.lib and object .\..\..\obj\debug\lib/libFLAC++.exp
-</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
-Results
-</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>
-Build log was saved at "file://g:\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\src\libFLAC++\Debug_dynamic\BuildLog.htm"
-libFLAC++_dynamic - 0 error(s), 158 warning(s)</pre></table><table width=100% height=20 bgcolor=#CFCFE5><tr><td><font face=arial size=+2>
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>libFLAC++_dynamic - up-to-date.</pre></table><table width=100% height=20 bgcolor=#CFCFE5><tr><td><font face=arial size=+2>
</font></table></body></html>
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FilterFileSource.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FilterFileSource.h 2004-06-26 21:01:28 UTC (rev 6896)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FilterFileSource.h 2004-06-27 09:09:45 UTC (rev 6897)
@@ -4,7 +4,7 @@
using namespace std;
#include "IFilterDataSource.h"
-class FilterFileSource
+class OGG_DEMUX_API FilterFileSource
: public IFilterDataSource
{
public:
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp 2004-06-26 21:01:28 UTC (rev 6896)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp 2004-06-27 09:09:45 UTC (rev 6897)
@@ -2,6 +2,9 @@
#include "httpfilesource.h"
HTTPFileSource::HTTPFileSource(void)
+ : mWasError(false)
+ , mIsEOF(false)
+ , mIsOpen(false)
{
WORD locWinsockVersion = MAKEWORD(1,1);
WSADATA locWinsockData;
@@ -22,3 +25,187 @@
{
WSACleanup();
}
+
+void HTTPFileSource::DataProcessLoop() {
+
+ int locNumRead = 0;
+ char* locBuff = NULL;
+ const unsigned long RECV_BUFF_SIZE = 4096;
+ locBuff = new char[RECV_BUFF_SIZE];
+ while(true) {
+
+ locNumRead = recv(mSocket, locBuff, RECV_BUFF_SIZE, 0);
+ if (locNumRead == SOCKET_ERROR) {
+ mWasError = true;
+ break;
+ }
+
+ if (locNumRead == 0) {
+ mIsEOF = true;
+ break;
+ }
+ //Add to buffer
+ mStreamBuffer.write(locBuff, locNumRead);
+ }
+
+ delete locBuff;
+
+
+}
+
+bool HTTPFileSource::setupSocket(string inSourceLocation) {
+
+
+ IN_ADDR locAddress; //iaHost
+ LPHOSTENT locHostData;; //lpHost
+
+ bool locValidURL = splitURL(inSourceLocation);
+
+ locAddress.S_un.S_addr = inet_addr(mServerName.c_str());
+
+
+ if (locAddress.S_un.S_addr == INADDR_NONE) {
+ locHostData = gethostbyname(mServerName.c_str());
+ } else {
+ locHostData = gethostbyaddr((const char*)&locAddress, sizeof(struct in_addr), AF_INET);
+ }
+
+
+
+ if (locHostData == NULL) {
+ //Failed
+ return false;
+ }
+
+ mSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (mSocket = INVALID_SOCKET) {
+ //Failed
+ return false;
+ }
+
+
+ LPSERVENT locServiceData; //lpServEnt
+ SOCKADDR_IN locServiceSocketAddr; //saServer
+
+ locServiceData = getservbyname("http", "tcp");
+ if (locServiceData == NULL) {
+ locServiceSocketAddr.sin_port = htons(80);
+ } else {
+ locServiceSocketAddr.sin_port = locServiceData->s_port;
+ }
+
+
+
+ locServiceSocketAddr.sin_family = AF_INET;
+ locServiceSocketAddr.sin_addr = *((LPIN_ADDR)*locHostData->h_addr_list);
+
+
+ int locRetVal = 0;
+ locRetVal = connect(mSocket, (LPSOCKADDR)&locServiceSocketAddr, sizeof(SOCKADDR_IN));
+ if (locRetVal == SOCKET_ERROR) {
+ closesocket(mSocket);
+ return false;
+ }
+
+
+
+
+}
+
+bool HTTPFileSource::httpRequest(string inRequest) {
+
+ int locRetVal = send(mSocket, inRequest.c_str(), inRequest.length(), 0);
+
+ if (locRetVal == SOCKET_ERROR) {
+ closesocket(mSocket);
+ return false;
+ }
+}
+DWORD HTTPFileSource::ThreadProc(void) {
+
+ while(true) {
+ DWORD locThreadCommand = GetRequest();
+
+ switch(locThreadCommand) {
+ case THREAD_EXIT:
+
+ Reply(S_OK);
+ return S_OK;
+
+
+
+ case THREAD_RUN:
+
+ Reply(S_OK);
+ DataProcessLoop();
+ break;
+ }
+
+
+ }
+ return S_OK;
+}
+unsigned long HTTPFileSource::seek(unsigned long inPos) {
+ //Close the socket down
+ //Open up a new one to the same place.
+ //Make the partial content request.
+ return 0;
+}
+
+bool HTTPFileSource::splitURL(string inURL) {
+ return false;
+}
+void HTTPFileSource::closeSocket() {
+ closesocket(mSocket);
+}
+void HTTPFileSource::close() {
+ //Close the socket down.
+ closeSocket();
+}
+
+bool HTTPFileSource::startThread() {
+ if (ThreadExists() == FALSE) {
+ Create();
+ }
+ CallWorker(THREAD_RUN);
+ return true;
+}
+bool HTTPFileSource::open(string inSourceLocation) {
+ //Open network connection and start feeding data into a buffer
+ //
+
+ bool locIsOK = setupSocket(inSourceLocation);
+
+ if (!locIsOK) {
+ closeSocket();
+ return false;
+ }
+ locIsOK = startThread();
+
+
+ return locIsOK;
+}
+void HTTPFileSource::clear() {
+ //Reset flags.
+ mIsEOF = false;
+ mWasError = false;
+}
+bool HTTPFileSource::isEOF() {
+ if ((mStreamBuffer.tellp() - mStreamBuffer.tellg() == 0) && mIsEOF) {
+ return true;
+ } else {
+ return false;
+ }
+}
+unsigned long HTTPFileSource::read(char* outBuffer, unsigned long inNumBytes) {
+ //Reads from the buffer, will return 0 if nothing in buffer.
+ // If it returns 0 check the isEOF flag to see if it was the end of file or the network is just slow.
+
+ if(mIsEOF || mWasError) {
+ return 0;
+ } else {
+ mStreamBuffer.read(outBuffer, inNumBytes);
+ return mStreamBuffer.gcount();
+ }
+
+}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h 2004-06-26 21:01:28 UTC (rev 6896)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h 2004-06-27 09:09:45 UTC (rev 6897)
@@ -1,19 +1,49 @@
#pragma once
-
-class HTTPFileSource
+#include "oggdllstuff.h"
+#include <winsock.h>
+//#include <stdlib.h>
+#include <string>
+using namespace std;
+class OGG_DEMUX_API HTTPFileSource
: public IFilterDataSource
+ , public CAMThread
{
public:
HTTPFileSource(void);
~HTTPFileSource(void);
+ //Thread commands
+ static const int THREAD_RUN = 0;
+ static const int THREAD_EXIT = 1;
+ //
+ //IFilterDataSource Interface
virtual unsigned long seek(unsigned long inPos);
virtual void close() ;
virtual bool open(string inSourceLocation);
virtual void clear();
virtual bool isEOF();
virtual unsigned long read(char* outBuffer, unsigned long inNumBytes);
+ //
+ //CAMThread pure virtuals
+ DWORD HTTPFileSource::ThreadProc();
+ //
+
+
+protected:
virtual bool setupSocket(string inSourceLocation);
+ virtual void closeSocket();
+ virtual bool splitURL(string inURL);
+ bool httpRequest(string inRequest);
+ bool HTTPFileSource::startThread();
+ void DataProcessLoop();
+ string mServerName;
+ string mFileName;
+ SOCKET mSocket;
+ stringstream mStreamBuffer;
+
+ bool mIsEOF;
+ bool mWasError;
+ bool mIsOpen;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/IFilterDataSource.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/IFilterDataSource.h 2004-06-26 21:01:28 UTC (rev 6896)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/IFilterDataSource.h 2004-06-27 09:09:45 UTC (rev 6897)
@@ -1,6 +1,6 @@
#pragma once
-class IFilterDataSource
+class OGG_DEMUX_API IFilterDataSource
{
public:
virtual unsigned long seek(unsigned long inPos) = 0;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj 2004-06-26 21:01:28 UTC (rev 6896)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj 2004-06-27 09:09:45 UTC (rev 6897)
@@ -36,7 +36,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Strmbasd.lib Msvcrtd.lib Winmm.lib Strmiids.lib Quartz.lib"
+ AdditionalDependencies="Strmbasd.lib Msvcrtd.lib Winmm.lib Strmiids.lib Quartz.lib wsock32.lib"
ShowProgress="2"
OutputFile="$(OutDir)/dsfOggDemux.dll"
LinkIncremental="2"
More information about the commits
mailing list