Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Previous-function of bg-music is now similar to other audio-player. Clicking on prev-button during song: Play song from start, Clicking on prev-button during first 1.5 sec, go to prev song.

Browse Source
This commit is contained in:
Florian Kuepper committed 2012-12-03 09:16:13 +01:00
1 parent 2340011ba3
commit 837ee463b5
1 file changed
+21 -16
Download Patch File Download Diff File Expand all files Collapse all files
Vocaluxe/Base/CBackgroundMusic.cs
+21 -16
View File
@@ -294,25 +294,30 @@ namespace Vocaluxe.Base
{ {
if (_PreviousFileNames.Count > 0 || _PreviousMusicIndex >= 0) if (_PreviousFileNames.Count > 0 || _PreviousMusicIndex >= 0)
{ {
Stop(); float pos = CSound.GetPosition(_CurrentMusicStream);
if (CSound.GetPosition(_CurrentMusicStream) >= 1.5f)
{
CSound.SetPosition(_CurrentMusicStream, 0);
if (_VideoEnabled && _Video != -1)
CVideo.VdSkip(_Video, 0f, _CurrentPlaylistElement.VideoGap);
}
else
{
Stop();
_PreviousMusicIndex--;
if (_PreviousMusicIndex < 0)
_PreviousMusicIndex = 0; //No previous songs left, so play the first
_PreviousMusicIndex--; _CurrentPlaylistElement = _PreviousFileNames[_PreviousMusicIndex];
if (_PreviousMusicIndex < 0)
_PreviousMusicIndex = 0; //No previous songs left, so play the first
_CurrentPlaylistElement = _PreviousFileNames[_PreviousMusicIndex]; _CurrentMusicStream = CSound.Load(_CurrentPlaylistElement.MusicFilePath);
if (_VideoEnabled)
_CurrentMusicStream = CSound.Load(_CurrentPlaylistElement.MusicFilePath); LoadVideo();
if (_VideoEnabled) CSound.SetStreamVolume(_CurrentMusicStream, 0f);
LoadVideo(); Play();
CSound.SetStreamVolume(_CurrentMusicStream, 0f); }
Play();
} }
} else if (_CurrentMusicStream != -1)
public static void Repeat()
{
if (_AllFileNames.Count > 0 && _CurrentMusicStream != -1)
{ {
CSound.SetPosition(_CurrentMusicStream, 0); CSound.SetPosition(_CurrentMusicStream, 0);
if (_VideoEnabled && _Video != -1) if (_VideoEnabled && _Video != -1)