Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9382/src/pcm
Modified Files:
pcm.c pcm_local.h pcm_misc.c
Log Message:
fixed compile warnings.
Index: pcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm.c,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- pcm.c 15 Apr 2004 12:22:26 -0000 1.283
+++ pcm.c 15 Apr 2004 12:52:51 -0000 1.284
@@ -2168,9 +2168,10 @@
silence = snd_pcm_format_silence_64(format);
if (dst_area->step == (unsigned int) width) {
unsigned int dwords = samples * width / 64;
+ u_int64_t *dstp = (u_int64_t *)dst;
samples -= dwords * 64 / width;
while (dwords-- > 0)
- *((u_int64_t*)dst)++ = silence;
+ *dstp++ = silence;
if (samples == 0)
return 0;
}
Index: pcm_local.h
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_local.h,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- pcm_local.h 15 Apr 2004 12:22:27 -0000 1.134
+++ pcm_local.h 15 Apr 2004 12:52:58 -0000 1.135
@@ -276,6 +276,8 @@
return -ESTRPIPE;
case SND_PCM_STATE_DISCONNECTED:
return -ENOTTY;
+ default:
+ break;
}
}
return err;
Index: pcm_misc.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_misc.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- pcm_misc.c 18 Dec 2002 12:03:28 -0000 1.39
+++ pcm_misc.c 15 Apr 2004 12:52:58 -0000 1.40
@@ -564,28 +564,30 @@
}
case 16: {
u_int16_t silence = snd_pcm_format_silence_64(format);
+ u_int16_t *pdata = (u_int16_t *)data;
if (! silence)
memset(data, 0, samples * 2);
else {
while (samples-- > 0)
- *((u_int16_t *)data)++ = silence;
+ *pdata++ = silence;
}
break;
}
case 24: {
u_int32_t silence = snd_pcm_format_silence_64(format);
+ u_int8_t *pdata = (u_int8_t *)data;
if (! silence)
memset(data, 0, samples * 3);
else {
while (samples-- > 0) {
#ifdef SNDRV_LITTLE_ENDIAN
- *((u_int8_t *)data)++ = silence >> 0;
- *((u_int8_t *)data)++ = silence >> 8;
- *((u_int8_t *)data)++ = silence >> 16;
+ *pdata++ = silence >> 0;
+ *pdata++ = silence >> 8;
+ *pdata++ = silence >> 16;
#else
- *((u_int8_t *)data)++ = silence >> 16;
- *((u_int8_t *)data)++ = silence >> 8;
- *((u_int8_t *)data)++ = silence >> 0;
+ *pdata++ = silence >> 16;
+ *pdata++ = silence >> 8;
+ *pdata++ = silence >> 0;
#endif
}
}
@@ -593,21 +595,23 @@
}
case 32: {
u_int32_t silence = snd_pcm_format_silence_64(format);
+ u_int32_t *pdata = (u_int32_t *)data;
if (! silence)
memset(data, 0, samples * 4);
else {
while (samples-- > 0)
- *((u_int32_t *)data)++ = silence;
+ *pdata++ = silence;
}
break;
}
case 64: {
u_int64_t silence = snd_pcm_format_silence_64(format);
+ u_int64_t *pdata = (u_int64_t *)data;
if (! silence)
memset(data, 0, samples * 8);
else {
while (samples-- > 0)
- *((u_int64_t *)data)++ = silence;
+ *pdata++ = silence;
}
break;
}
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
