From a93f52fa005c0d1b8ef7c787ed7554d9276f6359 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 26 Sep 2009 22:23:16 +0000 Subject: [PATCH] Fixed bug #809 O.Sezer 2009-09-26 04:38:45 PDT the filename argument of native_midi_loadsong() should be const char*, the attached patch does that and also removes the unnecessary char* cast in music.c where native_midi_loadsong() is called. --- music.c | 2 +- native_midi/native_midi.h | 2 +- native_midi/native_midi_mac.c | 2 +- native_midi/native_midi_win32.c | 2 +- native_midi_gpl/native_midi_gpl.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/music.c b/music.c index c73cb092..2a37f605 100644 --- a/music.c +++ b/music.c @@ -627,7 +627,7 @@ Mix_Music *Mix_LoadMUS(const char *file) music->type = MUS_MID; #ifdef USE_NATIVE_MIDI if ( native_midi_ok ) { - music->data.nativemidi = native_midi_loadsong((char *)file); + music->data.nativemidi = native_midi_loadsong(file); if ( music->data.nativemidi == NULL ) { Mix_SetError("%s", native_midi_error()); music->error = 1; diff --git a/native_midi/native_midi.h b/native_midi/native_midi.h index ec4cdcc0..7234b744 100644 --- a/native_midi/native_midi.h +++ b/native_midi/native_midi.h @@ -28,7 +28,7 @@ typedef struct _NativeMidiSong NativeMidiSong; int native_midi_detect(); -NativeMidiSong *native_midi_loadsong(char *midifile); +NativeMidiSong *native_midi_loadsong(const char *midifile); NativeMidiSong *native_midi_loadsong_RW(SDL_RWops *rw); void native_midi_freesong(NativeMidiSong *song); void native_midi_start(NativeMidiSong *song); diff --git a/native_midi/native_midi_mac.c b/native_midi/native_midi_mac.c index 405ee0d6..ffc8640c 100644 --- a/native_midi/native_midi_mac.c +++ b/native_midi/native_midi_mac.c @@ -89,7 +89,7 @@ int native_midi_detect() return 1; } -NativeMidiSong *native_midi_loadsong(char *midifile) +NativeMidiSong *native_midi_loadsong(const char *midifile) { NativeMidiSong *song = NULL; MIDIEvent *evntlist = NULL; diff --git a/native_midi/native_midi_win32.c b/native_midi/native_midi_win32.c index 35ae7d94..2efca179 100644 --- a/native_midi/native_midi_win32.c +++ b/native_midi/native_midi_win32.c @@ -188,7 +188,7 @@ int native_midi_detect() return 1; } -NativeMidiSong *native_midi_loadsong(char *midifile) +NativeMidiSong *native_midi_loadsong(const char *midifile) { NativeMidiSong *newsong; MIDIEvent *evntlist = NULL; diff --git a/native_midi_gpl/native_midi_gpl.c b/native_midi_gpl/native_midi_gpl.c index 16e66d00..3b54c557 100644 --- a/native_midi_gpl/native_midi_gpl.c +++ b/native_midi_gpl/native_midi_gpl.c @@ -127,7 +127,7 @@ int native_midi_detect() return ret; } -NativeMidiSong *native_midi_loadsong(char *midifile) +NativeMidiSong *native_midi_loadsong(const char *midifile) { NativeMidiSong *song = NULL; char *extra;