Author: titmuss
Date: Tue Jul 15 00:49:35 2008
New Revision: 2698
URL: http://svn.slimdevices.com?rev=2698&root=Jive&view=rev
Log:
Bug: 8706
Fix squeezelay building on osx.
Modified:
7.2/trunk/squeezeplay/src/Tremor/floor1.c
7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_output.c
Modified: 7.2/trunk/squeezeplay/src/Tremor/floor1.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Tremor/floor1.c?rev=2698&root=Jive&r1=2697&r2=2698&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/Tremor/floor1.c (original)
+++ 7.2/trunk/squeezeplay/src/Tremor/floor1.c Tue Jul 15 00:49:35 2008
@@ -53,7 +53,7 @@
return(ret);
}
-static void mergesort(char *index,ogg_uint16_t *vals,ogg_uint16_t n){
+static void _mergesort(char *index,ogg_uint16_t *vals,ogg_uint16_t n){
ogg_uint16_t i,j;
char *temp,*A=index,*B=_ogg_malloc(n*sizeof(*B));
@@ -147,7 +147,7 @@
/* also store a sorted position index */
for(j=0;j<info->posts;j++)info->forward_index[j]=j;
- mergesort(info->forward_index,info->postlist,info->posts);
+ _mergesort(info->forward_index,info->postlist,info->posts);
/* discover our neighbors for decode where we don't use fit flags
(that would push the neighbors outward) */
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_output.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_output.c?rev=2698&root=Jive&r1=2697&r2=2698&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_output.c
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_output.c Tue
Jul 15 00:49:35 2008
@@ -173,8 +173,8 @@
* a transition. Start at the requested transition interval and go
* down till we find an interval that we have enough audio for.
*/
-static fft_fixed determine_transition_interval(int sample_rate, u32_t
transition_period, u32_t *nbytes) {
- u32_t bytes_used, sample_step_bytes;
+static fft_fixed determine_transition_interval(int sample_rate, u32_t
transition_period, size_t *nbytes) {
+ size_t bytes_used, sample_step_bytes;
fft_fixed interval, interval_step;
bytes_used = fifo_bytes_used(&decode_fifo);
@@ -216,7 +216,7 @@
interval = determine_transition_interval(current_sample_rate,
decode_transition_period, &nbytes);
- DEBUG_TRACE("Starting FADEOUT over %d seconds, requiring %d bytes",
fixed_to_s32(interval), nbytes);
+ DEBUG_TRACE("Starting FADEOUT over %d seconds, requiring %ld bytes",
fixed_to_s32(interval), nbytes);
if (!interval) {
return;
@@ -338,7 +338,7 @@
track_start_point = decode_fifo.wptr;
if (decode_transition_type & TRANSITION_CROSSFADE) {
- u32_t crossfadeBytes;
+ size_t crossfadeBytes;
/* We are being asked to do a crossfade. Find out
* if it is possible.
@@ -346,7 +346,7 @@
fft_fixed interval =
determine_transition_interval(sample_rate, decode_transition_period,
&crossfadeBytes);
if (interval) {
- DEBUG_TRACE("Starting CROSSFADE over %d
seconds, requiring %d bytes", fixed_to_s32(interval), crossfadeBytes);
+ DEBUG_TRACE("Starting CROSSFADE over %d
seconds, requiring %ld bytes", fixed_to_s32(interval), crossfadeBytes);
/* Buffer position to stop crossfade */
crossfade_ptr = decode_fifo.wptr;
@@ -475,7 +475,7 @@
buffer_size *= denominator;
#endif
- DEBUG_TRACE("Removing %d bytes padding from buffer", buffer_size);
+ DEBUG_TRACE("Removing %ld bytes padding from buffer", buffer_size);
fifo_lock(&decode_fifo);
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
