Author: titmuss
Date: Fri May 23 14:38:53 2008
New Revision: 2522
URL: http://svn.slimdevices.com?rev=2522&root=Jive&view=rev
Log:
Bug: N/A
Description:
Tremor fixes for windows.
Added:
7.2/trunk/squeezeplay/src/Tremor/VisualC/
7.2/trunk/squeezeplay/src/Tremor/VisualC/tremor.vcproj
Modified:
7.2/trunk/squeezeplay/src/Jive.sln
7.2/trunk/squeezeplay/src/Tremor/codebook.c
7.2/trunk/squeezeplay/src/Tremor/misc.c
7.2/trunk/squeezeplay/src/Tremor/misc.h
7.2/trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj
Modified: 7.2/trunk/squeezeplay/src/Jive.sln
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Jive.sln?rev=2522&root=Jive&r1=2521&r2=2522&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/Jive.sln (original)
+++ 7.2/trunk/squeezeplay/src/Jive.sln Fri May 23 14:38:53 2008
@@ -49,6 +49,7 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "squeezeplay",
"squeezeplay\VisualC\jive.vcproj", "{5E241B78-0AD3-4CAA-9985-EA4C32B4394A}"
ProjectSection(ProjectDependencies) = postProject
{FA79BE04-3706-4B93-A558-54429568E912} =
{FA79BE04-3706-4B93-A558-54429568E912}
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279} =
{FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}
{432D23FC-5507-446F-AA7A-689166AA92EF} =
{432D23FC-5507-446F-AA7A-689166AA92EF}
{F80450F2-8B32-4F92-A6E6-BADF07C0359B} =
{F80450F2-8B32-4F92-A6E6-BADF07C0359B}
{DBDDC3DC-BDC1-4F25-8323-366DDBED734C} =
{DBDDC3DC-BDC1-4F25-8323-366DDBED734C}
@@ -75,6 +76,8 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC_dynamic",
"flac-1.2.1\src\libFLAC\libFLAC_dynamic.vcproj",
"{4CEFBC83-C215-11DB-8314-0800200C9A66}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmad",
"libmad-0.15.1b\msvc++\libmad.vcproj", "{FA79BE04-3706-4B93-A558-54429568E912}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tremor",
"Tremor\VisualC\tremor.vcproj", "{FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -661,6 +664,41 @@
{FA79BE04-3706-4B93-A558-54429568E912}.withLua51_Release|Mixed
Platforms.Build.0 = Release|Win32
{FA79BE04-3706-4B93-A558-54429568E912}.withLua51_Release|Win32.ActiveCfg =
Release|Win32
{FA79BE04-3706-4B93-A558-54429568E912}.withLua51_Release|Win32.Build.0 =
Release|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.Debug|Any CPU.ActiveCfg
= Debug|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.Debug|Mixed
Platforms.ActiveCfg = Debug|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.Debug|Mixed
Platforms.Build.0 = Debug|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.Debug|Win32.Build.0 =
Debug|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.Release_NoSTDIO|Any
CPU.ActiveCfg = Release|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.Release_NoSTDIO|Mixed
Platforms.ActiveCfg = Release|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.Release_NoSTDIO|Mixed
Platforms.Build.0 = Release|Win32
+
{FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.Release_NoSTDIO|Win32.ActiveCfg =
Release|Win32
+
{FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.Release_NoSTDIO|Win32.Build.0 =
Release|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.Release|Any
CPU.ActiveCfg = Release|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.Release|Mixed
Platforms.ActiveCfg = Release|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.Release|Mixed
Platforms.Build.0 = Release|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.Release|Win32.ActiveCfg
= Release|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.Release|Win32.Build.0 =
Release|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua50_Debug|Any
CPU.ActiveCfg = Debug|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua50_Debug|Mixed
Platforms.ActiveCfg = Debug|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua50_Debug|Mixed
Platforms.Build.0 = Debug|Win32
+
{FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua50_Debug|Win32.ActiveCfg =
Debug|Win32
+
{FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua50_Debug|Win32.Build.0 =
Debug|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua50_Release|Any
CPU.ActiveCfg = Release|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua50_Release|Mixed
Platforms.ActiveCfg = Release|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua50_Release|Mixed
Platforms.Build.0 = Release|Win32
+
{FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua50_Release|Win32.ActiveCfg =
Release|Win32
+
{FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua50_Release|Win32.Build.0 =
Release|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua51_Debug|Any
CPU.ActiveCfg = Debug|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua51_Debug|Mixed
Platforms.ActiveCfg = Debug|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua51_Debug|Mixed
Platforms.Build.0 = Debug|Win32
+
{FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua51_Debug|Win32.ActiveCfg =
Debug|Win32
+
{FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua51_Debug|Win32.Build.0 =
Debug|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua51_Release|Any
CPU.ActiveCfg = Release|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua51_Release|Mixed
Platforms.ActiveCfg = Release|Win32
+ {FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua51_Release|Mixed
Platforms.Build.0 = Release|Win32
+
{FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua51_Release|Win32.ActiveCfg =
Release|Win32
+
{FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}.withLua51_Release|Win32.Build.0 =
Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Added: 7.2/trunk/squeezeplay/src/Tremor/VisualC/tremor.vcproj
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Tremor/VisualC/tremor.vcproj?rev=2522&root=Jive&view=auto
==============================================================================
--- 7.2/trunk/squeezeplay/src/Tremor/VisualC/tremor.vcproj (added)
+++ 7.2/trunk/squeezeplay/src/Tremor/VisualC/tremor.vcproj Fri May 23 14:38:53
2008
@@ -1,0 +1,265 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="tremor"
+ ProjectGUID="{FDE00EDD-4CAA-4A1D-8148-4507DC0A1279}"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <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"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </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="..\bitwise.c"
+ >
+ </File>
+ <File
+ RelativePath="..\codebook.c"
+ >
+ </File>
+ <File
+ RelativePath="..\dsp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\floor0.c"
+ >
+ </File>
+ <File
+ RelativePath="..\floor1.c"
+ >
+ </File>
+ <File
+ RelativePath="..\floor_lookup.c"
+ >
+ </File>
+ <File
+ RelativePath="..\framing.c"
+ >
+ </File>
+ <File
+ RelativePath="..\info.c"
+ >
+ </File>
+ <File
+ RelativePath="..\ivorbisfile_example.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mapping0.c"
+ >
+ </File>
+ <File
+ RelativePath="..\mdct.c"
+ >
+ </File>
+ <File
+ RelativePath="..\misc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\res012.c"
+ >
+ </File>
+ <File
+ RelativePath="..\vorbisfile.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath="..\asm_arm.h"
+ >
+ </File>
+ <File
+ RelativePath="..\codebook.h"
+ >
+ </File>
+ <File
+ RelativePath="..\codec_internal.h"
+ >
+ </File>
+ <File
+ RelativePath="..\config_types.h"
+ >
+ </File>
+ <File
+ RelativePath="..\ivorbiscodec.h"
+ >
+ </File>
+ <File
+ RelativePath="..\ivorbisfile.h"
+ >
+ </File>
+ <File
+ RelativePath="..\lsp_lookup.h"
+ >
+ </File>
+ <File
+ RelativePath="..\mdct.h"
+ >
+ </File>
+ <File
+ RelativePath="..\mdct_lookup.h"
+ >
+ </File>
+ <File
+ RelativePath="..\misc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\ogg.h"
+ >
+ </File>
+ <File
+ RelativePath="..\os.h"
+ >
+ </File>
+ <File
+ RelativePath="..\os_types.h"
+ >
+ </File>
+ <File
+ RelativePath="..\window_lookup.h"
+ >
+ </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>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: 7.2/trunk/squeezeplay/src/Tremor/codebook.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Tremor/codebook.c?rev=2522&root=Jive&r1=2521&r2=2522&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/Tremor/codebook.c (original)
+++ 7.2/trunk/squeezeplay/src/Tremor/codebook.c Fri May 23 14:38:53 2008
@@ -672,7 +672,7 @@
}
case 3:{
/* offset into array */
- void *ptr=s->q_val+entry*s->q_pack;
+ void *ptr=((unsigned char *)s->q_val)+entry*s->q_pack;
if(s->q_bits<=8){
for(i=0;i<s->dim;i++)
Modified: 7.2/trunk/squeezeplay/src/Tremor/misc.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Tremor/misc.c?rev=2522&root=Jive&r1=2521&r2=2522&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/Tremor/misc.c (original)
+++ 7.2/trunk/squeezeplay/src/Tremor/misc.c Fri May 23 14:38:53 2008
@@ -16,7 +16,9 @@
#include <stdio.h>
#define MISC_C
#include "misc.h"
+#ifdef _VDBG_GRAPHFILE
#include <sys/time.h>
+#endif
static void **pointers=NULL;
static long *insertlist=NULL; /* We can't embed this in the pointer list;
@@ -115,7 +117,7 @@
global_bytes+=(bytes-HEAD_ALIGN);
- return(ptr+HEAD_ALIGN);
+ return((head *)ptr+HEAD_ALIGN);
}
static void _ripremove(void *ptr){
@@ -188,7 +190,7 @@
extern void *_VDBG_malloc(void *ptr,long bytes,char *file,long line){
bytes+=HEAD_ALIGN;
if(ptr){
- ptr-=HEAD_ALIGN;
+ ((head *)ptr)-=HEAD_ALIGN;
_ripremove(ptr);
ptr=realloc(ptr,bytes);
}else{
@@ -200,7 +202,7 @@
extern void _VDBG_free(void *ptr,char *file,long line){
if(ptr){
- ptr-=HEAD_ALIGN;
+ ((head *)ptr)-=HEAD_ALIGN;
_ripremove(ptr);
free(ptr);
}
Modified: 7.2/trunk/squeezeplay/src/Tremor/misc.h
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Tremor/misc.h?rev=2522&root=Jive&r1=2521&r2=2522&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/Tremor/misc.h (original)
+++ 7.2/trunk/squeezeplay/src/Tremor/misc.h Fri May 23 14:38:53 2008
@@ -48,6 +48,10 @@
#include <sys/types.h>
+#if defined(_MSC_VER)
+#define inline __inline
+#endif //defined(_MSC_VER)
+
#if BYTE_ORDER==LITTLE_ENDIAN
union magic {
struct {
@@ -56,9 +60,7 @@
} halves;
ogg_int64_t whole;
};
-#endif
-
-#if BYTE_ORDER==BIG_ENDIAN
+#else
union magic {
struct {
ogg_int32_t hi;
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj?rev=2522&root=Jive&r1=2521&r2=2522&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj Fri May 23
14:38:53 2008
@@ -40,7 +40,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/D
"_CRT_SECURE_NO_DEPRECATE""
Optimization="0"
-
AdditionalIncludeDirectories=".;..\src;..\src\jiveui;"..\..\SDL-1.2.11\include";"..\..\SDL-1.2.11\VisualC\include";"..\..\SDL_image-1.2.5";"..\..\SDL_ttf-2.0.8";"..\..\SDL_gfx-2.0.15";"..\..\lua-5.1.1\src";"..\..\tolua++-1.0.92\include";..\..\portaudio_v19_1360\include;"..\..\flac-1.2.1\include";"..\..\libmad-0.15.1b""
+
AdditionalIncludeDirectories=".;..\src;..\src\jiveui;"..\..\SDL-1.2.11\include";"..\..\SDL-1.2.11\VisualC\include";"..\..\SDL_image-1.2.5";"..\..\SDL_ttf-2.0.8";"..\..\SDL_gfx-2.0.15";"..\..\lua-5.1.1\src";"..\..\tolua++-1.0.92\include";..\..\portaudio_v19_1360\include;"..\..\flac-1.2.1\include";"..\..\libmad-0.15.1b";..\..\"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -264,6 +264,10 @@
>
</File>
<File
+
RelativePath="..\src\audio\decode\decode_vorbis.c"
+ >
+ </File>
+ <File
RelativePath="..\src\audio\decode\decode_wma_win.c"
>
<FileConfiguration
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
