[Performous-commit] Lasse Karkkainen : Use same fadeTime for in/out.

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: e57db4ed937c4f0e50552b6f92b4c8560df1b514

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Jul 25 10:51:47 2009 +0300

Use same fadeTime for in/out.

---

 game/audio.cc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/game/audio.cc b/game/audio.cc
index 865d70d..fbb2d21 100644
--- a/game/audio.cc
+++ b/game/audio.cc
@@ -75,7 +75,7 @@ void Audio::playMusic(std::vector<std::string> const& filenames, bool preview, d
 	ch->add(boost::ref(*this));
 	m_volumeSetting = preview ? "audio/preview_volume" : "audio/music_volume";
 	ch->add(boost::ref(m_volume));
-	m_mixer.fadein(da::shared_ref(ch), 0.5, startPos);
+	m_mixer.fadein(da::shared_ref(ch), fadeTime, startPos);
 	if (!preview) pause(false);
 }