[xiph-commits] r18511 - icecast/trunk/ices/src

[ph3-der-loewe at svn.xiph.org]

Author: ph3-der-loewe
Date: 2012-08-06 04:35:20 -0700 (Mon, 06 Aug 2012)
New Revision: 18511

Modified:
   icecast/trunk/ices/src/Makefile.am
   icecast/trunk/ices/src/im_alsa.c
   icecast/trunk/ices/src/input.c
   icecast/trunk/ices/src/signals.h
   icecast/trunk/ices/src/stream_shared.c
Log:
Fixed minor compiler warnings. Also added -Wno-pointer-sign to avoid warnings from libxml2.


Modified: icecast/trunk/ices/src/Makefile.am
===================================================================
--- icecast/trunk/ices/src/Makefile.am	2012-08-04 09:04:59 UTC (rev 18510)
+++ icecast/trunk/ices/src/Makefile.am	2012-08-06 11:35:20 UTC (rev 18511)
@@ -6,7 +6,7 @@
 
 bin_PROGRAMS = ices
 AM_CPPFLAGS = @XIPH_CPPFLAGS@
-AM_CFLAGS = @XIPH_CFLAGS@ -Wall
+AM_CFLAGS = @XIPH_CFLAGS@ -Wall -Wno-pointer-sign
 
 EXTRA_ices_SOURCES = im_oss.c im_sun.c im_alsa.c im_roar.c
 

Modified: icecast/trunk/ices/src/im_alsa.c
===================================================================
--- icecast/trunk/ices/src/im_alsa.c	2012-08-04 09:04:59 UTC (rev 18510)
+++ icecast/trunk/ices/src/im_alsa.c	2012-08-06 11:35:20 UTC (rev 18511)
@@ -157,9 +157,8 @@
     module_param_t *current;
     char *device = "plughw:0,0"; /* default device */
     snd_pcm_format_t format = SND_PCM_FORMAT_S16_LE;
-    int channels, rate;
     int use_metadata = 1; /* Default to on */
-    unsigned int buffered_time, exact_rate;
+    unsigned int exact_rate;
     int dir;
 
     snd_pcm_stream_t stream = SND_PCM_STREAM_CAPTURE;

Modified: icecast/trunk/ices/src/input.c
===================================================================
--- icecast/trunk/ices/src/input.c	2012-08-04 09:04:59 UTC (rev 18510)
+++ icecast/trunk/ices/src/input.c	2012-08-06 11:35:20 UTC (rev 18511)
@@ -34,6 +34,7 @@
 #include "stream.h"
 #include "input.h"
 #include "event.h"
+#include "signals.h"
 #include "inputmodule.h"
 #include "im_playlist.h"
 #include "im_stdinpcm.h"

Modified: icecast/trunk/ices/src/signals.h
===================================================================
--- icecast/trunk/ices/src/signals.h	2012-08-04 09:04:59 UTC (rev 18510)
+++ icecast/trunk/ices/src/signals.h	2012-08-06 11:35:20 UTC (rev 18511)
@@ -16,6 +16,7 @@
 
 #include <signal.h>
 
+void signal_usr1_handler(int signum);
 void signal_hup_handler(int signum);
 void signal_int_handler(int signum);
 

Modified: icecast/trunk/ices/src/stream_shared.c
===================================================================
--- icecast/trunk/ices/src/stream_shared.c	2012-08-04 09:04:59 UTC (rev 18510)
+++ icecast/trunk/ices/src/stream_shared.c	2012-08-06 11:35:20 UTC (rev 18511)
@@ -181,7 +181,7 @@
         }
 
         if(sdsc->downmix) {
-            downmix_buffer(sdsc->downmix, buffer->buf, buffer->len, be);
+            downmix_buffer(sdsc->downmix, (signed char *)buffer->buf, buffer->len, be);
             if(sdsc->resamp) {
                 resample_buffer_float(sdsc->resamp, &sdsc->downmix->buffer, 
                         buffer->len/4);