- changed way badguy removal is handled (ie. with a flag now)

[supertux.git] / src / sound.h

diff --git a/src/sound.h b/src/sound.h
index 14feafa..095e3c4 100644 (file)
--- a/src/sound.h
+++ b/src/sound.h
@@ -1,17 +1,22 @@
-/*
-  sound.h
-  
-  Super Tux - Audio Functions
-  
-  by Bill Kendrick
-  bill@newbreedsoftware.com
-  http://www.newbreedsoftware.com/supertux/
- 
-  April 22, 2000 - December 28, 2003
-
-  Current maintainer:
-        Duong-Khang NGUYEN <neoneurone@users.sf.net>
-*/
+//  $Id$
+//
+//  SuperTux -  A Jump'n Run
+//  Copyright (C) 2000 Bill Kendrick <bill@newbreedsoftware.com>
+//  Copyright (C) 2004 Duong-Khang NGUYEN <neoneurone@users.sf.net>
+//
+//  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.
 
 #ifndef SUPERTUX_SOUND_H
 #define SUPERTUX_SOUND_H
@@ -22,9 +27,9 @@
 #define SOUND_RESERVED_CHANNELS 2
 
 /*global variable*/
-int use_sound;           /* handle sound on/off menu and command-line option */
-int use_music;           /* handle music on/off menu and command-line option */
-int audio_device;        /* != 0: available and initialized */
+extern bool use_sound;           /* handle sound on/off menu and command-line option */
+extern bool use_music;           /* handle music on/off menu and command-line option */
+extern bool audio_device;        /* != 0: available and initialized */
 
 /* enum of different internal music types */
 enum Music_Type {
@@ -32,7 +37,8 @@ enum Music_Type {
   LEVEL_MUSIC,
   HURRYUP_MUSIC,
   HERRING_MUSIC
-} current_music;
+};
+
 
 /* panning effects: terrible :-) ! */
 enum Sound_Speaker {
@@ -64,48 +70,27 @@ enum {
   NUM_SOUNDS
 };
 
-#ifndef NOSOUND
+extern char* soundfilenames[NUM_SOUNDS];
 
+#include <string>
 #include <SDL_mixer.h>
 
 /* variables for stocking the sound and music */
-Mix_Chunk * sounds[NUM_SOUNDS];
-Mix_Music * level_song, * level_song_fast, * herring_song;
+extern Mix_Chunk* sounds[NUM_SOUNDS];
+extern Mix_Music* herring_song;
 
 /* functions handling the sound and music */
 int open_audio(int frequency, Uint16 format, int channels, int chunksize);
 void close_audio( void );
 
-Mix_Chunk * load_sound(char * file);
-void play_sound(Mix_Chunk * snd, enum Sound_Speaker whichSpeaker);
-Mix_Music * load_song(char * file);
-
-int playing_music(void);
-int halt_music(void);
-int play_music(Mix_Music*music, int loops);
-void free_music(Mix_Music*music);
+Mix_Chunk * load_sound(const std::string& file);
 void free_chunk(Mix_Chunk*chunk);
+void play_sound(Mix_Chunk * snd, enum Sound_Speaker whichSpeaker);
 
-#else
-
-/* fake variables */
-void* sounds[NUM_SOUNDS];
-void* level_song, *herring_song;
-
-/* fake sound handlers */
-int open_audio (int frequency, int format, int channels, int chunksize);
-void close_audio( void );
-
-void* load_sound(void* file);
-void play_sound(void * snd, enum Sound_Speaker whichSpeaker);
-void* load_song(void* file);
-
-int playing_music();
-void halt_music();
-int play_music(void *music, int loops);
-void free_music(void *music);
-void free_chunk(void *chunk);
-
-#endif
+Mix_Music* load_song(const std::string& file);
+void free_music(Mix_Music* music);
+void halt_music(void);
+void enable_music(bool enable);
+void play_music(Mix_Music* music);
 
 #endif /*SUPERTUX_SOUND_H*/