Author: titmuss
Date: Fri May 16 09:12:14 2008
New Revision: 2472
URL: http://svn.slimdevices.com?rev=2472&root=Jive&view=rev
Log:
Bug: N/A
Description:
Windows fixes.
Modified:
7.2/trunk/squeezeplay/src/Jive.sln
7.2/trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj
7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c
Modified: 7.2/trunk/squeezeplay/src/Jive.sln
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Jive.sln?rev=2472&root=Jive&r1=2471&r2=2472&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/Jive.sln (original)
+++ 7.2/trunk/squeezeplay/src/Jive.sln Fri May 16 09:12:14 2008
@@ -48,8 +48,7 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "squeezeplay",
"squeezeplay\VisualC\jive.vcproj", "{5E241B78-0AD3-4CAA-9985-EA4C32B4394A}"
ProjectSection(ProjectDependencies) = postProject
- {8B52C509-C13F-4E3F-9744-FF110B2746E1} =
{8B52C509-C13F-4E3F-9744-FF110B2746E1}
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E} =
{2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F} =
{CAC2104B-7169-4503-AFDF-0DEB0474765F}
{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}
@@ -63,6 +62,7 @@
{0A18A071-125E-442F-AFF7-A3F68ABECF99} =
{0A18A071-125E-442F-AFF7-A3F68ABECF99}
{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A} =
{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}
{DDA7F013-8909-4150-98CB-07D002978679} =
{DDA7F013-8909-4150-98CB-07D002978679}
+ {8B52C509-C13F-4E3F-9744-FF110B2746E1} =
{8B52C509-C13F-4E3F-9744-FF110B2746E1}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luaprofiler",
"luaprofiler-2.0\VisualC\luaprofiler.vcproj",
"{AA7BA9D8-4727-47EC-A9E7-6774A58F6EB5}"
@@ -74,7 +74,7 @@
EndProject
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.0b\msvc++\libmad.vcproj", "{2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmad",
"libmad-0.15.1b\msvc++\libmad.vcproj", "{CAC2104B-7169-4503-AFDF-0DEB0474765F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -626,41 +626,41 @@
{4CEFBC83-C215-11DB-8314-0800200C9A66}.withLua51_Release|Mixed
Platforms.Build.0 = Release|Win32
{4CEFBC83-C215-11DB-8314-0800200C9A66}.withLua51_Release|Win32.ActiveCfg =
Release|Win32
{4CEFBC83-C215-11DB-8314-0800200C9A66}.withLua51_Release|Win32.Build.0 =
Release|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.Debug|Any CPU.ActiveCfg
= Debug|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.Debug|Mixed
Platforms.ActiveCfg = Debug|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.Debug|Mixed
Platforms.Build.0 = Debug|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.Debug|Win32.ActiveCfg =
Debug|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.Debug|Win32.Build.0 =
Debug|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.Release_NoSTDIO|Any
CPU.ActiveCfg = Release|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.Release_NoSTDIO|Mixed
Platforms.ActiveCfg = Release|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.Release_NoSTDIO|Mixed
Platforms.Build.0 = Release|Win32
-
{2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.Release_NoSTDIO|Win32.ActiveCfg =
Release|Win32
-
{2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.Release_NoSTDIO|Win32.Build.0 =
Release|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.Release|Any
CPU.ActiveCfg = Release|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.Release|Mixed
Platforms.ActiveCfg = Release|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.Release|Mixed
Platforms.Build.0 = Release|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.Release|Win32.ActiveCfg
= Release|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.Release|Win32.Build.0 =
Release|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua50_Debug|Any
CPU.ActiveCfg = Debug|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua50_Debug|Mixed
Platforms.ActiveCfg = Debug|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua50_Debug|Mixed
Platforms.Build.0 = Debug|Win32
-
{2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua50_Debug|Win32.ActiveCfg =
Debug|Win32
-
{2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua50_Debug|Win32.Build.0 =
Debug|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua50_Release|Any
CPU.ActiveCfg = Release|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua50_Release|Mixed
Platforms.ActiveCfg = Release|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua50_Release|Mixed
Platforms.Build.0 = Release|Win32
-
{2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua50_Release|Win32.ActiveCfg =
Release|Win32
-
{2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua50_Release|Win32.Build.0 =
Release|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua51_Debug|Any
CPU.ActiveCfg = Debug|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua51_Debug|Mixed
Platforms.ActiveCfg = Debug|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua51_Debug|Mixed
Platforms.Build.0 = Debug|Win32
-
{2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua51_Debug|Win32.ActiveCfg =
Debug|Win32
-
{2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua51_Debug|Win32.Build.0 =
Debug|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua51_Release|Any
CPU.ActiveCfg = Release|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua51_Release|Mixed
Platforms.ActiveCfg = Release|Win32
- {2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua51_Release|Mixed
Platforms.Build.0 = Release|Win32
-
{2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua51_Release|Win32.ActiveCfg =
Release|Win32
-
{2E1AD89B-0394-47F6-BD5B-BF48088D9D6E}.withLua51_Release|Win32.Build.0 =
Release|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.Debug|Any CPU.ActiveCfg
= Debug|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.Debug|Mixed
Platforms.ActiveCfg = Debug|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.Debug|Mixed
Platforms.Build.0 = Debug|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.Debug|Win32.Build.0 =
Debug|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.Release_NoSTDIO|Any
CPU.ActiveCfg = Release|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.Release_NoSTDIO|Mixed
Platforms.ActiveCfg = Release|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.Release_NoSTDIO|Mixed
Platforms.Build.0 = Release|Win32
+
{CAC2104B-7169-4503-AFDF-0DEB0474765F}.Release_NoSTDIO|Win32.ActiveCfg =
Release|Win32
+
{CAC2104B-7169-4503-AFDF-0DEB0474765F}.Release_NoSTDIO|Win32.Build.0 =
Release|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.Release|Any
CPU.ActiveCfg = Release|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.Release|Mixed
Platforms.ActiveCfg = Release|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.Release|Mixed
Platforms.Build.0 = Release|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.Release|Win32.ActiveCfg
= Release|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.Release|Win32.Build.0 =
Release|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua50_Debug|Any
CPU.ActiveCfg = Debug|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua50_Debug|Mixed
Platforms.ActiveCfg = Debug|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua50_Debug|Mixed
Platforms.Build.0 = Debug|Win32
+
{CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua50_Debug|Win32.ActiveCfg =
Debug|Win32
+
{CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua50_Debug|Win32.Build.0 =
Debug|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua50_Release|Any
CPU.ActiveCfg = Release|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua50_Release|Mixed
Platforms.ActiveCfg = Release|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua50_Release|Mixed
Platforms.Build.0 = Release|Win32
+
{CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua50_Release|Win32.ActiveCfg =
Release|Win32
+
{CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua50_Release|Win32.Build.0 =
Release|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua51_Debug|Any
CPU.ActiveCfg = Debug|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua51_Debug|Mixed
Platforms.ActiveCfg = Debug|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua51_Debug|Mixed
Platforms.Build.0 = Debug|Win32
+
{CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua51_Debug|Win32.ActiveCfg =
Debug|Win32
+
{CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua51_Debug|Win32.Build.0 =
Debug|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua51_Release|Any
CPU.ActiveCfg = Release|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua51_Release|Mixed
Platforms.ActiveCfg = Release|Win32
+ {CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua51_Release|Mixed
Platforms.Build.0 = Release|Win32
+
{CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua51_Release|Win32.ActiveCfg =
Release|Win32
+
{CAC2104B-7169-4503-AFDF-0DEB0474765F}.withLua51_Release|Win32.Build.0 =
Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
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=2472&root=Jive&r1=2471&r2=2472&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj Fri May 16
09:12:14 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.0b""
+
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"
@@ -118,7 +118,7 @@
/>
<Tool
Name="VCCLCompilerTool"
-
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""
+
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;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c?rev=2472&root=Jive&r1=2471&r2=2472&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c Fri May
16 09:12:14 2008
@@ -59,19 +59,20 @@
static void xing_parse(struct decode_mad *self) {
struct mad_bitptr ptr = self->stream.anc_ptr;
unsigned int bitlen = self->stream.anc_bitlen;
+ u32_t magic, flags;
if (bitlen < 64) {
DEBUG_TRACE("no xing header");
return;
}
- u32_t magic = mad_bit_read(&ptr, 32);
+ magic = mad_bit_read(&ptr, 32);
DEBUG_TRACE("xing magic %x", magic);
if (magic != XING_MAGIC && magic != INFO_MAGIC) {
return;
}
- u32_t flags = mad_bit_read(&ptr, 32);
+ flags = mad_bit_read(&ptr, 32);
bitlen -= 64;
// skip traditional xing vbr tag data
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
