summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2009-08-29 21:05:36 +0000
committerSimon Howard2009-08-29 21:05:36 +0000
commit324c1d8776054394d30ea987f84c1ba2f1b1ff6f (patch)
tree2726d86cf8807ffc4369dcc493998613db89c4dd
parent6cae0f05cfedce28038f9411f03e6b1415250c33 (diff)
downloadchocolate-doom-324c1d8776054394d30ea987f84c1ba2f1b1ff6f.tar.gz
chocolate-doom-324c1d8776054394d30ea987f84c1ba2f1b1ff6f.tar.bz2
chocolate-doom-324c1d8776054394d30ea987f84c1ba2f1b1ff6f.zip
Rename MIDI_OpenFile to MIDI_LoadFile, remove unneeded structure
packing. Subversion-branch: /branches/opl-branch Subversion-revision: 1636
-rw-r--r--src/midifile.c4
-rw-r--r--src/midifile.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/midifile.c b/src/midifile.c
index 1be6ec75..6eb9e7db 100644
--- a/src/midifile.c
+++ b/src/midifile.c
@@ -60,7 +60,7 @@ typedef struct
midi_event_t *events;
int num_events;
-} PACKEDATTR midi_track_t;
+} midi_track_t;
struct midi_file_s
{
@@ -575,7 +575,7 @@ void MIDI_FreeFile(midi_file_t *file)
free(file);
}
-midi_file_t *MIDI_OpenFile(char *filename)
+midi_file_t *MIDI_LoadFile(char *filename)
{
midi_file_t *file;
FILE *stream;
diff --git a/src/midifile.h b/src/midifile.h
index 490b0171..f9acea35 100644
--- a/src/midifile.h
+++ b/src/midifile.h
@@ -129,7 +129,7 @@ typedef struct
} data;
} midi_event_t;
-midi_file_t *MIDI_OpenFile(char *filename);
+midi_file_t *MIDI_LoadFile(char *filename);
void MIDI_FreeFile(midi_file_t *file);
#endif /* #ifndef MIDIFILE_H */