Author: titmuss
Date: Wed Nov 5 15:22:24 2008
New Revision: 3294
URL: http://svn.slimdevices.com?rev=3294&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix compiling on arm, after adding -Wcast-align.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_output.c
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_pcm.c
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_sample.c
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_vorbis.c
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c?rev=3294&root=Jive&r1=3293&r2=3294&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c Wed
Nov 5 15:22:24 2008
@@ -143,8 +143,8 @@
samples_write = BYTES_TO_SAMPLES(bytes_write);
- output_ptr = (sample_t *)outputArray;
- decode_ptr = (sample_t *)(decode_fifo_buf + decode_fifo.rptr);
+ output_ptr = (sample_t *)(void *)outputArray;
+ decode_ptr = (sample_t *)(void *)(decode_fifo_buf +
decode_fifo.rptr);
while (samples_write--) {
*(output_ptr++) = fixed_mul(lgain, *(decode_ptr++));
*(output_ptr++) = fixed_mul(rgain, *(decode_ptr++));
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_output.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_output.c?rev=3294&root=Jive&r1=3293&r2=3294&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_output.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_output.c Wed
Nov 5 15:22:24 2008
@@ -258,7 +258,7 @@
samples_read = BYTES_TO_SAMPLES(bytes_read);
- sptr = (sample_t *)(decode_fifo_buf + decode_fifo.wptr);
+ sptr = (sample_t *)(void *)(decode_fifo_buf + decode_fifo.wptr);
for (s = 0; s < samples_read * 2; s++) {
*sptr = fixed_mul(transition_gain, *sptr);
sptr++;
@@ -296,7 +296,7 @@
nsamples = BYTES_TO_SAMPLES(bytes_read);
- sptr = (sample_t *)(decode_fifo_buf + decode_fifo.wptr);
+ sptr = (sample_t *)(void *)(decode_fifo_buf + decode_fifo.wptr);
in_gain = transition_gain;
out_gain = FIXED_ONE - in_gain;
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_pcm.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_pcm.c?rev=3294&root=Jive&r1=3293&r2=3294&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_pcm.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_pcm.c Wed Nov
5 15:22:24 2008
@@ -138,7 +138,7 @@
static sample_t pcm_read32bitLE(u8_t *pos) {
sample_t sample;
- sample = *((s32_t *)pos);
+ sample = *((s32_t *)(void *)pos);
return sample;
}
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_sample.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_sample.c?rev=3294&root=Jive&r1=3293&r2=3294&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_sample.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_sample.c Wed
Nov 5 15:22:24 2008
@@ -60,8 +60,8 @@
len = buflen;
}
- s = (Sint32 *) (sample[i]->data + sample[i]->pos);
- d = (Sint32 *) buffer;
+ s = (Sint32 *)(void *)(sample[i]->data + sample[i]->pos);
+ d = (Sint32 *)(void *)buffer;
for (j=0; j<len>>2; j++) {
Sint64 tmp = *(s++);
tmp = fixed_mul(effect_gain, tmp);
@@ -191,7 +191,7 @@
/* Convert to signed 32 bit stereo, SDL does not support this format */
cvt.len_cvt *= 2;
for (i=(cvt.len_cvt/4)-1; i>=0; i--) {
- ((Uint32 *)cvt.buf)[i] = ((Uint16 *)cvt.buf)[i] << 16;
+ ((Uint32 *)(void *)cvt.buf)[i] = ((Uint16 *)(void *)cvt.buf)[i]
<< 16;
}
snd = malloc(sizeof(struct jive_sample));
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_vorbis.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_vorbis.c?rev=3294&root=Jive&r1=3293&r2=3294&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_vorbis.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_vorbis.c Wed
Nov 5 15:22:24 2008
@@ -166,8 +166,8 @@
nsamples = bytes / 2;
/* mono */
- rptr = ((s16_t *)self->output_buffer) +
nsamples;
- wptr = ((sample_t
*)self->output_buffer) + (nsamples * 2);
+ rptr = ((s16_t *)(void
*)self->output_buffer) + nsamples;
+ wptr = ((sample_t *)(void
*)self->output_buffer) + (nsamples * 2);
for (i = 0; i < nsamples; i++) {
sample_t s = (*--rptr) << 16;
@@ -179,8 +179,8 @@
nsamples = bytes / 4;
/* stereo */
- rptr = ((s16_t *)self->output_buffer) +
(nsamples * 2);
- wptr = ((sample_t
*)self->output_buffer) + (nsamples * 2);
+ rptr = ((s16_t *)(void
*)self->output_buffer) + (nsamples * 2);
+ wptr = ((sample_t *)(void
*)self->output_buffer) + (nsamples * 2);
for (i = 0; i < nsamples; i++) {
*--wptr = (*--rptr) << 16;
@@ -188,7 +188,7 @@
}
}
- decode_output_samples((sample_t
*)self->output_buffer, nsamples, self->sample_rate, FALSE);
+ decode_output_samples((sample_t *)(void
*)self->output_buffer, nsamples, self->sample_rate, FALSE);
return TRUE;
}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
