aboutsummaryrefslogtreecommitdiffstats
path: root/Medley
diff options
context:
space:
mode:
authorbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-12-21 11:28:12 +0000
committerbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-12-21 11:28:12 +0000
commitf703eb192dce8d90ce09e6d92892fd788b4af3b7 (patch)
tree2fec5c56becb3786b5e9dc8ba5a746ec99b6c32e /Medley
parent685ed5368eabc3704e2b099a1bd43c8317d92c31 (diff)
downloadusdx-f703eb192dce8d90ce09e6d92892fd788b4af3b7.tar.gz
usdx-f703eb192dce8d90ce09e6d92892fd788b4af3b7.tar.xz
usdx-f703eb192dce8d90ce09e6d92892fd788b4af3b7.zip
fixed calculation of FadeIn and FadeOut
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2052 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Medley')
-rw-r--r--Medley/src/base/USong.pas6
1 files changed, 2 insertions, 4 deletions
diff --git a/Medley/src/base/USong.pas b/Medley/src/base/USong.pas
index 38ddaaf6..5d0f9a23 100644
--- a/Medley/src/base/USong.pas
+++ b/Medley/src/base/USong.pas
@@ -1181,11 +1181,9 @@ begin
self.Medley.Source := msTag;
//calculate fade time
- self.Medley.FadeIn_time := GetTimeFromBeat(CurrentSong.Medley.StartBeat) -
- DEFAULT_FADE_IN_TIME;
+ self.Medley.FadeIn_time := DEFAULT_FADE_IN_TIME;
- self.Medley.FadeOut_time := GetTimeFromBeat(CurrentSong.Medley.FadeOut) -
- DEFAULT_FADE_OUT_TIME;
+ self.Medley.FadeOut_time := DEFAULT_FADE_OUT_TIME;
end else
self.Medley.Source := msNone;
end;