midi.c: resurrect debug printing.

[lilypond.git] / python / midi.c

diff --git a/python/midi.c b/python/midi.c
index 059235eddd609a82f4de0bfeae44f552a1bfebce..2ec52244097f7f35f1c007f847aff050868147bd 100644 (file)
--- a/python/midi.c
+++ b/python/midi.c
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2001--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2001--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
             Jan Nieuwenhuizen <janneke@gnu.org>
 
 
@@ -41,7 +41,7 @@ each track is an EVENTLIST, where EVENT is
 #include <Python.h>
 
 char *
-itoa (int i)
+compat_itoa (int i)
 {
   static char buffer[9];
   snprintf (buffer, 8, "%d", i);
@@ -60,7 +60,8 @@ itoa (int i)
 #if 0
 int x = 0;
 int *track = &x;
-#define debug_print(f, args...) fprintf (stderr, "%s:%d: track: %p :" f, __FUNCTION__, __LINE__, *track, ##args)
+#define urg_debug_print(f, args...) fprintf (stderr, "%s:%d: track: %p: " f, __FUNCTION__, __LINE__, *track, ##args)
+#define debug_print(f, args...) fprintf (stderr, f, ##args)
 #else
 #define debug_print(f, args...)
 #endif
@@ -161,7 +162,7 @@ get_number (unsigned char ** str, unsigned char * end_str, int length)
     sum = (sum << 8) + (unsigned char) (*str)[i];
 
   *str += length;
-  debug_print ("%d:\n", sum);
+  debug_print ("%ld:\n", sum);
   return sum;
 }
 
@@ -178,7 +179,7 @@ get_variable_length_number (unsigned char **str, unsigned char * end_str)
       if (!(x & 0x80))
        break;
     }
-  debug_print ("%d:\n", sum);
+  debug_print ("%ld:\n", sum);
   return sum;
 }
 
@@ -312,13 +313,13 @@ midi_parse_track (unsigned char **track, unsigned char *track_end)
 
   track_len = get_number (track, *track + 4, 4);
 
-  debug_print ("track_len: %u\n", track_len);
-  debug_print ("track_size: %u\n", track_size);
+  debug_print ("track_len: %lu\n", track_len);
+  debug_print ("track_size: %lu\n", track_size);
   debug_print ("track begin: %p\n", track);
   debug_print ("track end: %p\n", track + track_len);
   
   if (track_len > track_size)
-    return midi_error (__FUNCTION__,  ": track length corrupt: ", itoa (track_len));
+    return midi_error (__FUNCTION__,  ": track length corrupt: ", compat_itoa (track_len));
 
   pytrack = PyList_New (0);
 
@@ -361,7 +362,7 @@ pymidi_parse_track (PyObject *self, PyObject *args)
     return 0;
 
   if (track_size < 0)
-    return midi_error (__FUNCTION__,   ": negative track size: ", itoa (track_size));
+    return midi_error (__FUNCTION__,   ": negative track size: ", compat_itoa (track_size));
 
   track_end = track + track_size;
   
@@ -383,13 +384,13 @@ midi_parse (unsigned char **midi,unsigned  char *midi_end)
   header_len = get_number (midi, *midi + 4, 4);
   
   if (header_len < 6)
-    return midi_error (__FUNCTION__,  ": header too short: ", itoa (header_len));
+    return midi_error (__FUNCTION__,  ": header too short: ", compat_itoa (header_len));
     
   format = get_number (midi, *midi + 2, 2);
   tracks = get_number (midi, *midi + 2, 2);
 
-  if (tracks > 32)
-    return midi_error (__FUNCTION__,  ": too many tracks: ", itoa (tracks));
+  if (tracks > 256)
+    return midi_error (__FUNCTION__,  ": too many tracks: ", compat_itoa (tracks));
   
   division = get_number (midi, *midi + 2, 2) * 4;