summaryrefslogtreecommitdiff
path: root/src/mmus2mid.c
diff options
context:
space:
mode:
authorSimon Howard2006-01-10 22:14:13 +0000
committerSimon Howard2006-01-10 22:14:13 +0000
commit75337e4ed54550f215145991517b0139fe7ce5c1 (patch)
tree01433c6b1a25de348184005ff7b33146988d601d /src/mmus2mid.c
parentae7adeeda69cc61ed4e9409b0a4d3d13b5d40332 (diff)
downloadchocolate-doom-75337e4ed54550f215145991517b0139fe7ce5c1.tar.gz
chocolate-doom-75337e4ed54550f215145991517b0139fe7ce5c1.tar.bz2
chocolate-doom-75337e4ed54550f215145991517b0139fe7ce5c1.zip
Shut up compiler warnings
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 280
Diffstat (limited to 'src/mmus2mid.c')
-rw-r--r--src/mmus2mid.c46
1 files changed, 24 insertions, 22 deletions
diff --git a/src/mmus2mid.c b/src/mmus2mid.c
index 5e6cb5e8..2166984c 100644
--- a/src/mmus2mid.c
+++ b/src/mmus2mid.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: mmus2mid.c 255 2006-01-05 02:48:03Z fraggle $
+// $Id: mmus2mid.c 280 2006-01-10 22:14:13Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright (C) 1999 by
@@ -27,6 +27,9 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.4 2006/01/10 22:14:13 fraggle
+// Shut up compiler warnings
+//
// Revision 1.3 2006/01/05 02:48:03 fraggle
// Fixes for big endian machines (thanks locust)
//
@@ -651,30 +654,9 @@ int MidiToMIDI(UBYTE *mid,MIDI *mididata)
// /* it also provides a MUS to MID file converter*/
// proff: I moved this down, because I need MIDItoMidi
-static void FreeTracks(MIDI *mididata);
static void TWriteLength(UBYTE **midiptr,ULONG length);
//
-// FreeTracks()
-//
-// Free all track allocations in the MIDI structure
-//
-// Passed a pointer to an Allegro MIDI structure
-// Returns nothing
-//
-static void FreeTracks(MIDI *mididata)
-{
- int i;
-
- for (i=0; i<MIDI_TRACKS; i++)
- {
- free(mididata->track[i].data);
- mididata->track[i].data = NULL;
- mididata->track[i].len = 0;
- }
-}
-
-//
// TWriteLength()
//
// Write the length of a MIDI chunk to a midi buffer. The length is four
@@ -762,6 +744,26 @@ int MIDIToMidi(MIDI *mididata,UBYTE **mid,int *midlen)
// proff: I moved this down, because I need MIDItoMidi
//
+// FreeTracks()
+//
+// Free all track allocations in the MIDI structure
+//
+// Passed a pointer to an Allegro MIDI structure
+// Returns nothing
+//
+static void FreeTracks(MIDI *mididata)
+{
+ int i;
+
+ for (i=0; i<MIDI_TRACKS; i++)
+ {
+ free(mididata->track[i].data);
+ mididata->track[i].data = NULL;
+ mididata->track[i].len = 0;
+ }
+}
+
+//
// main()
//
// Main routine that will convert a globbed set of MUS files to the