From 5adf1502b4526fdbf8f05bb816cafc8f57cb5951 Mon Sep 17 00:00:00 2001 From: Matt McCutchen Date: Mon, 15 Feb 2010 05:41:35 +0000 Subject: [PATCH] Adjust music definition files. http://lists.lethargik.org/pipermail/supertux-devel-lethargik.org/2009-November/002508.html SVN-Revision: 6334 --- data/music/airship_remix.music | 2 +- data/music/cave.music | 4 ++-- data/music/ghostforest.music | 4 ++-- data/music/greatgigantic.music | 4 ++-- data/music/invincible.music | 5 ----- data/music/leveldone.music | 3 --- src/supertux/game_session.cpp | 2 +- src/supertux/sector.cpp | 2 +- 8 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 data/music/invincible.music delete mode 100644 data/music/leveldone.music diff --git a/data/music/airship_remix.music b/data/music/airship_remix.music index 0f700c5f2..65fc926d7 100644 --- 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 c476f67b2..343374d77 100644 --- 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 60d11fec8..2bd022019 100644 --- 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 49f332d3d..63dec8b00 100644 --- 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 index d284e74ce..000000000 --- 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 index 8f049e3c6..000000000 --- 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 c907896e4..d4df670f1 100644 --- 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 571e2b446..a724e8e85 100644 --- 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); -- 2.11.0