changeset 2506:28f3f1fc4001

Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 02 Apr 2008 18:06:07 +0300
parents 590c9610f968 (current diff) 9fd51b549097 (diff)
children 251336bee085
files
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/esd/audio.c	Wed Apr 02 17:51:41 2008 +0300
+++ b/src/esd/audio.c	Wed Apr 02 18:06:07 2008 +0300
@@ -158,6 +158,9 @@
     case FMT_S16_NE:
         esd_format = ESD_BITS16;
         break;
+    default:
+        /* for warning suppression */
+        break;
     }
 
 #if (G_BYTE_ORDER == G_BIG_ENDIAN)
--- a/src/madplug/replaygain.c	Wed Apr 02 17:51:41 2008 +0300
+++ b/src/madplug/replaygain.c	Wed Apr 02 18:06:07 2008 +0300
@@ -138,7 +138,7 @@
         
         fprintf(stderr, "wtf: vsize=%x, flags=%x, s=%s\n", vsize, flags, p);
         if (vsize > end - tmp + 1) {
-            fprintf(stderr, "vsize > end - tmp + 1: %d > %d\n", vsize, end - tmp + 1);
+            fprintf(stderr, "vsize > end - tmp + 1: %d > %d\n", vsize, (int)(end - tmp + 1));
         }
         
         if (isize > 0 && vsize > 0) {