Adjust music definition files.

http://lists.lethargik.org/pipermail/supertux-devel-lethargik.org/2009-November/002508.html

SVN-Revision: 6334

diff --git a/data/music/airship_remix.music b/data/music/airship_remix.music
index 0f700c5..65fc926 100644 (file)
--- a/data/music/airship_remix.music
+++ b/data/music/airship_remix.music
@@ -1,5 +1,5 @@
 (supertux-music
   (file "airship_remix.ogg")
   (loop-begin 4)
-  (loop-at    112)
+  (loop-at    58)
 )

diff --git a/data/music/cave.music b/data/music/cave.music
index c476f67..343374d 100644 (file)
--- a/data/music/cave.music
+++ b/data/music/cave.music
@@ -1,5 +1,5 @@
 (supertux-music
   (file "cave.ogg")
-  (loop-begin 41.0) ;sample no. 1808100
-  (loop-at    56.4) ;sample no. 2487240
+  (loop-begin 0)
+  (loop-at    -1)
 )

diff --git a/data/music/ghostforest.music b/data/music/ghostforest.music
index 60d11fe..2bd0220 100644 (file)
--- a/data/music/ghostforest.music
+++ b/data/music/ghostforest.music
@@ -1,5 +1,5 @@
 (supertux-music
   (file "ghostforest.ogg")
-  (loop-begin 22.1)
-  (loop-at    83.0)
+  (loop-begin 0)
+  (loop-at    -1)
 )

diff --git a/data/music/greatgigantic.music b/data/music/greatgigantic.music
index 49f332d..63dec8b 100644 (file)
--- a/data/music/greatgigantic.music
+++ b/data/music/greatgigantic.music
@@ -1,5 +1,5 @@
 (supertux-music
   (file "greatgigantic.ogg")
-  (loop-begin 65.5) ;sample no. 2888550
-  (loop-at    90.4) ;sample no. 4427640
+  (loop-begin 0)
+  (loop-at    -1)
 )

diff --git a/data/music/invincible.music b/data/music/invincible.music
deleted file mode 100644 (file)
index d284e74..0000000
--- a/data/music/invincible.music
+++ /dev/null
@@ -1,5 +0,0 @@
-(supertux-music
-  (file "invincible.ogg")
-  (loop-begin 5.18820861678005) ;sample no. 228800
-  (loop-at    10.5578231292517) ;sample no. 465600
-)

diff --git a/data/music/leveldone.music b/data/music/leveldone.music
deleted file mode 100644 (file)
index 8f049e3..0000000
--- a/data/music/leveldone.music
+++ /dev/null
@@ -1,3 +0,0 @@
-(supertux-music
-  (file "leveldone.ogg")
-)

diff --git a/src/supertux/game_session.cpp b/src/supertux/game_session.cpp
index c907896..d4df670 100644 (file)
--- a/src/supertux/game_session.cpp
+++ b/src/supertux/game_session.cpp
@@ -569,7 +569,7 @@ GameSession::start_sequence(const std::string& sequencename)
   currentsector->add_object(end_sequence);
   end_sequence->start();
 
-  sound_manager->play_music("music/leveldone.music", false);
+  sound_manager->play_music("music/leveldone.ogg", false);
   currentsector->player->invincible_timer.start(10000.0f);
 
   // Stop all clocks.

diff --git a/src/supertux/sector.cpp b/src/supertux/sector.cpp
index 571e2b4..a724e8e 100644 (file)
--- a/src/supertux/sector.cpp
+++ b/src/supertux/sector.cpp
@@ -1772,7 +1772,7 @@ Sector::play_music(MusicType type)
       sound_manager->play_music(music);
       break;
     case HERRING_MUSIC:
-      sound_manager->play_music("music/invincible.music");
+      sound_manager->play_music("music/invincible.ogg");
       break;
     case HERRING_WARNING_MUSIC:
       sound_manager->stop_music(TUX_INVINCIBLE_TIME_WARNING);