- just doing some C++ifying

[supertux.git] / src / sound.cpp

diff --git a/src/sound.cpp b/src/sound.cpp
index 0098cb0..83c8bbb 100644 (file)
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -17,7 +17,6 @@
 //  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.
-
 #include "defines.h"
 #include "globals.h"
 #include "sound.h"
@@ -32,8 +31,8 @@ char * soundfilenames[NUM_SOUNDS] = {
                                        "/sounds/jump.wav",
                                        "/sounds/bigjump.wav",
                                        "/sounds/skid.wav",
-                                       "/sounds/distro.wav",
-                                       "/sounds/herring.wav",
+                                       "/sounds/coin.wav",
+                                       "/sounds/invincible.wav",
                                        "/sounds/brick.wav",
                                        "/sounds/hurt.wav",
                                        "/sounds/squish.wav",
@@ -41,13 +40,13 @@ char * soundfilenames[NUM_SOUNDS] = {
                                        "/sounds/ricochet.wav",
                                        "/sounds/bump-upgrade.wav",
                                        "/sounds/upgrade.wav",
-                                       "/sounds/excellent.wav",
-                                       "/sounds/coffee.wav",
+                                       "/sounds/grow.wav",
+                                       "/sounds/fire-flower.wav",
                                        "/sounds/shoot.wav",
                                        "/sounds/lifeup.wav",
                                        "/sounds/stomp.wav",
                                        "/sounds/kick.wav",
-                                       "/sounds/explode.wav"
+                                       "/sounds/explosion.wav"
                                     };
 
 
@@ -59,24 +58,14 @@ Mix_Chunk * sounds[NUM_SOUNDS];
 
 int open_audio (int frequency, Uint16 format, int channels, int chunksize)
 {
-  /* if success we reserved some channels and register panning effects */
-  if (Mix_OpenAudio( frequency, format, channels, chunksize ) == 0)
-    {
-      if (Mix_ReserveChannels( SOUND_RESERVED_CHANNELS )
-                            != SOUND_RESERVED_CHANNELS )
-        {
-          DEBUG_MSG( "Warning: open_audio could'nt reserve channels" );
-        }
-
-      /* prepare the spanning effects, no error checking */
-      Mix_SetPanning( SOUND_LEFT_SPEAKER, 230, 24 );
-      Mix_SetPanning( SOUND_RIGHT_SPEAKER, 24, 230 );
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
+  if (Mix_OpenAudio( frequency, format, channels, chunksize ) < 0)
+    return -1;
+
+  // allocate 16 channels for mixing
+  if (Mix_AllocateChannels(8)  != 8)
+    return -2;
+  
+  return 0;
 }
 
 
@@ -85,8 +74,6 @@ int open_audio (int frequency, Uint16 format, int channels, int chunksize)
 void close_audio( void )
 {
   if (audio_device) {
-    Mix_UnregisterAllEffects( SOUND_LEFT_SPEAKER );
-    Mix_UnregisterAllEffects( SOUND_RIGHT_SPEAKER );
     Mix_CloseAudio();
   }
 }
@@ -94,64 +81,21 @@ void close_audio( void )
 
 /* --- LOAD A SOUND --- */
 
-Mix_Chunk * load_sound(const std::string& file)
-{
-  Mix_Chunk * snd;
-
-  snd = Mix_LoadWAV(file.c_str());
-
-  if ((snd == NULL) && audio_device)
-    st_abort("Can't load", file);
-
-  return(snd);
-}
-
-
-/* --- LOAD A SONG --- */
-
-Mix_Music * load_song(const std::string& file)
+Mix_Chunk* load_sound(const std::string& file)
 {
   if(!audio_device)
-    return (Mix_Music*) ~0;
+    return 0;
   
-  Mix_Music* song = Mix_LoadMUS(file.c_str());
-  return song;
-}
-
+  Mix_Chunk* snd = Mix_LoadWAV(file.c_str());
 
-/* --- PLAY A SOUND ON LEFT OR RIGHT OR CENTER SPEAKER --- */
+  if (snd == 0)
+    st_abort("Can't load", file);
 
-void play_sound(Mix_Chunk * snd, enum Sound_Speaker whichSpeaker)
-{
-  /* this won't call the function if the user has disabled sound
-   * either via menu or via command-line option
-   */
-  if (use_sound && audio_device)
-    {
-      Mix_PlayChannel( whichSpeaker, snd, 0);
-
-      /* prepare for panning effects for next call */
-      /* warning: currently, I do not check for errors here */
-      switch (whichSpeaker) {
-        case SOUND_LEFT_SPEAKER:
-          Mix_SetPanning( SOUND_LEFT_SPEAKER, 230, 24 );
-          break;
-        case SOUND_RIGHT_SPEAKER:
-          Mix_SetPanning( SOUND_RIGHT_SPEAKER, 24, 230 );
-          break;
-        default:  // keep the compiler happy
-          break;
-      }
-    }
+  return(snd);
 }
 
-
 void free_chunk(Mix_Chunk *chunk)
 {
-  if (chunk != NULL)
-    {
-      Mix_FreeChunk( chunk );
-      chunk = NULL;
-    }
+  Mix_FreeChunk( chunk );
 }