[Pingus-CVS] r2816 - in branches/pingus_sdl: . src src/sound

[jsalmon3]

Author: jsalmon3
Date: 2007-08-05 21:38:44 +0200 (Sun, 05 Aug 2007)
New Revision: 2816

Modified:
   branches/pingus_sdl/TODO
   branches/pingus_sdl/src/result_screen.cpp
   branches/pingus_sdl/src/sound/sound.cpp
   branches/pingus_sdl/src/sound/sound.hpp
   branches/pingus_sdl/src/sound/sound_dummy.cpp
   branches/pingus_sdl/src/sound/sound_dummy.hpp
   branches/pingus_sdl/src/sound/sound_impl.hpp
   branches/pingus_sdl/src/sound/sound_real.cpp
   branches/pingus_sdl/src/sound/sound_real.hpp
Log:
Don't loop the music in the result screen

Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO    2007-08-05 19:18:47 UTC (rev 2815)
+++ branches/pingus_sdl/TODO    2007-08-05 19:38:44 UTC (rev 2816)
@@ -40,8 +40,6 @@
 
 - split screen multiplayer
 
-- music when level is finished loops, but shouldn't
-
 - remove unneeded/outdated fonts
 
 - Latin1 clean

Modified: branches/pingus_sdl/src/result_screen.cpp
===================================================================
--- branches/pingus_sdl/src/result_screen.cpp   2007-08-05 19:18:47 UTC (rev 
2815)
+++ branches/pingus_sdl/src/result_screen.cpp   2007-08-05 19:38:44 UTC (rev 
2816)
@@ -288,11 +288,11 @@
 {
   if (result.success())
     {
-      Sound::PingusSound::play_music("success_1.it");
+      Sound::PingusSound::play_music("success_1.it", 1.f, false);
     }
   else
     {
-      Sound::PingusSound::play_music("pingus-2.it");
+      Sound::PingusSound::play_music("pingus-2.it", 1.f, false);
     }
 }
 

Modified: branches/pingus_sdl/src/sound/sound.cpp
===================================================================
--- branches/pingus_sdl/src/sound/sound.cpp     2007-08-05 19:18:47 UTC (rev 
2815)
+++ branches/pingus_sdl/src/sound/sound.cpp     2007-08-05 19:38:44 UTC (rev 
2816)
@@ -109,10 +109,10 @@
 @param name
 @param volume   volume */
 void
-PingusSound::play_music(const std::string & name, float volume)
+PingusSound::play_music(const std::string & name, float volume, bool loop)
 {
   assert (sound);
-  sound->real_play_music(path_manager.complete ("music/" + name), volume);
+  sound->real_play_music(path_manager.complete ("music/" + name), volume, 
loop);
 }
 
 void

Modified: branches/pingus_sdl/src/sound/sound.hpp
===================================================================
--- branches/pingus_sdl/src/sound/sound.hpp     2007-08-05 19:18:47 UTC (rev 
2815)
+++ branches/pingus_sdl/src/sound/sound.hpp     2007-08-05 19:38:44 UTC (rev 
2816)
@@ -47,7 +47,7 @@
   @param panning  panning */
   static void play_sound(const std::string & name, float volume = 1.0f, float 
panning = 0.0f);
 
-  static void play_music(const std::string & name, float volume = 1.0f);
+  static void play_music(const std::string & name, float volume = 1.0f, bool 
loop = true);
   static void stop_music();
 
   static void play_sound(Sound::Name name, float volume = 1.0f, float panning 
= 0.0f);

Modified: branches/pingus_sdl/src/sound/sound_dummy.cpp
===================================================================
--- branches/pingus_sdl/src/sound/sound_dummy.cpp       2007-08-05 19:18:47 UTC 
(rev 2815)
+++ branches/pingus_sdl/src/sound/sound_dummy.cpp       2007-08-05 19:38:44 UTC 
(rev 2816)
@@ -31,7 +31,7 @@
 
 
 void
-PingusSoundDummy::real_play_music(const std::string & filename, float 
/*volume*/)
+PingusSoundDummy::real_play_music(const std::string & filename, float 
/*volume*/, bool /*loop*/)
 {
   pout(PINGUS_DEBUG_SOUND) << "PingusSoundDummy::real_play_music: " << 
filename << std::endl;
 }

Modified: branches/pingus_sdl/src/sound/sound_dummy.hpp
===================================================================
--- branches/pingus_sdl/src/sound/sound_dummy.hpp       2007-08-05 19:18:47 UTC 
(rev 2815)
+++ branches/pingus_sdl/src/sound/sound_dummy.hpp       2007-08-05 19:38:44 UTC 
(rev 2816)
@@ -32,7 +32,7 @@
        virtual ~PingusSoundDummy () { }
 
   virtual void real_play_sound (const std::string & filename, float volume, 
float panning);
-  virtual void real_play_music (const std::string & filename, float volume);
+  virtual void real_play_music (const std::string & filename, float volume, 
bool loop);
   virtual void real_stop_music();
 private:
   PingusSoundDummy (const PingusSoundDummy&);

Modified: branches/pingus_sdl/src/sound/sound_impl.hpp
===================================================================
--- branches/pingus_sdl/src/sound/sound_impl.hpp        2007-08-05 19:18:47 UTC 
(rev 2815)
+++ branches/pingus_sdl/src/sound/sound_impl.hpp        2007-08-05 19:38:44 UTC 
(rev 2816)
@@ -33,7 +33,7 @@
        /** Load a music file and play it immediately.
     @param filename The complete filename
     @param volume   The volume to play the music with  */
-  virtual void real_play_music(const std::string & filename, float volume) = 0;
+  virtual void real_play_music(const std::string & filename, float volume, 
bool loop) = 0;
 
        /** Stops playing any music file */
   virtual void real_stop_music() = 0;

Modified: branches/pingus_sdl/src/sound/sound_real.cpp
===================================================================
--- branches/pingus_sdl/src/sound/sound_real.cpp        2007-08-05 19:18:47 UTC 
(rev 2815)
+++ branches/pingus_sdl/src/sound/sound_real.cpp        2007-08-05 19:38:44 UTC 
(rev 2816)
@@ -95,7 +95,7 @@
 }
 
 void
-PingusSoundReal::real_play_music (const std::string & arg_filename, float 
volume)
+PingusSoundReal::real_play_music (const std::string & arg_filename, float 
volume, bool loop)
 {
   std::string filename;
 
@@ -117,7 +117,7 @@
     }
 
   Mix_VolumeMusic((int)(volume * 0.5f * MIX_MAX_VOLUME)); // FIXME: 
music_volume
-  Mix_PlayMusic(music_sample, -1);
+  Mix_PlayMusic(music_sample, loop ? -1 : 0);
 }
 
 } // namespace Sound

Modified: branches/pingus_sdl/src/sound/sound_real.hpp
===================================================================
--- branches/pingus_sdl/src/sound/sound_real.hpp        2007-08-05 19:18:47 UTC 
(rev 2815)
+++ branches/pingus_sdl/src/sound/sound_real.hpp        2007-08-05 19:38:44 UTC 
(rev 2816)
@@ -42,8 +42,9 @@
 
   /** Load a music file and play it immediately.
       @param filename The complete filename
-      @param volume   The volume to play the music with  */
-  virtual void real_play_music(const std::string & filename, float volume);
+      @param volume   The volume to play the music with
+      @param loop     The music file should loop continuously  */
+  virtual void real_play_music(const std::string & filename, float volume, 
bool loop);
 
   virtual void real_stop_music();