[xiph-commits] r17386 - in trunk/oggdsf: sln/oggdsf_vs2005 sln/oggdsf_vs2008 src/lib/codecs/vorbis/filters/dsfVorbisDecoder src/lib/codecs/vorbis/libs src/lib/codecs/vorbis/libs/libOOVorbis src/lib/codecs/webm/webmdshow/libmkvparser src/lib/helper/common
cristianadam at svn.xiph.org
cristianadam at svn.xiph.org
Fri Sep 17 08:25:53 PDT 2010
Author: cristianadam
Date: 2010-09-17 08:25:53 -0700 (Fri, 17 Sep 2010)
New Revision: 17386
Removed:
trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOTremor/
Modified:
trunk/oggdsf/sln/oggdsf_vs2005/oggdsf.sln
trunk/oggdsf/sln/oggdsf_vs2008/oggdsf.sln
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.cpp
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.h
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h
trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.cpp
trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.h
trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/libOOVorbis-2005.vcproj
trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/libOOVorbis.vcproj
trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/mkvparserstreamaudio.cpp
trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/mkvparserstreamaudio.hpp
trunk/oggdsf/src/lib/helper/common/VorbisTypes.h
Log:
Merged patch from Hwasoo Lee in order to have vobisdecoder connect to webmsplitter.
Removed libOOTremor because now libtremor is a drop-in replacement to libvorbis.
Modified: trunk/oggdsf/sln/oggdsf_vs2005/oggdsf.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_vs2005/oggdsf.sln 2010-09-15 07:21:11 UTC (rev 17385)
+++ trunk/oggdsf/sln/oggdsf_vs2005/oggdsf.sln 2010-09-17 15:25:53 UTC (rev 17386)
@@ -133,11 +133,11 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisDecoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisDecoder\dsfVorbisDecoder-2005.vcproj", "{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}"
ProjectSection(ProjectDependencies) = postProject
+ {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+ {C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {C97A67F9-B786-41FA-9FC9-13167FE2BA49}
{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
- {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {620C8CE0-D182-4C0E-B83E-05656ECA971B} = {620C8CE0-D182-4C0E-B83E-05656ECA971B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisEncoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisEncoder\dsfVorbisEncoder-2005.vcproj", "{D74A626E-C8CB-4787-913E-2E637FC04F2B}"
@@ -170,11 +170,6 @@
{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOTremor", "..\..\src\lib\codecs\vorbis\libs\libOOTremor\libOOTremor-2005.vcproj", "{620C8CE0-D182-4C0E-B83E-05656ECA971B}"
- ProjectSection(ProjectDependencies) = postProject
- {7A8E774E-DD94-43B8-8758-6F9F656CC8D2} = {7A8E774E-DD94-43B8-8758-6F9F656CC8D2}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOVorbis", "..\..\src\lib\codecs\vorbis\libs\libOOVorbis\libOOVorbis-2005.vcproj", "{C97A67F9-B786-41FA-9FC9-13167FE2BA49}"
ProjectSection(ProjectDependencies) = postProject
{3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}
@@ -886,32 +881,6 @@
{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.Release|x64.ActiveCfg = Release|x64
{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.Release|x64.Build.0 = Release|x64
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Win32.ActiveCfg = Debug|Win32
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Win32.Build.0 = Debug|Win32
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|x64.ActiveCfg = Debug|x64
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|x64.Build.0 = Debug|x64
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Win32.ActiveCfg = Release|Win32
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Win32.Build.0 = Release|Win32
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|x64.ActiveCfg = Release|x64
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|x64.Build.0 = Release|x64
{C97A67F9-B786-41FA-9FC9-13167FE2BA49}.Debug|Win32.ActiveCfg = Debug|Win32
{C97A67F9-B786-41FA-9FC9-13167FE2BA49}.Debug|Win32.Build.0 = Debug|Win32
{C97A67F9-B786-41FA-9FC9-13167FE2BA49}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -1226,7 +1195,6 @@
{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {D23A7CD4-0625-44ED-9CA1-6E5302EDBC71}
{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {EADB5C21-7F67-43A3-89C8-7D89FF0040C4}
{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {EADB5C21-7F67-43A3-89C8-7D89FF0040C4}
- {620C8CE0-D182-4C0E-B83E-05656ECA971B} = {EADB5C21-7F67-43A3-89C8-7D89FF0040C4}
{C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {EADB5C21-7F67-43A3-89C8-7D89FF0040C4}
{7A8E774E-DD94-43B8-8758-6F9F656CC8D2} = {EADB5C21-7F67-43A3-89C8-7D89FF0040C4}
{3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {EADB5C21-7F67-43A3-89C8-7D89FF0040C4}
Modified: trunk/oggdsf/sln/oggdsf_vs2008/oggdsf.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_vs2008/oggdsf.sln 2010-09-15 07:21:11 UTC (rev 17385)
+++ trunk/oggdsf/sln/oggdsf_vs2008/oggdsf.sln 2010-09-17 15:25:53 UTC (rev 17386)
@@ -133,11 +133,11 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisDecoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisDecoder\dsfVorbisDecoder.vcproj", "{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}"
ProjectSection(ProjectDependencies) = postProject
+ {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+ {C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {C97A67F9-B786-41FA-9FC9-13167FE2BA49}
{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
- {223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {620C8CE0-D182-4C0E-B83E-05656ECA971B} = {620C8CE0-D182-4C0E-B83E-05656ECA971B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisEncoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisEncoder\dsfVorbisEncoder.vcproj", "{D74A626E-C8CB-4787-913E-2E637FC04F2B}"
@@ -170,11 +170,6 @@
{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOTremor", "..\..\src\lib\codecs\vorbis\libs\libOOTremor\libOOTremor.vcproj", "{620C8CE0-D182-4C0E-B83E-05656ECA971B}"
- ProjectSection(ProjectDependencies) = postProject
- {7A8E774E-DD94-43B8-8758-6F9F656CC8D2} = {7A8E774E-DD94-43B8-8758-6F9F656CC8D2}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOVorbis", "..\..\src\lib\codecs\vorbis\libs\libOOVorbis\libOOVorbis.vcproj", "{C97A67F9-B786-41FA-9FC9-13167FE2BA49}"
ProjectSection(ProjectDependencies) = postProject
{3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}
@@ -886,32 +881,6 @@
{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.Release|x64.ActiveCfg = Release|x64
{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.Release|x64.Build.0 = Release|x64
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Win32.ActiveCfg = Debug|Win32
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Win32.Build.0 = Debug|Win32
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|x64.ActiveCfg = Debug|x64
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Debug|x64.Build.0 = Debug|x64
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Win32.ActiveCfg = Release|Win32
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Win32.Build.0 = Release|Win32
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|x64.ActiveCfg = Release|x64
- {620C8CE0-D182-4C0E-B83E-05656ECA971B}.Release|x64.Build.0 = Release|x64
{C97A67F9-B786-41FA-9FC9-13167FE2BA49}.Debug|Win32.ActiveCfg = Debug|Win32
{C97A67F9-B786-41FA-9FC9-13167FE2BA49}.Debug|Win32.Build.0 = Debug|Win32
{C97A67F9-B786-41FA-9FC9-13167FE2BA49}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -1226,7 +1195,6 @@
{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {D23A7CD4-0625-44ED-9CA1-6E5302EDBC71}
{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2} = {EADB5C21-7F67-43A3-89C8-7D89FF0040C4}
{D74A626E-C8CB-4787-913E-2E637FC04F2B} = {EADB5C21-7F67-43A3-89C8-7D89FF0040C4}
- {620C8CE0-D182-4C0E-B83E-05656ECA971B} = {EADB5C21-7F67-43A3-89C8-7D89FF0040C4}
{C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {EADB5C21-7F67-43A3-89C8-7D89FF0040C4}
{7A8E774E-DD94-43B8-8758-6F9F656CC8D2} = {EADB5C21-7F67-43A3-89C8-7D89FF0040C4}
{3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {EADB5C21-7F67-43A3-89C8-7D89FF0040C4}
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.cpp 2010-09-15 07:21:11 UTC (rev 17385)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.cpp 2010-09-17 15:25:53 UTC (rev 17386)
@@ -59,10 +59,11 @@
&MEDIASUBTYPE_PCM
};
-const REGPINTYPES VorbisDecodeFilter::m_inputMediaTypes =
+const REGPINTYPES VorbisDecodeFilter::m_inputMediaTypes[] =
{
- &MEDIATYPE_OggPacketStream,
- &MEDIASUBTYPE_None
+ { &MEDIATYPE_OggPacketStream, &MEDIASUBTYPE_None },
+ { &MEDIATYPE_Audio, &MEDIASUBTYPE_Vorbis},
+ { &MEDIATYPE_Audio, &MEDIASUBTYPE_Vorbis2}
};
const AMOVIESETUP_PIN VorbisDecodeFilter::m_pinReg[] =
@@ -75,8 +76,8 @@
FALSE, //Cannot have more than one instance of this pin
&GUID_NULL, //Connects to filter (obsoleted)
NULL, //Connects to pin (obsoleted)
- 1, //Support two media type
- &m_inputMediaTypes //Pointer to media type (Audio/Vorbis or Audio/Speex)
+ sizeof(m_inputMediaTypes) / sizeof(REGPINTYPES),
+ m_inputMediaTypes //Pointer to media type (Audio/Vorbis or Audio/Speex)
} ,
{
@@ -171,6 +172,12 @@
mediaType->subtype = MEDIASUBTYPE_Vorbis;
mediaType->formattype = FORMAT_Vorbis;
acceptableTypes.push_back(mediaType);
+
+ mediaType = new CMediaType(&MEDIATYPE_Audio);
+ mediaType->subtype = MEDIASUBTYPE_Vorbis2;
+ mediaType->formattype = FORMAT_Vorbis2;
+ acceptableTypes.push_back(mediaType);
+
//Deleted in base class filter destructor.
mInputPin = new VorbisDecodeInputPin(this, m_pLock, mOutputPin, acceptableTypes);
@@ -234,6 +241,27 @@
PrintVorbisFormatInfo();
}
+void VorbisDecodeFilter::setVorbisFormat(VORBISFORMAT2* vorbisFormat2)
+{
+ if (!vorbisFormat2)
+ {
+ return;
+ }
+
+ delete mVorbisFormatInfo;
+ mVorbisFormatInfo = new VORBISFORMAT;
+
+ mVorbisFormatInfo->numChannels = vorbisFormat2->channels;
+ mVorbisFormatInfo->samplesPerSec = vorbisFormat2->samplesPerSec;
+ mVorbisFormatInfo->avgBitsPerSec = vorbisFormat2->bitsPerSample;
+ mVorbisFormatInfo->maxBitsPerSec = 0;
+ mVorbisFormatInfo->avgBitsPerSec = 0;
+ mVorbisFormatInfo->minBitsPerSec = 0;
+
+ PrintVorbisFormatInfo();
+}
+
+
void VorbisDecodeFilter::PrintVorbisFormatInfo()
{
LOG(logINFO) << "Vorbis Version: " << mVorbisFormatInfo->vorbisVersion
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.h 2010-09-15 07:21:11 UTC (rev 17385)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.h 2010-09-17 15:25:53 UTC (rev 17386)
@@ -39,6 +39,7 @@
//Forward Declarations
struct VORBISFORMAT;
+struct VORBISFORMAT2;
class VorbisDecodeInputPin;
class VorbisDecodeOutputPin;
@@ -56,7 +57,7 @@
virtual ~VorbisDecodeFilter();
static const wchar_t* NAME;
- static const AMOVIESETUP_MEDIATYPE m_inputMediaTypes;
+ static const AMOVIESETUP_MEDIATYPE m_inputMediaTypes[3];
static const AMOVIESETUP_MEDIATYPE m_outputMediaTypes;
static const AMOVIESETUP_PIN m_pinReg[];
static const AMOVIESETUP_FILTER m_filterReg;
@@ -67,12 +68,14 @@
//IWMPTranscodePolicy interface -- it's documented... but it doesn't really exist.
//HRESULT allowTranscode(VARIANT_BOOL* outAllowTranscode);
+
///COM CreateInstance Function
static CUnknown* WINAPI CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr);
virtual VORBISFORMAT* getVorbisFormatBlock();
virtual void setVorbisFormat(BYTE* inFormatBlock);
virtual void setVorbisFormat(VORBISFORMAT* vorbisFormat);
+ virtual void setVorbisFormat(VORBISFORMAT2* vorbisFormat2);
#ifdef WINCE
virtual LPAMOVIESETUP_FILTER GetSetupData();
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.cpp 2010-09-15 07:21:11 UTC (rev 17385)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.cpp 2010-09-17 15:25:53 UTC (rev 17386)
@@ -34,6 +34,7 @@
#include "VorbisDecodeInputPin.h"
#include "vorbisdecoderdllstuff.h"
+#include <assert.h>
VorbisDecodeInputPin::VorbisDecodeInputPin(AbstractTransformFilter* inFilter, CCritSec* inFilterLock,
AbstractTransformOutputPin* inOutputPin,
@@ -50,7 +51,8 @@
mDecodedByteCount(0),
mRateNumerator(RATE_DENOMINATOR),
mOggOutputPinInterface(NULL),
-mSentStreamOffset(false)
+mSentStreamOffset(false),
+m_isVorbisFormat2(false)
{
LOG(logDEBUG) << "Pin constructor";
ConstructCodec();
@@ -140,120 +142,151 @@
__int64 sampleDuration = 0;
inSample->GetTime(&tStart, &tStop);
- hr = TransformData(buffer, inSample->GetActualDataLength());
- if (hr != S_OK)
+ if (m_isVorbisFormat2) // Support VORBISFORMAT2
{
- return S_FALSE;
- }
- if (tStop > 0)
- {
- //Can dump it all downstream now
+ hr = TransformVorbis2(buffer, inSample->GetActualDataLength());
+ if (hr != S_OK)
+ return S_FALSE;
+
IMediaSample* sample;
- unsigned long bytesCopied = 0;
- unsigned long bytesToCopy = 0;
+ HRESULT hr = mOutputPin->GetDeliveryBuffer(&sample, NULL, NULL, NULL);
+ if (hr != S_OK)
+ return hr;
- REFERENCE_TIME globalOffset = 0;
- if (mFrameSize != 0 && mSampleRate != 0)
- {
- tStart = convertGranuleToTime(tStop) - (((mDecodedByteCount / mFrameSize) * UNITS) / mSampleRate);
- }
+ BYTE* buffer = NULL;
+ hr = sample->GetPointer(&buffer);
+ if (hr != S_OK)
+ return hr;
- //Handle stream offsetting
- if (!mSentStreamOffset && (mOggOutputPinInterface != NULL))
+ //TODO: Handling multi-channels such as 5.1 or 7.1, right now only handle one or two channels.
+ memcpy((void*)buffer, (const void*)mDecodedBuffer, mDecodedByteCount);
+
+ sample->SetTime(&tStart, &tStop);
+ sample->SetSyncPoint(TRUE);
+ hr = sample->SetActualDataLength(mDecodedByteCount);
+ assert(hr == S_OK);
+
+ hr = ((VorbisDecodeOutputPin*)(mOutputPin))->mDataQueue->Receive(sample);
+ if (hr != S_OK)
+ return hr;
+ }
+ else
+ {
+ hr = TransformData(buffer, inSample->GetActualDataLength());
+ if (hr != S_OK)
{
- mOggOutputPinInterface->notifyStreamBaseTime(tStart);
- mSentStreamOffset = true;
+ return S_FALSE;
}
-
- if (mOggOutputPinInterface != NULL)
+ if (tStop > 0)
{
- globalOffset = mOggOutputPinInterface->getGlobalBaseTime();
- }
+ //Can dump it all downstream now
+ IMediaSample* sample;
+ unsigned long bytesCopied = 0;
+ unsigned long bytesToCopy = 0;
- do
- {
- HRESULT hr = mOutputPin->GetDeliveryBuffer(&sample, NULL, NULL, NULL);
- if (hr != S_OK)
+ REFERENCE_TIME globalOffset = 0;
+ if (mFrameSize != 0 && mSampleRate != 0)
{
- return hr;
+ tStart = convertGranuleToTime(tStop) - (((mDecodedByteCount / mFrameSize) * UNITS) / mSampleRate);
}
- BYTE* locBuffer = NULL;
- hr = sample->GetPointer(&locBuffer);
-
- if (hr != S_OK)
+ //Handle stream offsetting
+ if (!mSentStreamOffset && (mOggOutputPinInterface != NULL))
{
- return hr;
+ mOggOutputPinInterface->notifyStreamBaseTime(tStart);
+ mSentStreamOffset = true;
}
- LOG(logDEBUG4) << __FUNCTIONW__ << " Sample Size: " << sample->GetSize();
- bytesToCopy = sample->GetSize();
-
- if (mDecodedByteCount - bytesCopied < sample->GetSize())
+ if (mOggOutputPinInterface != NULL)
{
- bytesToCopy = mDecodedByteCount - bytesCopied;
+ globalOffset = mOggOutputPinInterface->getGlobalBaseTime();
}
- LOG(logDEBUG4) << __FUNCTIONW__ << " Bytes to copy: " << bytesToCopy;
- LOG(logDEBUG4) << __FUNCTIONW__ << " Actual Buffer count = " << mOutputPin->actualBufferCount();
- //bytesCopied += bytesToCopy;
+ do
+ {
+ HRESULT hr = mOutputPin->GetDeliveryBuffer(&sample, NULL, NULL, NULL);
+ if (hr != S_OK)
+ {
+ return hr;
+ }
- sampleDuration = (((bytesToCopy/mFrameSize) * UNITS) / mSampleRate);
- tStop = tStart + sampleDuration;
+ BYTE* locBuffer = NULL;
+ hr = sample->GetPointer(&locBuffer);
- //Adjust the time stamps for rate and seeking
- REFERENCE_TIME adjustedStart = (tStart * RATE_DENOMINATOR) / mRateNumerator;
- REFERENCE_TIME adjustedStop = (tStop * RATE_DENOMINATOR) / mRateNumerator;
- adjustedStart -= (m_tStart + globalOffset);
- adjustedStop -= (m_tStart + globalOffset);
+ if (hr != S_OK)
+ {
+ return hr;
+ }
- __int64 seekStripOffset = 0;
- if (adjustedStop < 0)
- {
- sample->Release();
- }
- else
- {
- if (adjustedStart < 0)
+ LOG(logDEBUG4) << __FUNCTIONW__ << " Sample Size: " << sample->GetSize();
+ bytesToCopy = sample->GetSize();
+
+ if (mDecodedByteCount - bytesCopied < sample->GetSize())
{
- seekStripOffset = (-adjustedStart) * mSampleRate;
- seekStripOffset *= mFrameSize;
- seekStripOffset /= UNITS;
- seekStripOffset += (mFrameSize - (seekStripOffset % mFrameSize));
- __int64 strippedDuration = (((seekStripOffset/mFrameSize) * UNITS) / mSampleRate);
- adjustedStart += strippedDuration;
- }
+ bytesToCopy = mDecodedByteCount - bytesCopied;
+ }
- LOG(logDEBUG4) << __FUNCTIONW__ << " Seek strip offset: " << seekStripOffset;
+ LOG(logDEBUG4) << __FUNCTIONW__ << " Bytes to copy: " << bytesToCopy;
+ LOG(logDEBUG4) << __FUNCTIONW__ << " Actual Buffer count = " << mOutputPin->actualBufferCount();
+ //bytesCopied += bytesToCopy;
- if (bytesToCopy - seekStripOffset < 0)
+ sampleDuration = (((bytesToCopy/mFrameSize) * UNITS) / mSampleRate);
+ tStop = tStart + sampleDuration;
+
+ //Adjust the time stamps for rate and seeking
+ REFERENCE_TIME adjustedStart = (tStart * RATE_DENOMINATOR) / mRateNumerator;
+ REFERENCE_TIME adjustedStop = (tStop * RATE_DENOMINATOR) / mRateNumerator;
+ adjustedStart -= (m_tStart + globalOffset);
+ adjustedStop -= (m_tStart + globalOffset);
+
+ __int64 seekStripOffset = 0;
+ if (adjustedStop < 0)
{
sample->Release();
- }
- else
+ }
+ else
{
- //memcpy((void*)locBuffer, (const void*)&mDecodedBuffer[bytesCopied + seekStripOffset], bytesToCopy - seekStripOffset);
- reorderChannels(locBuffer, &mDecodedBuffer[bytesCopied + seekStripOffset], bytesToCopy - seekStripOffset);
+ if (adjustedStart < 0)
+ {
+ seekStripOffset = (-adjustedStart) * mSampleRate;
+ seekStripOffset *= mFrameSize;
+ seekStripOffset /= UNITS;
+ seekStripOffset += (mFrameSize - (seekStripOffset % mFrameSize));
+ __int64 strippedDuration = (((seekStripOffset/mFrameSize) * UNITS) / mSampleRate);
+ adjustedStart += strippedDuration;
+ }
- sample->SetTime(&adjustedStart, &adjustedStop);
- sample->SetMediaTime(&tStart, &tStop);
- sample->SetSyncPoint(TRUE);
- sample->SetActualDataLength(bytesToCopy - seekStripOffset);
- hr = ((VorbisDecodeOutputPin*)(mOutputPin))->mDataQueue->Receive(sample);
- if (hr != S_OK)
+ LOG(logDEBUG4) << __FUNCTIONW__ << " Seek strip offset: " << seekStripOffset;
+
+ if (bytesToCopy - seekStripOffset < 0)
{
- return hr;
+ sample->Release();
}
- tStart += sampleDuration;
+ else
+ {
+ //memcpy((void*)locBuffer, (const void*)&mDecodedBuffer[bytesCopied + seekStripOffset], bytesToCopy - seekStripOffset);
+ reorderChannels(locBuffer, &mDecodedBuffer[bytesCopied + seekStripOffset], bytesToCopy - seekStripOffset);
+
+ sample->SetTime(&adjustedStart, &adjustedStop);
+ sample->SetMediaTime(&tStart, &tStop);
+ sample->SetSyncPoint(TRUE);
+ sample->SetActualDataLength(bytesToCopy - seekStripOffset);
+ hr = ((VorbisDecodeOutputPin*)(mOutputPin))->mDataQueue->Receive(sample);
+ if (hr != S_OK)
+ {
+ return hr;
+ }
+ tStart += sampleDuration;
+ }
}
- }
- bytesCopied += bytesToCopy;
+ bytesCopied += bytesToCopy;
- } while(bytesCopied < mDecodedByteCount);
+ } while(bytesCopied < mDecodedByteCount);
- mDecodedByteCount = 0;
+ mDecodedByteCount = 0;
+ }
}
return S_OK;
}
@@ -324,8 +357,7 @@
VorbisDecoder::eVorbisResult locResult;
unsigned long locNumSamples = 0;
- locResult = mVorbisDecoder.decodePacket(inBuf, inNumBytes,(short*)(mDecodedBuffer + mDecodedByteCount),
- DECODED_BUFFER_SIZE - mDecodedByteCount, &locNumSamples);
+ locResult = mVorbisDecoder.DecodePacket(inBuf, inNumBytes,(short*) (mDecodedBuffer + mDecodedByteCount), locNumSamples);
if (locResult == VorbisDecoder::VORBIS_DATA_OK)
{
@@ -337,6 +369,21 @@
return S_OK;
}
+HRESULT VorbisDecodeInputPin::TransformVorbis2(const BYTE* const buffer, const long length_of_buffer)
+{
+ memset(mDecodedBuffer, 0, DECODED_BUFFER_SIZE);
+ unsigned long num_of_samples = 0;
+ const VorbisDecoder::eVorbisResult hr = mVorbisDecoder.DecodePacket(buffer, length_of_buffer, reinterpret_cast<short*>(mDecodedBuffer), num_of_samples);
+
+ if (hr == VorbisDecoder::VORBIS_DATA_OK)
+ {
+ mDecodedByteCount = num_of_samples * mFrameSize;
+ return S_OK;
+ }
+
+ return S_OK;
+}
+
VorbisDecodeFilter* VorbisDecodeInputPin::GetFilter()
{
return static_cast<VorbisDecodeFilter*>(mParentFilter);
@@ -363,6 +410,17 @@
LOG(logINFO) << __FUNCTIONW__ << " MEDIATYPE_Audio, MEDIASUBTYPE_Vorbis";
GetFilter()->setVorbisFormat(reinterpret_cast<VORBISFORMAT*>(inMediaType->pbFormat));
}
+ else if (inMediaType->majortype == MEDIATYPE_Audio &&
+ inMediaType->subtype == MEDIASUBTYPE_Vorbis2 &&
+ inMediaType->formattype == FORMAT_Vorbis2)
+ {
+ LOG(logINFO) << __FUNCTIONW__ << " MEDIATYPE_Audio, MEDIASUBTYPE_Vorbis2";
+
+ m_isVorbisFormat2 = true;
+ GetFilter()->setVorbisFormat(reinterpret_cast<VORBISFORMAT2*>(inMediaType->pbFormat));
+ mVorbisDecoder.Init(reinterpret_cast<VORBISFORMAT2*>(inMediaType->pbFormat));
+ }
+
}
else
{
@@ -431,11 +489,10 @@
if (strncmp((char*)inCodecHeaderPacket->packetData(), "\001vorbis", 7) == 0)
{
//TODO::: Possibly verify version
- if (mVorbisDecoder.decodePacket( inCodecHeaderPacket->packetData()
+ if (mVorbisDecoder.DecodePacket( inCodecHeaderPacket->packetData()
, inCodecHeaderPacket->packetSize()
, NULL
- , 0
- , &locDummy) == VorbisDecoder::VORBIS_HEADER_OK) {
+ , locDummy) == VorbisDecoder::VORBIS_HEADER_OK) {
mSetupState = VSS_SEEN_BOS;
LOG(logDEBUG) << "Saw first header";
return IOggDecoder::AHR_MORE_HEADERS_TO_COME;
@@ -447,11 +504,10 @@
case VSS_SEEN_BOS:
if (strncmp((char*)inCodecHeaderPacket->packetData(), "\003vorbis", 7) == 0)
{
- if (mVorbisDecoder.decodePacket( inCodecHeaderPacket->packetData()
+ if (mVorbisDecoder.DecodePacket( inCodecHeaderPacket->packetData()
, inCodecHeaderPacket->packetSize()
, NULL
- , 0
- , &locDummy) == VorbisDecoder::VORBIS_COMMENT_OK) {
+ , locDummy) == VorbisDecoder::VORBIS_COMMENT_OK) {
mSetupState = VSS_SEEN_COMMENT;
LOG(logDEBUG) << "Saw second header";
@@ -464,11 +520,10 @@
case VSS_SEEN_COMMENT:
if (strncmp((char*)inCodecHeaderPacket->packetData(), "\005vorbis", 7) == 0)
{
- if (mVorbisDecoder.decodePacket( inCodecHeaderPacket->packetData()
+ if (mVorbisDecoder.DecodePacket( inCodecHeaderPacket->packetData()
, inCodecHeaderPacket->packetSize()
, NULL
- , 0
- , &locDummy) == VorbisDecoder::VORBIS_CODEBOOK_OK) {
+ , locDummy) == VorbisDecoder::VORBIS_CODEBOOK_OK) {
//Is mBegun useful ?
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h 2010-09-15 07:21:11 UTC (rev 17385)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h 2010-09-17 15:25:53 UTC (rev 17386)
@@ -36,15 +36,7 @@
#include "AbstractTransformInputPin.h"
#include "VorbisDecodeInputPin.h"
#include "VorbisDecodeFilter.h"
-
-
-
-#ifdef USING_TREMOR
-#include "TremorDecoder.h"
-#define VorbisDecoder TremorDecoder
-#else
#include "VorbisDecoder.h"
-#endif
class VorbisDecodeFilter;
class VorbisDecodeOutputPin;
@@ -107,6 +99,7 @@
virtual bool ConstructCodec();
virtual void DestroyCodec();
virtual HRESULT TransformData(unsigned char* inBuf, long inNumBytes);
+ virtual HRESULT TransformVorbis2(const BYTE* const in_buffer, const long size_of_in_buffer);
void reorderChannels(unsigned char* inDestBuffer, const unsigned char* inSourceBuffer, unsigned long inNumBytes);
@@ -121,7 +114,6 @@
int mFrameSize;
int mSampleRate;
-
VorbisDecoder mVorbisDecoder;
unsigned char* mDecodedBuffer;
@@ -133,5 +125,7 @@
IOggOutputPin* mOggOutputPinInterface;
bool mSentStreamOffset;
+private:
+ bool m_isVorbisFormat2;
};
Modified: trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.cpp 2010-09-15 07:21:11 UTC (rev 17385)
+++ trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.cpp 2010-09-17 15:25:53 UTC (rev 17386)
@@ -30,27 +30,36 @@
//===========================================================================
#include "StdAfx.h"
+#include <guiddef.h>
#include "VorbisDecoder.h"
+#include "common/VorbisTypes.h"
-VorbisDecoder::VorbisDecoder(void)
- : mPacketCount(0)
- , mNumChannels(0)
- , mSampleRate(0)
+#include <assert.h>
+
+#ifdef USING_TREMOR
+ typedef ogg_int32_t pcm_t;
+#else
+ typedef float pcm_t;
+#endif
+
+VorbisDecoder::VorbisDecoder():
+mPacketCount(0),
+mNumChannels(0),
+mSampleRate(0)
{
vorbis_info_init(&mVorbisInfo);
vorbis_comment_init(&mVorbisComment);
-
}
-VorbisDecoder::~VorbisDecoder(void)
+VorbisDecoder::~VorbisDecoder()
{
}
VorbisDecoder::eVorbisResult VorbisDecoder::decodeHeader()
{
- int locRet = vorbis_synthesis_headerin(&mVorbisInfo, &mVorbisComment, &mWorkPacket);
- if (locRet < 0) {
- //Error
+ int ret = vorbis_synthesis_headerin(&mVorbisInfo, &mVorbisComment, &mWorkPacket);
+ if (ret < 0)
+ {
return VORBIS_HEADER_BAD;
}
@@ -59,111 +68,165 @@
VorbisDecoder::eVorbisResult VorbisDecoder::decodeComment()
{
- int locRet = vorbis_synthesis_headerin(&mVorbisInfo, &mVorbisComment, &mWorkPacket);
- if (locRet < 0) {
- //Error
+ int ret = vorbis_synthesis_headerin(&mVorbisInfo, &mVorbisComment, &mWorkPacket);
+ if (ret < 0)
+ {
return VORBIS_COMMENT_BAD;
}
return VORBIS_COMMENT_OK;
}
+
VorbisDecoder::eVorbisResult VorbisDecoder::decodeCodebook()
{
- int locRet = vorbis_synthesis_headerin(&mVorbisInfo, &mVorbisComment, &mWorkPacket);
- if (locRet < 0) {
- //Error
+ int ret = vorbis_synthesis_headerin(&mVorbisInfo, &mVorbisComment, &mWorkPacket);
+ if (ret < 0)
+ {
return VORBIS_CODEBOOK_BAD;
}
- locRet = vorbis_synthesis_init(&mVorbisState, &mVorbisInfo);
+ ret = vorbis_synthesis_init(&mVorbisState, &mVorbisInfo);
//TODO::: What return codes?
- locRet = vorbis_block_init(&mVorbisState, &mVorbisBlock);
+ ret = vorbis_block_init(&mVorbisState, &mVorbisBlock);
mNumChannels = mVorbisInfo.channels;
mSampleRate = mVorbisInfo.rate;
return VORBIS_CODEBOOK_OK;
}
-VorbisDecoder::eVorbisResult VorbisDecoder::decodePacket( const unsigned char* inPacket
- , unsigned long inPacketSize
- , short* outSamples
- , unsigned long inOutputBufferSize
- , unsigned long* outNumSamples)
+
+VorbisDecoder::eVorbisResult VorbisDecoder::PrepareEncoder()
{
- mWorkPacket.b_o_s = 0;
- mWorkPacket.bytes = inPacketSize;
- mWorkPacket.e_o_s = 0;
- mWorkPacket.granulepos = 0;
- mWorkPacket.packet = (unsigned char*)inPacket; //Naughty!
- mWorkPacket.packetno = mPacketCount;
+ if (mPacketCount == 0)
+ {
+ mPacketCount++;
+ mWorkPacket.b_o_s = 1;
+ return decodeHeader();
+ }
+ else if (mPacketCount == 1)
+ {
+ //Comment
+ mPacketCount++;
+ return decodeComment();
+ }
+ else if (mPacketCount == 2)
+ {
+ //Codebooks
+ mPacketCount++;
+ return decodeCodebook();
+ }
- *outNumSamples = 0;
+ return VORBIS_DATA_OK;
+}
- if (mPacketCount == 0) {
- mPacketCount++;
- mWorkPacket.b_o_s = 1;
- return decodeHeader();
- } else if (mPacketCount == 1) {
- //Comment
- mPacketCount++;
- return decodeComment();
- } else if (mPacketCount == 2) {
- //Codebooks
- mPacketCount++;
- return decodeCodebook();
- } else {
- mPacketCount++;
+void VorbisDecoder::Init(const VORBISFORMAT2* vf2)
+{
+ assert(vf2);
- int locRet = vorbis_synthesis(&mVorbisBlock, &mWorkPacket);
+ // Save the 3 vorbis header packets
- if (locRet != 0) {
- //Error
- return VORBIS_SYNTH_FAILED;
- }
+ int vorbisId = vf2->headerSize[0];
+ unsigned char* pVorbisId = (unsigned char*)vf2 + sizeof(VORBISFORMAT2);
- locRet = vorbis_synthesis_blockin(&mVorbisState, &mVorbisBlock);
+ int vorbisComment = vf2->headerSize[1];
+ unsigned char* pVorbisComment = (unsigned char*)vf2 + sizeof(VORBISFORMAT2) + vf2->headerSize[0];
- if (locRet != 0) {
- //Error
- return VORBIS_BLOCKIN_FAILED;
- }
+ int vorbisCodebook = vf2->headerSize[2];
+ unsigned char* pVorbisCodebook = (unsigned char*)vf2 + sizeof(VORBISFORMAT2) + vf2->headerSize[0] + vf2->headerSize[1];
- float** locPCM;
- int locNumSamples;
- int locTemp = 0;
- short* locOutBuffer;
-
- while ((locNumSamples = vorbis_synthesis_pcmout(&mVorbisState, &locPCM)) > 0) {
- if (locNumSamples * mNumChannels * sizeof(short) > inOutputBufferSize) {
- //TODO::: Buffer overflow
- } else {
-
- for (int chan= 0; chan < mNumChannels; chan++) {
- //Interleave offset
- locOutBuffer = outSamples + chan;
- //Pointer into one channel of pcm
- float* locOneChannel = locPCM[chan];
- for (int i = 0; i < locNumSamples; i++) {
- locTemp = (int)(locOneChannel[i] * 32767.0f);
- *locOutBuffer = clip16(locTemp);
+ vorbis_info_init(&mVorbisInfo);
+ vorbis_comment_init(&mVorbisComment);
- //Jump forward numChannels in the buffer
- locOutBuffer += mNumChannels;
- }
- }
+ ogg_packet ogg_pkt;
+ memset(&ogg_pkt, 0, sizeof(ogg_packet));
- vorbis_synthesis_read(&mVorbisState, locNumSamples);
- *outNumSamples = locNumSamples;
- }
+ ogg_pkt.packet = pVorbisId;
+ ogg_pkt.bytes = vorbisId;
+ ogg_pkt.b_o_s = 1;
+ ogg_pkt.packetno = mPacketCount++;
- }
+ // Build the "Comment Header" packet
+ ogg_packet ogg_comment;
+ memset(&ogg_comment, 0, sizeof(ogg_packet));
- return VORBIS_DATA_OK;
+ ogg_comment.packet = pVorbisComment;
+ ogg_comment.bytes = vorbisComment;
+ ogg_comment.b_o_s = 0;
+ ogg_comment.packetno = mPacketCount++;
+ // Build the "Setup Header" packet
+ ogg_packet ogg_codecsetup;
+ memset(&ogg_codecsetup, 0, sizeof(ogg_packet));
+ ogg_codecsetup.packet = pVorbisCodebook;
+ ogg_codecsetup.bytes = vorbisCodebook;
+ ogg_codecsetup.b_o_s = 0;
+ ogg_codecsetup.packetno = mPacketCount++;
-
+ int ret = vorbis_synthesis_headerin(&mVorbisInfo, &mVorbisComment, &ogg_pkt);
+ assert( ret >= 0);
+ ret = vorbis_synthesis_headerin(&mVorbisInfo, &mVorbisComment, &ogg_comment);
+ assert( ret >= 0);
+ ret = vorbis_synthesis_headerin(&mVorbisInfo, &mVorbisComment, &ogg_codecsetup);
+ assert( ret >= 0);
+
+ vorbis_synthesis_init(&mVorbisState, &mVorbisInfo);
+ vorbis_block_init(&mVorbisState, &mVorbisBlock);
+
+ mNumChannels = mVorbisInfo.channels;
+}
+
+VorbisDecoder::eVorbisResult VorbisDecoder::DecodePacket( const unsigned char* const packet,
+ const unsigned long packet_size,
+ short* pcm_samples,
+ unsigned long& num_of_pcm_samples)
+{
+ mWorkPacket.b_o_s = 0;
+ mWorkPacket.bytes = packet_size;
+ mWorkPacket.e_o_s = 0;
+ mWorkPacket.granulepos = 0;
+ mWorkPacket.packet = const_cast<unsigned char*>(packet);
+ mWorkPacket.packetno = mPacketCount;
+
+ mNumChannels = mVorbisInfo.channels;
+ mSampleRate = mVorbisInfo.rate;
+
+ if (mPacketCount <= 2)
+ {
+ return PrepareEncoder();
+ }
+ ++mPacketCount;
+
+ if (vorbis_synthesis(&mVorbisBlock, &mWorkPacket) == 0)
+ {
+ const int ret = vorbis_synthesis_blockin(&mVorbisState, &mVorbisBlock);
+ assert(ret == 0);
}
-}
\ No newline at end of file
+ pcm_t** pcm;
+ int samples = 0;
+
+ while ((samples = vorbis_synthesis_pcmout(&mVorbisState, &pcm)) > 0)
+ {
+ // TODO:: handling buffer overflow if the size is over 1 mega
+ // samples * mNumChannels * sizeof(short) > 1 mega
+
+ for (int ch = 0; ch < mNumChannels; ++ch)
+ {
+ short* temp_buffer = pcm_samples + ch;
+ const pcm_t* const one_channel = pcm[ch];
+
+ for (int i = 0; i < samples; ++i)
+ {
+ int temp = static_cast<int>(one_channel[i] * 32767.0f);
+ *temp_buffer = clip16(temp);
+
+ temp_buffer += mNumChannels;
+ }
+ }
+ num_of_pcm_samples = samples;
+ vorbis_synthesis_read(&mVorbisState, num_of_pcm_samples);
+ }
+ return VORBIS_DATA_OK;
+}
Modified: trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.h 2010-09-15 07:21:11 UTC (rev 17385)
+++ trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.h 2010-09-17 15:25:53 UTC (rev 17386)
@@ -30,16 +30,20 @@
//===========================================================================
#pragma once
+#ifdef USING_TREMOR
+#include <ivorbiscodec.h>
+#else
#include <vorbis/codec.h>
+#endif
+struct VORBISFORMAT2;
+
class VorbisDecoder
{
public:
- VorbisDecoder(void);
- ~VorbisDecoder(void);
+ VorbisDecoder();
+ ~VorbisDecoder();
-
-
enum eVorbisResult {
VORBIS_DATA_OK = 0,
VORBIS_HEADER_OK,
@@ -53,28 +57,28 @@
VORBIS_BLOCKIN_FAILED
};
- //bool setDecodeParams(SpeexDecodeSettings inSettings);
- eVorbisResult decodePacket( const unsigned char* inPacket
- , unsigned long inPacketSize
- , short* outSamples
- , unsigned long inOutputBufferSize
- , unsigned long* outNumSamples);
+ eVorbisResult DecodePacket(const unsigned char* const inPacket,
+ const unsigned long inPacketSize,
+ short* outSamples,
+ unsigned long& outNumSamples);
int numChannels() { return mNumChannels; }
int sampleRate() { return mSampleRate; }
+
+ void Init(const VORBISFORMAT2* vf2);
+
protected:
eVorbisResult decodeHeader();
eVorbisResult decodeComment();
eVorbisResult decodeCodebook();
+ eVorbisResult PrepareEncoder();
+
short clip16(int inVal) { return (short)((inVal > 32767) ? (32767) : ((inVal < -32768) ? (-32768) : (inVal))); }
unsigned long mPacketCount;
int mNumChannels;
int mSampleRate;
- //int mNumFrames;
- //int mNumExtraHeaders;
- //bool mIsVBR;
vorbis_info mVorbisInfo;
vorbis_comment mVorbisComment;
@@ -82,6 +86,4 @@
vorbis_block mVorbisBlock;
ogg_packet mWorkPacket;
-
-
};
Modified: trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/libOOVorbis-2005.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/libOOVorbis-2005.vcproj 2010-09-15 07:21:11 UTC (rev 17385)
+++ trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/libOOVorbis-2005.vcproj 2010-09-17 15:25:53 UTC (rev 17386)
@@ -1,260 +1,1035 @@
<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject ProjectType="Visual C++" Version="8.00" Name="libOOVorbis" ProjectGUID="{C97A67F9-B786-41FA-9FC9-13167FE2BA49}" RootNamespace="libOOVorbis" Keyword="Win32Proj">
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="libOOVorbis"
+ ProjectGUID="{C97A67F9-B786-41FA-9FC9-13167FE2BA49}"
+ RootNamespace="libOOVorbis"
+ Keyword="Win32Proj"
+ >
<Platforms>
- <Platform Name="Win32"/>
- <Platform Name="x64"/>
- <Platform Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"/>
- <Platform Name="Windows Mobile 5.0 Smartphone SDK (ARMV4I)"/>
- <Platform Name="Windows Mobile 6 Professional SDK (ARMV4I)"/>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ <Platform
+ Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ />
+ <Platform
+ Name="Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ />
+ <Platform
+ Name="Windows Mobile 6 Professional SDK (ARMV4I)"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
- <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool"/>
- <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;_DEBUG;_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" WarningLevel="4" Detect64BitPortabilityProblems="false" DebugInformationFormat="4" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCPostBuildEventTool"/>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;_DEBUG;_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="4"
+ CallingConvention="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
- <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="3"/>
- <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;_DEBUG;_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" WarningLevel="4" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCPostBuildEventTool"/>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;_DEBUG;_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ CallingConvention="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
- <Configuration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="1"/>
- <Tool Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)" MinimalRebuild="true" RuntimeLibrary="3" UsePrecompiledHeader="2" WarningLevel="4" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCCodeSignTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- <DeploymentTool ForceDirty="-1" RemoteDirectory="" RegisterOutput="0" AdditionalFiles=""/>
- <DebuggerTool/>
+ <Configuration
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="1"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ ExecutionBucket="7"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libtremor;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="USING_TREMOR;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ MinimalRebuild="true"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCCodeSignTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
- <Configuration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="1"/>
- <Tool Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)" MinimalRebuild="true" RuntimeLibrary="3" UsePrecompiledHeader="2" WarningLevel="4" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCCodeSignTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- <DeploymentTool ForceDirty="-1" RemoteDirectory="" RegisterOutput="0" AdditionalFiles=""/>
- <DebuggerTool/>
+ <Configuration
+ Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="1"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ ExecutionBucket="7"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libtremor;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="USING_TREMOR;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ MinimalRebuild="true"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCCodeSignTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
- <Configuration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="1"/>
- <Tool Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)" MinimalRebuild="true" RuntimeLibrary="3" UsePrecompiledHeader="2" WarningLevel="4" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCCodeSignTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- <DeploymentTool ForceDirty="-1" RemoteDirectory="" RegisterOutput="0" AdditionalFiles=""/>
- <DebuggerTool/>
+ <Configuration
+ Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="1"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ ExecutionBucket="7"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libtremor;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="USING_TREMOR;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ MinimalRebuild="true"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCCodeSignTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
- <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool"/>
- <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;NDEBUG;_LIB" RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="4" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCPostBuildEventTool"/>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ CallingConvention="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
- <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="3"/>
- <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;NDEBUG;_LIB" RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="4" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCPostBuildEventTool"/>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ CallingConvention="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
- <Configuration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="1"/>
- <Tool Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)" RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="4" DebugInformationFormat="3" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCCodeSignTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- <DeploymentTool ForceDirty="-1" RemoteDirectory="" RegisterOutput="0" AdditionalFiles=""/>
- <DebuggerTool/>
+ <Configuration
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="1"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ ExecutionBucket="7"
+ AdditionalIncludeDirectories="..\libtremor;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="USING_TREMOR;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCCodeSignTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
- <Configuration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="1"/>
- <Tool Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)" RuntimeLibrary="0" UsePrecompiledHeader="2" WarningLevel="4" DebugInformationFormat="3" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCCodeSignTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- <DeploymentTool ForceDirty="-1" RemoteDirectory="" RegisterOutput="0" AdditionalFiles=""/>
- <DebuggerTool/>
+ <Configuration
+ Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="1"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ ExecutionBucket="7"
+ AdditionalIncludeDirectories="..\libtremor;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="USING_TREMOR;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCCodeSignTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
- <Configuration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="1"/>
- <Tool Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)" RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="4" DebugInformationFormat="3" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCCodeSignTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- <DeploymentTool ForceDirty="-1" RemoteDirectory="" RegisterOutput="0" AdditionalFiles=""/>
- <DebuggerTool/>
+ <Configuration
+ Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="1"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ ExecutionBucket="7"
+ AdditionalIncludeDirectories="..\libtremor;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="USING_TREMOR;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCCodeSignTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
</Configurations>
<References>
</References>
<Files>
- <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <File RelativePath=".\stdafx.cpp">
- <FileConfiguration Name="Debug|Win32">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\stdafx.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Debug|x64">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Release|Win32">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Release|x64">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ </File>
+ <File
+ RelativePath=".\VorbisDecoder.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\VorbisEncoder.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
</FileConfiguration>
- <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
- <File RelativePath=".\VorbisDecoder.cpp">
+ <File
+ RelativePath=".\VorbisEncodeSettings.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
- <File RelativePath=".\VorbisEncoder.cpp">
- </File>
- <File RelativePath=".\VorbisEncodeSettings.cpp">
- </File>
</Filter>
- <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- <File RelativePath=".\stdafx.h">
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath=".\stdafx.h"
+ >
</File>
- <File RelativePath=".\VorbisDecoder.h">
+ <File
+ RelativePath=".\VorbisDecoder.h"
+ >
</File>
- <File RelativePath=".\VorbisEncoder.h">
+ <File
+ RelativePath=".\VorbisEncoder.h"
+ >
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
</File>
- <File RelativePath=".\VorbisEncodeSettings.h">
+ <File
+ RelativePath=".\VorbisEncodeSettings.h"
+ >
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
</File>
</Filter>
- <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
</Filter>
- <File RelativePath=".\ReadMe.txt">
+ <File
+ RelativePath=".\ReadMe.txt"
+ >
</File>
</Files>
<Globals>
Modified: trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/libOOVorbis.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/libOOVorbis.vcproj 2010-09-15 07:21:11 UTC (rev 17385)
+++ trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/libOOVorbis.vcproj 2010-09-17 15:25:53 UTC (rev 17386)
@@ -1,260 +1,1035 @@
<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9,00" Name="libOOVorbis" ProjectGUID="{C97A67F9-B786-41FA-9FC9-13167FE2BA49}" RootNamespace="libOOVorbis" Keyword="Win32Proj" TargetFrameworkVersion="131072">
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="libOOVorbis"
+ ProjectGUID="{C97A67F9-B786-41FA-9FC9-13167FE2BA49}"
+ RootNamespace="libOOVorbis"
+ Keyword="Win32Proj"
+ >
<Platforms>
- <Platform Name="Win32"/>
- <Platform Name="x64"/>
- <Platform Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"/>
- <Platform Name="Windows Mobile 5.0 Smartphone SDK (ARMV4I)"/>
- <Platform Name="Windows Mobile 6 Professional SDK (ARMV4I)"/>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ <Platform
+ Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ />
+ <Platform
+ Name="Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ />
+ <Platform
+ Name="Windows Mobile 6 Professional SDK (ARMV4I)"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
- <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool"/>
- <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;_DEBUG;_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" WarningLevel="4" Detect64BitPortabilityProblems="false" DebugInformationFormat="4" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCPostBuildEventTool"/>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;_DEBUG;_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="4"
+ CallingConvention="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
- <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool"/>
- <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;NDEBUG;_LIB" RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="4" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCPostBuildEventTool"/>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;_DEBUG;_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ CallingConvention="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
- <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="3"/>
- <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;_DEBUG;_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" WarningLevel="4" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCPostBuildEventTool"/>
+ <Configuration
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="1"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ ExecutionBucket="7"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libtremor;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="USING_TREMOR;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ MinimalRebuild="true"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCCodeSignTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
- <Configuration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="1"/>
- <Tool Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)" MinimalRebuild="true" RuntimeLibrary="3" UsePrecompiledHeader="2" WarningLevel="4" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCCodeSignTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- <DeploymentTool ForceDirty="-1" RemoteDirectory="" RegisterOutput="0" AdditionalFiles=""/>
- <DebuggerTool/>
+ <Configuration
+ Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="1"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ ExecutionBucket="7"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libtremor;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="USING_TREMOR;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ MinimalRebuild="true"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCCodeSignTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
- <Configuration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="1"/>
- <Tool Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)" MinimalRebuild="true" RuntimeLibrary="3" UsePrecompiledHeader="2" WarningLevel="4" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCCodeSignTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- <DeploymentTool ForceDirty="-1" RemoteDirectory="" RegisterOutput="0" AdditionalFiles=""/>
- <DebuggerTool/>
+ <Configuration
+ Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="1"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ ExecutionBucket="7"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libtremor;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="USING_TREMOR;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ MinimalRebuild="true"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCCodeSignTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
- <Configuration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="1"/>
- <Tool Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)" MinimalRebuild="true" RuntimeLibrary="3" UsePrecompiledHeader="2" WarningLevel="4" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCCodeSignTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- <DeploymentTool ForceDirty="-1" RemoteDirectory="" RegisterOutput="0" AdditionalFiles=""/>
- <DebuggerTool/>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ CallingConvention="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
- <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="3"/>
- <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;NDEBUG;_LIB" RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="4" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCFxCopTool"/>
- <Tool Name="VCPostBuildEventTool"/>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION;WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ CallingConvention="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
- <Configuration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="1"/>
- <Tool Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)" RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="4" DebugInformationFormat="3" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCCodeSignTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- <DeploymentTool ForceDirty="-1" RemoteDirectory="" RegisterOutput="0" AdditionalFiles=""/>
- <DebuggerTool/>
+ <Configuration
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="1"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ ExecutionBucket="7"
+ AdditionalIncludeDirectories="..\libtremor;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="USING_TREMOR;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCCodeSignTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
- <Configuration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="1"/>
- <Tool Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)" RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="4" DebugInformationFormat="3" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCCodeSignTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- <DeploymentTool ForceDirty="-1" RemoteDirectory="" RegisterOutput="0" AdditionalFiles=""/>
- <DebuggerTool/>
+ <Configuration
+ Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="1"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ ExecutionBucket="7"
+ AdditionalIncludeDirectories="..\libtremor;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="USING_TREMOR;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCCodeSignTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
- <Configuration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="1">
- <Tool Name="VCPreBuildEventTool"/>
- <Tool Name="VCCustomBuildTool"/>
- <Tool Name="VCXMLDataGeneratorTool"/>
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
- <Tool Name="VCMIDLTool" TargetEnvironment="1"/>
- <Tool Name="VCCLCompilerTool" ExecutionBucket="7" AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)" RuntimeLibrary="2" UsePrecompiledHeader="2" WarningLevel="4" DebugInformationFormat="3" CallingConvention="0"/>
- <Tool Name="VCManagedResourceCompilerTool"/>
- <Tool Name="VCResourceCompilerTool"/>
- <Tool Name="VCPreLinkEventTool"/>
- <Tool Name="VCLibrarianTool"/>
- <Tool Name="VCALinkTool"/>
- <Tool Name="VCXDCMakeTool"/>
- <Tool Name="VCBscMakeTool"/>
- <Tool Name="VCCodeSignTool"/>
- <Tool Name="VCPostBuildEventTool"/>
- <DeploymentTool ForceDirty="-1" RemoteDirectory="" RegisterOutput="0" AdditionalFiles=""/>
- <DebuggerTool/>
+ <Configuration
+ Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="1"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ ExecutionBucket="7"
+ AdditionalIncludeDirectories="..\libtremor;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
+ PreprocessorDefinitions="USING_TREMOR;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);$(PLATFORMDEFINES)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="2"
+ WarningLevel="4"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCCodeSignTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
</Configurations>
<References>
</References>
<Files>
- <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <File RelativePath=".\stdafx.cpp">
- <FileConfiguration Name="Debug|Win32">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\stdafx.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Release|Win32">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Debug|x64">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Release|x64">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
- <FileConfiguration Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ </File>
+ <File
+ RelativePath=".\VorbisDecoder.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\VorbisEncoder.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
</FileConfiguration>
- <FileConfiguration Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)">
- <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
- <File RelativePath=".\VorbisDecoder.cpp">
+ <File
+ RelativePath=".\VorbisEncodeSettings.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
- <File RelativePath=".\VorbisEncoder.cpp">
- </File>
- <File RelativePath=".\VorbisEncodeSettings.cpp">
- </File>
</Filter>
- <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- <File RelativePath=".\stdafx.h">
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath=".\stdafx.h"
+ >
</File>
- <File RelativePath=".\VorbisDecoder.h">
+ <File
+ RelativePath=".\VorbisDecoder.h"
+ >
</File>
- <File RelativePath=".\VorbisEncoder.h">
+ <File
+ RelativePath=".\VorbisEncoder.h"
+ >
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
</File>
- <File RelativePath=".\VorbisEncodeSettings.h">
+ <File
+ RelativePath=".\VorbisEncodeSettings.h"
+ >
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
</File>
</Filter>
- <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
</Filter>
- <File RelativePath=".\ReadMe.txt">
+ <File
+ RelativePath=".\ReadMe.txt"
+ >
</File>
</Files>
<Globals>
Modified: trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/mkvparserstreamaudio.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/mkvparserstreamaudio.cpp 2010-09-15 07:21:11 UTC (rev 17385)
+++ trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/mkvparserstreamaudio.cpp 2010-09-17 15:25:53 UTC (rev 17386)
@@ -242,7 +242,7 @@
}
-#if 1 //if we decide to support Xiph Ogg Vorbis decoder filter:
+#if 0 //if we decide to support Xiph Ogg Vorbis decoder filter:
HRESULT AudioStream::SetConnectionMediaType(const AM_MEDIA_TYPE& mt)
{
if (mt.majortype == VorbisTypes::MEDIATYPE_OggPacketStream)
@@ -432,7 +432,7 @@
}
-#if 1 //if we decide to support Xiph Ogg Vorbis decoder filter
+#if 0 //if we decide to support Xiph Ogg Vorbis decoder filter
bool AudioStream::SendPreroll(IMediaSample* pSample)
{
assert(m_preroll);
Modified: trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/mkvparserstreamaudio.hpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/mkvparserstreamaudio.hpp 2010-09-15 07:21:11 UTC (rev 17385)
+++ trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/mkvparserstreamaudio.hpp 2010-09-17 15:25:53 UTC (rev 17386)
@@ -25,7 +25,7 @@
void GetMediaTypes(CMediaTypes&) const;
HRESULT QueryAccept(const AM_MEDIA_TYPE*) const;
-#if 1 //if we decide to support Xiph Ogg Vorbis decoder filter:
+#if 0 //if we decide to support Xiph Ogg Vorbis decoder filter:
HRESULT SetConnectionMediaType(const AM_MEDIA_TYPE&);
#endif
@@ -39,7 +39,7 @@
void GetVorbisMediaTypes(CMediaTypes&) const;
-#if 1 //if we decide to support Xiph Ogg Vorbis decoder filter:
+#if 0 //if we decide to support Xiph Ogg Vorbis decoder filter:
bool SendPreroll(IMediaSample*);
bool (AudioStream::*m_preroll)(IMediaSample*);
bool DoNothing(IMediaSample*);
Modified: trunk/oggdsf/src/lib/helper/common/VorbisTypes.h
===================================================================
--- trunk/oggdsf/src/lib/helper/common/VorbisTypes.h 2010-09-15 07:21:11 UTC (rev 17385)
+++ trunk/oggdsf/src/lib/helper/common/VorbisTypes.h 2010-09-17 15:25:53 UTC (rev 17386)
@@ -42,6 +42,14 @@
unsigned char numChannels;
};
+struct VORBISFORMAT2
+{
+ unsigned long channels;
+ unsigned long samplesPerSec;
+ unsigned long bitsPerSample;
+ unsigned long headerSize[3]; // 0: Identification, 1: Comment, 2: CodecSetup
+};
+
// {A538F05F-DC08-4bf9-994F-18A86CCA6CC4}
DEFINE_GUID(CLSID_PropsVorbisEncoder,
0xa538f05f, 0xdc08, 0x4bf9, 0x99, 0x4f, 0x18, 0xa8, 0x6c, 0xca, 0x6c, 0xc4);
@@ -54,10 +62,18 @@
DEFINE_GUID(MEDIASUBTYPE_Vorbis,
0x8a0566ac, 0x42b3, 0x4ad9, 0xac, 0xa3, 0x93, 0xb9, 0x6, 0xdd, 0xf9, 0x8a);
+// {8D2FD10B-5841-4a6b-8905-588FEC1ADED9}
+DEFINE_GUID(MEDIASUBTYPE_Vorbis2,
+0x8D2FD10B, 0x5841, 0x4a6b, 0x89, 0x05, 0x58, 0x8F, 0xEC, 0x1A, 0xDE, 0xD9);
+
// {44E04F43-58B3-4de1-9BAA-8901F852DAE4}
DEFINE_GUID(FORMAT_Vorbis,
0x44e04f43, 0x58b3, 0x4de1, 0x9b, 0xaa, 0x89, 0x1, 0xf8, 0x52, 0xda, 0xe4);
+// {B36E107F-A938-4387-93C7-55E966757473}
+DEFINE_GUID(FORMAT_Vorbis2,
+0xB36E107F, 0xA938, 0x4387, 0x93, 0xC7, 0x55, 0xE9, 0x66, 0x75, 0x74, 0x73);
+
// {A4C6A887-7BD3-4b33-9A57-A3EB10924D3A}
DEFINE_GUID(IID_IVorbisEncodeSettings,
0xa4c6a887, 0x7bd3, 0x4b33, 0x9a, 0x57, 0xa3, 0xeb, 0x10, 0x92, 0x4d, 0x3a);
@@ -66,5 +82,4 @@
DEFINE_GUID(CLSID_VorbisDecodeFilter,
0x5a1d945, 0xa794, 0x44ef, 0xb4, 0x1a, 0x2f, 0x85, 0x1a, 0x11, 0x71, 0x55);
-
#endif // VORBISTYPES_H
\ No newline at end of file
More information about the commits
mailing list