Author: titmuss
Date: Thu May 15 08:49:08 2008
New Revision: 2459
URL: http://svn.slimdevices.com?rev=2459&root=Jive&view=rev
Log:
Bug: N/A
Description:
Compile fixes for windows.
Added libmad to the VC project, again note that the libmad source is not
included in SVN due to licensing.
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_portaudio.c
Modified: 7.2/trunk/squeezeplay/src/Jive.sln
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Jive.sln?rev=2459&root=Jive&r1=2458&r2=2459&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/Jive.sln (original)
+++ 7.2/trunk/squeezeplay/src/Jive.sln Thu May 15 08:49:08 2008
@@ -48,30 +48,33 @@
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}
+ {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}
+ {AA7BA9D8-4727-47EC-A9E7-6774A58F6EB5} =
{AA7BA9D8-4727-47EC-A9E7-6774A58F6EB5}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} =
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ {128E8BD0-174A-48F0-8771-92B1E8D18713} =
{128E8BD0-174A-48F0-8771-92B1E8D18713}
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} =
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {18DC63A2-81C0-4E3C-B3DD-F6EDB7B084A8} =
{18DC63A2-81C0-4E3C-B3DD-F6EDB7B084A8}
+ {21C196A0-FA8B-4494-9F30-AF5C2EAD369F} =
{21C196A0-FA8B-4494-9F30-AF5C2EAD369F}
{4CEFBC83-C215-11DB-8314-0800200C9A66} =
{4CEFBC83-C215-11DB-8314-0800200C9A66}
+ {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}
- {66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A} =
{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}
- {0A18A071-125E-442F-AFF7-A3F68ABECF99} =
{0A18A071-125E-442F-AFF7-A3F68ABECF99}
- {21C196A0-FA8B-4494-9F30-AF5C2EAD369F} =
{21C196A0-FA8B-4494-9F30-AF5C2EAD369F}
- {18DC63A2-81C0-4E3C-B3DD-F6EDB7B084A8} =
{18DC63A2-81C0-4E3C-B3DD-F6EDB7B084A8}
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} =
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
- {128E8BD0-174A-48F0-8771-92B1E8D18713} =
{128E8BD0-174A-48F0-8771-92B1E8D18713}
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} =
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
- {AA7BA9D8-4727-47EC-A9E7-6774A58F6EB5} =
{AA7BA9D8-4727-47EC-A9E7-6774A58F6EB5}
- {DBDDC3DC-BDC1-4F25-8323-366DDBED734C} =
{DBDDC3DC-BDC1-4F25-8323-366DDBED734C}
- {F80450F2-8B32-4F92-A6E6-BADF07C0359B} =
{F80450F2-8B32-4F92-A6E6-BADF07C0359B}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luaprofiler",
"luaprofiler-2.0\VisualC\luaprofiler.vcproj",
"{AA7BA9D8-4727-47EC-A9E7-6774A58F6EB5}"
+ ProjectSection(ProjectDependencies) = postProject
{432D23FC-5507-446F-AA7A-689166AA92EF} =
{432D23FC-5507-446F-AA7A-689166AA92EF}
- {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}"
- ProjectSection(ProjectDependencies) = postProject
- {432D23FC-5507-446F-AA7A-689166AA92EF} =
{432D23FC-5507-446F-AA7A-689166AA92EF}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio",
"portaudio_v19_1360\build\msvc\portaudio.vcproj",
"{0A18A071-125E-442F-AFF7-A3F68ABECF99}"
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}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -623,6 +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
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=2459&root=Jive&r1=2458&r2=2459&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj Thu May 15
08:49:08 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""
+
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""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -244,6 +244,10 @@
>
</File>
<File
+ RelativePath="..\src\audio\decode\decode_mad.c"
+ >
+ </File>
+ <File
RelativePath="..\src\audio\decode\decode_output.c"
>
</File>
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c?rev=2459&root=Jive&r1=2458&r2=2459&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
Thu May 15 08:49:08 2008
@@ -40,7 +40,7 @@
void *userData) {
size_t bytes_used, len;
bool_t reached_start_point;
- Uint8 *outputArray;
+ Uint8 *outputArray = (u8_t *)outputBuffer;
if (statusFlags & (paOutputUnderflow | paOutputOverflow)) {
DEBUG_TRACE("pa status %x\n", (unsigned int)statusFlags);
@@ -52,7 +52,7 @@
/* audio running? */
if (!(current_audio_state & DECODE_STATE_RUNNING)) {
- memset(outputBuffer, 0, len);
+ memset(outputArray, 0, len);
return 0;
}
@@ -66,7 +66,7 @@
/* audio underrun? */
if (bytes_used == 0) {
current_audio_state |= DECODE_STATE_UNDERRUN;
- memset(outputBuffer, 0, len);
+ memset(outputArray, 0, len);
fifo_unlock(&decode_fifo);
return 0;
@@ -74,13 +74,12 @@
if (bytes_used < len) {
current_audio_state |= DECODE_STATE_UNDERRUN;
- memset(outputBuffer + bytes_used, 0, len - bytes_used);
+ memset(outputArray + bytes_used, 0, len - bytes_used);
}
else {
current_audio_state &= ~DECODE_STATE_UNDERRUN;
}
- outputArray = (u8_t *)outputBuffer;
while (bytes_used) {
size_t wrap, bytes_write;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
