- more menu cleanup

[supertux.git] / src / sound.h

diff --git a/src/sound.h b/src/sound.h
index 3a1d30a..a2cae99 100644 (file)
--- a/src/sound.h
+++ b/src/sound.h
@@ -7,7 +7,7 @@
   bill@newbreedsoftware.com
   http://www.newbreedsoftware.com/supertux/
  
-  April 22, 2000 - December 28, 2003
+  April 22, 2000 - March 15, 2004
 
   Current maintainer:
         Duong-Khang NGUYEN <neoneurone@users.sf.net>
@@ -69,6 +69,7 @@ extern char* soundfilenames[NUM_SOUNDS];
 
 #ifndef NOSOUND
 
+#include <string>
 #include <SDL_mixer.h>
 
 /* variables for stocking the sound and music */
@@ -79,9 +80,9 @@ extern Mix_Music * level_song, * level_song_fast, * herring_song;
 int open_audio(int frequency, Uint16 format, int channels, int chunksize);
 void close_audio( void );
 
-Mix_Chunk * load_sound(char * file);
+Mix_Chunk * load_sound(const std::string& file);
 void play_sound(Mix_Chunk * snd, enum Sound_Speaker whichSpeaker);
-Mix_Music * load_song(char * file);
+Mix_Music * load_song(const std::string& file);
 
 int playing_music(void);
 int halt_music(void);
@@ -97,7 +98,7 @@ void play_current_music();
 
 /* fake variables */
 extern void* sounds[NUM_SOUNDS];
-extern void* level_song, *herring_song;
+extern void * level_song, * level_song_fast, * herring_song;
 
 /* fake sound handlers */
 int open_audio (int frequency, int format, int channels, int chunksize);