Use new FadeAndStop() Method and fading fix
This commit is contained in:
1 parent
486b7235f3
commit
8a78849505
2 files changed
+4
-4
No files matched your search
@@ -17,7 +17,7 @@ namespace Vocaluxe.Base
|
|||||||
private static bool _Fading;
|
private static bool _Fading;
|
||||||
private static Stopwatch _FadeTimer = new Stopwatch();
|
private static Stopwatch _FadeTimer = new Stopwatch();
|
||||||
|
|
||||||
public static void init()
|
public static void Init()
|
||||||
{
|
{
|
||||||
List<string> files = new List<string>();
|
List<string> files = new List<string>();
|
||||||
files.AddRange(Helper.ListFiles(CSettings.sFolderBackgroundMusic, "*.mp3", true, true));
|
files.AddRange(Helper.ListFiles(CSettings.sFolderBackgroundMusic, "*.mp3", true, true));
|
||||||
@@ -60,7 +60,7 @@ namespace Vocaluxe.Base
|
|||||||
public static void Pause()
|
public static void Pause()
|
||||||
{
|
{
|
||||||
if (_BackgroundMusicStreams.Count > 0)
|
if (_BackgroundMusicStreams.Count > 0)
|
||||||
CSound.Pause(_BackgroundMusicStreams[_CurrentStreamListIndex]);
|
CSound.FadeAndPause(_BackgroundMusicStreams[_CurrentStreamListIndex], 0, CConfig.FadeTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Update()
|
public static void Update()
|
||||||
@@ -85,7 +85,7 @@ namespace Vocaluxe.Base
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
_CurrentMusicStream = _BackgroundMusicStreams[_CurrentStreamListIndex];
|
_CurrentMusicStream = _BackgroundMusicStreams[_CurrentStreamListIndex];
|
||||||
CSound.SetPosition(_CurrentStreamListIndex, 0);
|
CSound.SetPosition(_CurrentMusicStream, 0);
|
||||||
Play();
|
Play();
|
||||||
_Fading = true;
|
_Fading = true;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -84,7 +84,7 @@ namespace Vocaluxe
|
|||||||
|
|
||||||
// Init Background Music
|
// Init Background Music
|
||||||
CLog.StartBenchmark(0, "Init Background Music");
|
CLog.StartBenchmark(0, "Init Background Music");
|
||||||
CBackgroundMusic.init();
|
CBackgroundMusic.Init();
|
||||||
CLog.StopBenchmark(0, "Init Background Music");
|
CLog.StopBenchmark(0, "Init Background Music");
|
||||||
|
|
||||||
// Init Profiles
|
// Init Profiles
|
||||||
|
|||||||
Reference in new issue
Block a user