diff --git a/Vocaluxe/Base/CBackgroundMusic.cs b/Vocaluxe/Base/CBackgroundMusic.cs index 1bd01a18..34b240a9 100644 --- a/Vocaluxe/Base/CBackgroundMusic.cs +++ b/Vocaluxe/Base/CBackgroundMusic.cs @@ -17,7 +17,7 @@ namespace Vocaluxe.Base private static bool _Fading; private static Stopwatch _FadeTimer = new Stopwatch(); - public static void init() + public static void Init() { List files = new List(); files.AddRange(Helper.ListFiles(CSettings.sFolderBackgroundMusic, "*.mp3", true, true)); @@ -60,7 +60,7 @@ namespace Vocaluxe.Base public static void Pause() { if (_BackgroundMusicStreams.Count > 0) - CSound.Pause(_BackgroundMusicStreams[_CurrentStreamListIndex]); + CSound.FadeAndPause(_BackgroundMusicStreams[_CurrentStreamListIndex], 0, CConfig.FadeTime); } public static void Update() @@ -85,7 +85,7 @@ namespace Vocaluxe.Base } else _CurrentMusicStream = _BackgroundMusicStreams[_CurrentStreamListIndex]; - CSound.SetPosition(_CurrentStreamListIndex, 0); + CSound.SetPosition(_CurrentMusicStream, 0); Play(); _Fading = true; } diff --git a/Vocaluxe/Program.cs b/Vocaluxe/Program.cs index 3656c1df..6c65184e 100644 --- a/Vocaluxe/Program.cs +++ b/Vocaluxe/Program.cs @@ -84,7 +84,7 @@ namespace Vocaluxe // Init Background Music CLog.StartBenchmark(0, "Init Background Music"); - CBackgroundMusic.init(); + CBackgroundMusic.Init(); CLog.StopBenchmark(0, "Init Background Music"); // Init Profiles