[xiph-commits] r11002 - in branches/oggdsf_ce_port: sln/oggdsf_all
src/lib/codecs/cmml/libCMMLParse src/lib/codecs/cmml/libCMMLTags
src/lib/codecs/flac/libs/libflac/src/libFLAC
src/lib/codecs/helper/libfishsound/win32
src/lib/codecs/theora/libs/libOOTheora
src/lib/core/directshow/dsfOggDemux2 src/lib/helper/libTemporalURI
illiminable at svn.xiph.org
illiminable at svn.xiph.org
Tue Mar 14 07:30:13 PST 2006
Author: illiminable
Date: 2006-03-14 07:29:43 -0800 (Tue, 14 Mar 2006)
New Revision: 11002
Modified:
branches/oggdsf_ce_port/sln/oggdsf_all/oggdsf_all.sln
branches/oggdsf_ce_port/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.vcproj
branches/oggdsf_ce_port/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.vcproj
branches/oggdsf_ce_port/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_dynamic.vcproj
branches/oggdsf_ce_port/src/lib/codecs/flac/libs/libflac/src/libFLAC/metadata_iterators.c
branches/oggdsf_ce_port/src/lib/codecs/helper/libfishsound/win32/libfishsound.vcproj
branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPSocket.cpp
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.cpp
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.h
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/ds_guids.h
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp
branches/oggdsf_ce_port/src/lib/helper/libTemporalURI/libTemporalURI.vcproj
Log:
* More stuff builds for WM5... demux compiles but has link problems
Modified: branches/oggdsf_ce_port/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- branches/oggdsf_ce_port/sln/oggdsf_all/oggdsf_all.sln 2006-03-14 06:15:53 UTC (rev 11001)
+++ branches/oggdsf_ce_port/sln/oggdsf_all/oggdsf_all.sln 2006-03-14 15:29:43 UTC (rev 11002)
@@ -1057,8 +1057,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOggDemux2", "..\..\src\lib\core\directshow\dsfOggDemux2\dsfOggDemux2.vcproj", "{304B710A-7355-471C-A4A8-9E8F6D640E6D}"
ProjectSection(ProjectDependencies) = postProject
+ {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
- {4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
Modified: branches/oggdsf_ce_port/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.vcproj 2006-03-14 06:15:53 UTC (rev 11001)
+++ branches/oggdsf_ce_port/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.vcproj 2006-03-14 15:29:43 UTC (rev 11002)
@@ -1152,7 +1152,7 @@
ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories="..;..\..\..\helper"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_USRDLL;LIBCMMLPARSE_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;WIN32;_USRDLL;LIBCMMLPARSE_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
MinimalRebuild="true"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
Modified: branches/oggdsf_ce_port/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.vcproj 2006-03-14 06:15:53 UTC (rev 11001)
+++ branches/oggdsf_ce_port/src/lib/codecs/cmml/libCMMLTags/libCMMLTags.vcproj 2006-03-14 15:29:43 UTC (rev 11002)
@@ -1647,7 +1647,7 @@
ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories=".."
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCMMLTAGS_EXPORTS"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCMMLTAGS_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
MinimalRebuild="true"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
Modified: branches/oggdsf_ce_port/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_dynamic.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_dynamic.vcproj 2006-03-14 06:15:53 UTC (rev 11001)
+++ branches/oggdsf_ce_port/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_dynamic.vcproj 2006-03-14 15:29:43 UTC (rev 11002)
@@ -1137,7 +1137,7 @@
ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories=".\include,..\..\include"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;FLAC_API_EXPORTS;VERSION=\"1.1.0\";FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__USE_3DNOW;_WINDOWS;WIN32;_USRDLL"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;FLAC_API_EXPORTS;VERSION=\"1.1.0\";_WINDOWS;WIN32;_USRDLL;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
PrecompiledHeaderFile=".\Debug_dynamic/libFLAC_dynamic.pch"
@@ -1162,7 +1162,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib"
OutputFile="..\..\obj\debug\bin/libFLAC.dll"
LinkIncremental="2"
@@ -1171,7 +1170,7 @@
ProgramDatabaseFile=".\..\..\obj\debug\lib/libFLAC.pdb"
SubSystem="2"
ImportLibrary=".\..\..\obj\debug\lib/libFLAC.lib"
- TargetMachine="0"
+ TargetMachine="3"
/>
<Tool
Name="VCALinkTool"
Modified: branches/oggdsf_ce_port/src/lib/codecs/flac/libs/libflac/src/libFLAC/metadata_iterators.c
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/flac/libs/libflac/src/libFLAC/metadata_iterators.c 2006-03-14 06:15:53 UTC (rev 11001)
+++ branches/oggdsf_ce_port/src/lib/codecs/flac/libs/libflac/src/libFLAC/metadata_iterators.c 2006-03-14 15:29:43 UTC (rev 11002)
@@ -29,20 +29,30 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+//CHANGED BY ZEN There is no errno.h, sys/utime, io.h, or sys/stat.h
+#ifndef WINCE
#include <errno.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#if defined _MSC_VER || defined __MINGW32__
+
+#ifndef WINCE
#include <sys/utime.h> /* for utime() */
#include <io.h> /* for chmod() */
+#endif
+
#else
#include <sys/types.h> /* some flavors of BSD (like OS X) require this to get time_t */
#include <utime.h> /* for utime() */
#include <unistd.h> /* for chown(), unlink() */
#endif
+
+#ifndef WINCE
#include <sys/stat.h> /* for stat(), maybe chmod() */
+#endif
#include "private/metadata.h"
Modified: branches/oggdsf_ce_port/src/lib/codecs/helper/libfishsound/win32/libfishsound.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/helper/libfishsound/win32/libfishsound.vcproj 2006-03-14 06:15:53 UTC (rev 11001)
+++ branches/oggdsf_ce_port/src/lib/codecs/helper/libfishsound/win32/libfishsound.vcproj 2006-03-14 15:29:43 UTC (rev 11002)
@@ -1121,7 +1121,7 @@
ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories="..\include;.;..\..\..\vorbis\libs\libvorbis\include;..\..\..\speex\libs\libspeex\libspeex;..\..\..\..\core\ogg\libogg\include"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBFISHSOUND_EXPORTS"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBFISHSOUND_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
RuntimeLibrary="3"
PrecompiledHeaderFile="./libfishsound.pch"
AssemblerListingLocation="./"
@@ -1145,7 +1145,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
OutputFile="$(OutDir)/libfishsound.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
Modified: branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj 2006-03-14 06:15:53 UTC (rev 11001)
+++ branches/oggdsf_ce_port/src/lib/codecs/theora/libs/libOOTheora/libOOTheora.vcproj 2006-03-14 15:29:43 UTC (rev 11002)
@@ -954,7 +954,7 @@
ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\core\ogg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;..\..\..\..\helper"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOOTHEORA_EXPORTS"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOOTHEORA_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
MinimalRebuild="true"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPSocket.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPSocket.cpp 2006-03-14 06:15:53 UTC (rev 11001)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPSocket.cpp 2006-03-14 15:29:43 UTC (rev 11002)
@@ -103,12 +103,16 @@
SOCKADDR_IN locServiceSocketAddr; //saServer
if (mPort == 0) {
+#ifdef WINCE
+ locServiceSocketAddr.sin_port = htons(80);
+#else
locServiceData = getservbyname("http", "tcp");
if (locServiceData == NULL) {
locServiceSocketAddr.sin_port = htons(80);
} else {
locServiceSocketAddr.sin_port = locServiceData->s_port;
}
+#endif
} else {
//Explicit port
locServiceSocketAddr.sin_port = htons(mPort);
@@ -158,7 +162,9 @@
return true;
}
-bool HTTPSocket::splitURL(string inURL) {
+bool HTTPSocket::splitURL(string inURL)
+{
+ //UNICODE::: Note explicit ansi usage in this method
//debugLog2<<"Split url:"<<endl;
string locProtocol;
string locServerName;
@@ -202,7 +208,8 @@
mFileName = locPath;
if (locPort != "") {
//TODO::: Error checking needed
- mPort = atoi(locPort.c_str());
+ //UNICODE::: Note explicit ansi usage in this method
+ mPort = atoiA(locPort.c_str());
} else {
mPort = 0;
}
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.cpp 2006-03-14 06:15:53 UTC (rev 11001)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.cpp 2006-03-14 15:29:43 UTC (rev 11002)
@@ -244,7 +244,7 @@
string foundNum = "";
#endif
for (long i = 1; i < 24; i++) {
- itoa(i, (char*)&locNum, 10);
+ _itoa(i, (char*)&locNum, 10);
#ifdef UNICODE
string locTemp = locNum;
wstring locNumString = StringHelper::toWStr(locTemp);
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.h 2006-03-14 06:15:53 UTC (rev 11001)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/RegWrap.h 2006-03-14 15:29:43 UTC (rev 11002)
@@ -3,7 +3,7 @@
//This class really shouldn't be part of this project, but i got lazy !
//This is a pretty inefficient way to do it but its easy.
-
+#include <stdlib.h>
#include <string>
using namespace std;
class OGG_DEMUX2_API RegWrap
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/ds_guids.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/ds_guids.h 2006-03-14 06:15:53 UTC (rev 11001)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/ds_guids.h 2006-03-14 15:29:43 UTC (rev 11002)
@@ -1,5 +1,7 @@
#pragma once
+
+
//// {4BB64C4A-1674-436b-A49D-D6B3B64DBD60}
//DEFINE_GUID(CLSID_PropsAbout,
//0x4bb64c4a, 0x1674, 0x436b, 0xa4, 0x9d, 0xd6, 0xb3, 0xb6, 0x4d, 0xbd, 0x60);
@@ -87,6 +89,16 @@
//Structure defining the registration details of the filter
+
+#ifdef WINCE
+AMOVIESETUP_FILTER OggDemuxPacketSourceFilterReg = {
+ &CLSID_OggDemuxPacketSourceFilter, // Filter CLSID.
+ L"Ogg Demux Packet Source Filter", // Filter name.
+ MERIT_NORMAL, // Merit.
+ 0, // Number of pin types.
+ NULL // Pointer to pin information.
+};
+#else
const REGFILTER2 OggDemuxPacketSourceFilterReg = {
1,
MERIT_NORMAL,
@@ -94,6 +106,7 @@
NULL
};
+#endif
//struct sVorbisFormatBlock {
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj 2006-03-14 06:15:53 UTC (rev 11001)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/dsfOggDemux2.vcproj 2006-03-14 15:29:43 UTC (rev 11002)
@@ -963,7 +963,7 @@
Name="VCCLCompilerTool"
ExecutionBucket="7"
Optimization="0"
- AdditionalIncludeDirectories="..\BaseClasses;..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
+ AdditionalIncludeDirectories="..\..\ogg;..\libDirectshowAbstracts;..\..\..\helper"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFOGGDEMUX2_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
MinimalRebuild="true"
RuntimeLibrary="3"
@@ -981,10 +981,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib wsock32.lib shlwapi.lib"
+ AdditionalDependencies="strmbase.lib strmiids.lib winsock.lib"
OutputFile="$(OutDir)/dsfOggDemux2.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""
+ IgnoreDefaultLibraryNames=""
ModuleDefinitionFile="dsfOggDemux2.def"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/dsfOggDemux2.pdb"
@@ -1034,15 +1035,15 @@
>
</File>
<File
- RelativePath=".\dsfOggDemux2.def"
+ RelativePath=".\ds_guid.cpp"
>
</File>
<File
- RelativePath=".\FilterFileSource.cpp"
+ RelativePath=".\dsfOggDemux2.def"
>
</File>
<File
- RelativePath=".\HTTPFileSource.cpp"
+ RelativePath=".\FilterFileSource.cpp"
>
</File>
<File
@@ -1200,10 +1201,6 @@
>
</File>
<File
- RelativePath=".\HTTPFileSource.h"
- >
- </File>
- <File
RelativePath=".\HTTPSocket.h"
>
</File>
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp 2006-03-14 06:15:53 UTC (rev 11001)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp 2006-03-14 15:29:43 UTC (rev 11002)
@@ -48,7 +48,7 @@
//TO DO::: Should we be releasing the filter mapper even when we return early ?
HRESULT hr;
- IFilterMapper2* locFilterMapper = NULL;
+
hr = AMovieDllRegisterServer2(TRUE);
if (FAILED(hr)) {
@@ -56,8 +56,10 @@
return hr;
}
-
+#ifdef WINCE
+#else
+ IFilterMapper2* locFilterMapper = NULL;
hr = CoCreateInstance(CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, IID_IFilterMapper2, (void **)&locFilterMapper);
@@ -84,7 +86,7 @@
locFilterMapper->Release();
-
+#endif //WINCE
return hr;
}
@@ -96,14 +98,17 @@
RegWrap::removeMediaDesc();
#endif
HRESULT hr;
- IFilterMapper2* locFilterMapper = NULL;
+
hr = AMovieDllRegisterServer2(FALSE);
if (FAILED(hr)) {
return hr;
}
-
+#ifdef WINCE
+
+#else
+ IFilterMapper2* locFilterMapper = NULL;
hr = CoCreateInstance(CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER,
IID_IFilterMapper2, (void **)&locFilterMapper);
@@ -117,6 +122,7 @@
//
locFilterMapper->Release();
+#endif //WINCE
return hr;
}
Modified: branches/oggdsf_ce_port/src/lib/helper/libTemporalURI/libTemporalURI.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/helper/libTemporalURI/libTemporalURI.vcproj 2006-03-14 06:15:53 UTC (rev 11001)
+++ branches/oggdsf_ce_port/src/lib/helper/libTemporalURI/libTemporalURI.vcproj 2006-03-14 15:29:43 UTC (rev 11002)
@@ -931,7 +931,7 @@
ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories=".."
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEMPORALURI_EXPORTS"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEMPORALURI_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
MinimalRebuild="true"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
More information about the commits
mailing list