- beginnings of a wingling

[supertux.git] / src / sound.h

diff --git a/src/sound.h b/src/sound.h
index 095e3c4..d38b1ff 100644 (file)
--- a/src/sound.h
+++ b/src/sound.h
@@ -23,12 +23,9 @@
 
 #include "defines.h"     /* get YES/NO defines */
 
-/* used to reserve some channels for panning effects */
-#define SOUND_RESERVED_CHANNELS 2
-
 /*global variable*/
 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 use_music;           /* handle music on/off menu and command-line */
 extern bool audio_device;        /* != 0: available and initialized */
 
 /* enum of different internal music types */
@@ -39,11 +36,11 @@ enum Music_Type {
   HERRING_MUSIC
 };
 
-
 /* panning effects: terrible :-) ! */
 enum Sound_Speaker {
   SOUND_LEFT_SPEAKER = 0,
   SOUND_RIGHT_SPEAKER = 1,
+  SOUND_RESERVED_CHANNELS = 2, // 2 channels reserved for left/right speaker
   SOUND_CENTER_SPEAKER = -1
 };
 
@@ -67,6 +64,7 @@ enum {
   SND_LIFEUP,
   SND_STOMP,
   SND_KICK,
+  SND_EXPLODE,
   NUM_SOUNDS
 };
 
@@ -77,7 +75,6 @@ extern char* soundfilenames[NUM_SOUNDS];
 
 /* variables for stocking the sound and music */
 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);
@@ -87,10 +84,4 @@ Mix_Chunk * load_sound(const std::string& file);
 void free_chunk(Mix_Chunk*chunk);
 void play_sound(Mix_Chunk * snd, enum Sound_Speaker whichSpeaker);
 
-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*/