[maemo-commits] [maemo-commits] r8952 - in projects/haf/trunk/libsdl-mixer1.2: . debian timidity

[From: subversion at stage.maemo.org]

Author: kusalone
Date: 2007-01-04 13:05:51 +0200 (Thu, 04 Jan 2007)
New Revision: 8952

Modified:
   projects/haf/trunk/libsdl-mixer1.2/debian/changelog
   projects/haf/trunk/libsdl-mixer1.2/effect_position.c
   projects/haf/trunk/libsdl-mixer1.2/mixer.c
   projects/haf/trunk/libsdl-mixer1.2/timidity/instrum.c
   projects/haf/trunk/libsdl-mixer1.2/timidity/playmidi.c
Log:
fixed several warnings


Modified: projects/haf/trunk/libsdl-mixer1.2/debian/changelog
===================================================================
--- projects/haf/trunk/libsdl-mixer1.2/debian/changelog	2007-01-04 11:00:41 UTC (rev 8951)
+++ projects/haf/trunk/libsdl-mixer1.2/debian/changelog	2007-01-04 11:05:51 UTC (rev 8952)
@@ -1,3 +1,9 @@
+libsdl-mixer1.2 (1.2.6-4) unstable; urgency=low
+
+  * Fixed several warnings. Fixes: NB#50264
+
+ -- Kuisma Salonen <kuisma.salonen at nokia.com>  Thu,  4 Jan 2007 13:05:41 +0300
+
 libsdl-mixer1.2 (1.2.6-3) unstable; urgency=low
 
   * Removed .la file from devel package installation. Fixes: NB#34320

Modified: projects/haf/trunk/libsdl-mixer1.2/effect_position.c
===================================================================
--- projects/haf/trunk/libsdl-mixer1.2/effect_position.c	2007-01-04 11:00:41 UTC (rev 8951)
+++ projects/haf/trunk/libsdl-mixer1.2/effect_position.c	2007-01-04 11:05:51 UTC (rev 8952)
@@ -1497,7 +1497,7 @@
     Uint16 format;
     int channels;
     position_args *args = NULL;
-    Sint16 room_angle;
+    Sint16 room_angle = 0;
 
     Mix_QuerySpec(NULL, &format, &channels);
     f = get_position_effect_func(format, channels);

Modified: projects/haf/trunk/libsdl-mixer1.2/mixer.c
===================================================================
--- projects/haf/trunk/libsdl-mixer1.2/mixer.c	2007-01-04 11:00:41 UTC (rev 8951)
+++ projects/haf/trunk/libsdl-mixer1.2/mixer.c	2007-01-04 11:05:51 UTC (rev 8952)
@@ -155,7 +155,7 @@
 static void mix_channels(void *udata, Uint8 *stream, int len)
 {
 	Uint8 *mix_input;
-	int i, mixable, volume;
+	int i, mixable, volume = 0;
 	Uint32 sdl_ticks;
 
 	/* Mix the music (must be done before the channels are added) */
@@ -256,6 +256,7 @@
 	}
 }
 
+#ifdef UNUSED
 static void PrintFormat(char *title, SDL_AudioSpec *fmt)
 {
 	printf("%s: %d bit %s audio (%s) at %u Hz\n", title, (fmt->format&0xFF),
@@ -263,8 +264,8 @@
 			(fmt->channels > 2) ? "surround" :
 			(fmt->channels > 1) ? "stereo" : "mono", fmt->freq);
 }
+#endif /* UNUSED */
 
-
 void _Mix_InitEffects(void);
 
 /* Open the mixer with a certain desired audio format */

Modified: projects/haf/trunk/libsdl-mixer1.2/timidity/instrum.c
===================================================================
--- projects/haf/trunk/libsdl-mixer1.2/timidity/instrum.c	2007-01-04 11:00:41 UTC (rev 8951)
+++ projects/haf/trunk/libsdl-mixer1.2/timidity/instrum.c	2007-01-04 11:05:51 UTC (rev 8952)
@@ -248,7 +248,7 @@
 				   int strip_loop, int strip_envelope,
 				   int strip_tail, int bank, int gm_num, int sf_ix)
 {
-  InstrumentLayer *lp, *lastlp, *headlp;
+  InstrumentLayer *lp, *lastlp, *headlp = NULL;
   Instrument *ip;
   FILE *fp;
   uint8 tmp[1024];
@@ -259,7 +259,7 @@
   int sf2flag = 0;
   int right_samples = 0;
   int stereo_channels = 1, stereo_layer;
-  int vlayer_list[19][4], vlayer, vlayer_count;
+  int vlayer_list[19][4], vlayer, vlayer_count = 0;
 
   if (!name) return 0;
   
@@ -420,7 +420,7 @@
 
  for (stereo_layer = 0; stereo_layer < stereo_channels; stereo_layer++)
  {
-  int sample_count;
+  int sample_count = 0;
 
   if (stereo_layer == 0) sample_count = ip->left_samples;
   else if (stereo_layer == 1) sample_count = ip->right_samples;
@@ -430,10 +430,10 @@
       uint8 fractions;
       int32 tmplong;
       uint16 tmpshort;
-      uint16 sample_volume;
+      uint16 sample_volume = 0;
       uint8 tmpchar;
-      Sample *sp;
-      uint8 sf2delay;
+      Sample *sp = NULL;
+      uint8 sf2delay = 0;
 
 #define READ_CHAR(thing) \
       if (1 != fread(&tmpchar, 1, 1, fp)) goto fail; \

Modified: projects/haf/trunk/libsdl-mixer1.2/timidity/playmidi.c
===================================================================
--- projects/haf/trunk/libsdl-mixer1.2/timidity/playmidi.c	2007-01-04 11:00:41 UTC (rev 8951)
+++ projects/haf/trunk/libsdl-mixer1.2/timidity/playmidi.c	2007-01-04 11:05:51 UTC (rev 8952)
@@ -38,11 +38,9 @@
 #include "tables.h"
 
 
+#ifdef UNUSED
 static int dont_cspline=0;
 static int opt_dry = 1;
-static int opt_expression_curve = 2;
-static int opt_volume_curve = 2;
-static int opt_stereo_surround = 0;
 static int dont_filter_melodic=1;
 static int dont_filter_drums=1;
 static int dont_chorus=0;
@@ -50,6 +48,10 @@
 static int current_interpolation=1;
 static int dont_keep_looping=0;
 static int voice_reserve=0;
+#endif /* UNUSED */
+static int opt_expression_curve = 2;
+static int opt_volume_curve = 2;
+static int opt_stereo_surround = 0;
 
 
 Channel channel[MAXCHAN];
@@ -341,7 +343,6 @@
   int vol = channel[chan].volume;
   int expr = channel[chan].expression;
   int vel = vcurve[voice[v].velocity];
-  int drumpan = NO_PANNING;
   FLOAT_T curved_expression, curved_volume;
 
   if (channel[chan].kit)