summaryrefslogtreecommitdiff
path: root/src/mmus2mid.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mmus2mid.h')
-rw-r--r--src/mmus2mid.h71
1 files changed, 26 insertions, 45 deletions
diff --git a/src/mmus2mid.h b/src/mmus2mid.h
index c89c32f2..f57b25b4 100644
--- a/src/mmus2mid.h
+++ b/src/mmus2mid.h
@@ -1,9 +1,14 @@
// Emacs style mode select -*- C++ -*-
-//-----------------------------------------------------------------------------
+//--------------------------------------------------------------------------
//
-// $Id: mmus2mid.h 75 2005-09-05 22:50:56Z fraggle $
+// $Id: mmus2mid.h 76 2005-09-06 21:06:45Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright (C) 1999 by
+// id Software, Chi Hoang, Lee Killough, Jim Flynn, Rand Phares, Ty Halderman
+// Copyright (C) 1999-2000 by
+// Jess Haas, Nicolas Kalkhof, Colin Phipps, Florian Schulze
+//
// Copyright(C) 2005 Simon Howard
//
// This program is free software; you can redistribute it and/or
@@ -22,38 +27,13 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.2 2005/09/06 21:06:45 fraggle
+// Newer versions of mmus2mid.c,h from prboom
+//
// Revision 1.1 2005/09/05 22:50:56 fraggle
// Add mmus2mid code from prboom. Use 'void *' for music handles. Pass
// length of data when registering music.
//
-/* Emacs style mode select -*- C++ -*-
- *-----------------------------------------------------------------------------
- *
- *
- * PrBoom a Doom port merged with LxDoom and LSDLDoom
- * based on BOOM, a modified and improved DOOM engine
- * Copyright (C) 1999 by
- * id Software, Chi Hoang, Lee Killough, Jim Flynn, Rand Phares, Ty Halderman
- * Copyright (C) 1999-2000 by
- * Jess Haas, Nicolas Kalkhof, Colin Phipps, Florian Schulze
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- *-----------------------------------------------------------------------------
- */
#if !defined( MMUS2MID_H )
#define MMUS2MID_H
@@ -62,25 +42,25 @@
typedef enum
{
- MUSDATACOR, // MUS data corrupt
- TOOMCHAN, // Too many channels
- MEMALLOC, // Memory allocation error
- MUSDATAMT, // MUS file empty
- BADMUSCTL, // MUS event 5 or 7 found
- BADSYSEVT, // MUS system event not in 10-14 range
- BADCTLCHG, // MUS control change larger than 9
- TRACKOVF, // MIDI track exceeds allocation
- BADMIDHDR, // bad midi header detected
+ MUSDATACOR, // MUS data corrupt
+ TOOMCHAN, // Too many channels
+ MEMALLOC, // Memory allocation error
+ MUSDATAMT, // MUS file empty
+ BADMUSCTL, // MUS event 5 or 7 found
+ BADSYSEVT, // MUS system event not in 10-14 range
+ BADCTLCHG, // MUS control change larger than 9
+ TRACKOVF, // MIDI track exceeds allocation
+ BADMIDHDR, // bad midi header detected
} error_code_t;
-// some names for integers of various sizes, all unsigned
-typedef unsigned char UBYTE; // a one-byte int
-typedef unsigned short UWORD; // a two-byte int
+// some names for integers of various sizes, all unsigned
+typedef unsigned char UBYTE; // a one-byte int
+typedef unsigned short UWORD; // a two-byte int
// proff: changed from unsigned int to unsigned long to avoid warning
-typedef unsigned long ULONG; // a four-byte int (assumes int 4 bytes)
+typedef unsigned long ULONG; // a four-byte int (assumes int 4 bytes)
#ifndef MSDOS /* proff: This is from allegro.h */
-#define MIDI_TRACKS 32
+#define MIDI_TRACKS 32
typedef struct MIDI /* a midi file */
{
@@ -88,11 +68,12 @@ typedef struct MIDI /* a midi file */
struct {
unsigned char *data; /* MIDI message stream */
int len; /* length of the track data */
- } track[MIDI_TRACKS];
+ } track[MIDI_TRACKS];
} MIDI;
#endif /* !MSDOS */
extern int mmus2mid(const UBYTE *mus,MIDI *mid, UWORD division, int nocomp);
+extern void free_mididata(MIDI *mid);
extern int MIDIToMidi(MIDI *mididata,UBYTE **mid,int *midlen);
extern int MidiToMIDI(UBYTE *mid,MIDI *mididata);