[xiph-cvs] cvs commit: ogg-tools/oggmerge midi.c vorbis.c

[Jack Moffitt]

jack        01/09/03 19:45:57

  Modified:    oggmerge midi.c vorbis.c
  Log:
  Testing on both ppc and x86 is finding some fun bugs :)

Revision  Changes    Path
1.3       +2 -2      ogg-tools/oggmerge/midi.c

Index: midi.c
===================================================================
RCS file: /usr/local/cvsroot/ogg-tools/oggmerge/midi.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- midi.c	2001/09/04 02:23:33	1.2
+++ midi.c	2001/09/04 02:45:57	1.3
@@ -435,7 +435,7 @@
 
 static int _process_data(midi_state_t *midistate)
 {
-	char *buf;
+	unsigned char *buf;
         unsigned short rawtime;
         unsigned char smtpe;
         int frames;
@@ -689,7 +689,7 @@
                         // need to catch tempo changes here
                         if (midistate->metatype == 0x51) {
                                 // 0x51 has 0x03 length
-				midistate->tempo = (buf[0] << 16) | (buf[1] << 8) | buf[2];
+				midistate->tempo = ((buf[0] << 16) | (buf[1] << 8) | buf[2]);
                         }
                         free(buf);
                         midistate->length = 0;

1.3       +1 -1      ogg-tools/oggmerge/vorbis.c

Index: vorbis.c
===================================================================
RCS file: /usr/local/cvsroot/ogg-tools/oggmerge/vorbis.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vorbis.c	2001/09/04 02:23:33	1.2
+++ vorbis.c	2001/09/04 02:45:57	1.3
@@ -147,7 +147,7 @@
         if (vstate->samplerate == 0) return 0;
         
         stamp = (double)granulepos * (double)1000000 / (double)vstate->samplerate;
-	
+
         return stamp;
 }
 

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.