Fixed video in bg-music with start-tag.
This commit is contained in:
1 parent
08e2f8245b
commit
4420a11b08
1 file changed
+31
-7
@@ -246,9 +246,16 @@ namespace Vocaluxe.Base
|
|||||||
{
|
{
|
||||||
if (_RepeatSong)
|
if (_RepeatSong)
|
||||||
{
|
{
|
||||||
CSound.SetPosition(_CurrentMusicStream, 0);
|
//Seek to #Start-Tag, if found
|
||||||
|
if (_CurrentPlaylistElement.Start != 0f)
|
||||||
|
CSound.SetPosition(_CurrentMusicStream, _CurrentPlaylistElement.Start);
|
||||||
|
else
|
||||||
|
CSound.SetPosition(_CurrentMusicStream, 0);
|
||||||
if (_VideoEnabled && _Video != -1)
|
if (_VideoEnabled && _Video != -1)
|
||||||
CVideo.VdSkip(_Video, 0f, _CurrentPlaylistElement.VideoGap);
|
if (_CurrentPlaylistElement.Start != 0f)
|
||||||
|
CVideo.VdSkip(_Video, _CurrentPlaylistElement.Start, _CurrentPlaylistElement.VideoGap);
|
||||||
|
else
|
||||||
|
CVideo.VdSkip(_Video, 0f, _CurrentPlaylistElement.VideoGap);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
Next();
|
Next();
|
||||||
@@ -302,9 +309,16 @@ namespace Vocaluxe.Base
|
|||||||
float pos = CSound.GetPosition(_CurrentMusicStream);
|
float pos = CSound.GetPosition(_CurrentMusicStream);
|
||||||
if (CSound.GetPosition(_CurrentMusicStream) >= 1.5f)
|
if (CSound.GetPosition(_CurrentMusicStream) >= 1.5f)
|
||||||
{
|
{
|
||||||
CSound.SetPosition(_CurrentMusicStream, 0);
|
//Seek to #Start-Tag, if found
|
||||||
|
if (_CurrentPlaylistElement.Start != 0f)
|
||||||
|
CSound.SetPosition(_CurrentMusicStream, _CurrentPlaylistElement.Start);
|
||||||
|
else
|
||||||
|
CSound.SetPosition(_CurrentMusicStream, 0);
|
||||||
if (_VideoEnabled && _Video != -1)
|
if (_VideoEnabled && _Video != -1)
|
||||||
CVideo.VdSkip(_Video, 0f, _CurrentPlaylistElement.VideoGap);
|
if(_CurrentPlaylistElement.Start != 0f)
|
||||||
|
CVideo.VdSkip(_Video, _CurrentPlaylistElement.Start, _CurrentPlaylistElement.VideoGap);
|
||||||
|
else
|
||||||
|
CVideo.VdSkip(_Video, 0f, _CurrentPlaylistElement.VideoGap);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -325,9 +339,16 @@ namespace Vocaluxe.Base
|
|||||||
}
|
}
|
||||||
else if (_CurrentMusicStream != -1)
|
else if (_CurrentMusicStream != -1)
|
||||||
{
|
{
|
||||||
CSound.SetPosition(_CurrentMusicStream, 0);
|
//Seek to #Start-Tag, if found
|
||||||
|
if (_CurrentPlaylistElement.Start != 0f)
|
||||||
|
CSound.SetPosition(_CurrentMusicStream, _CurrentPlaylistElement.Start);
|
||||||
|
else
|
||||||
|
CSound.SetPosition(_CurrentMusicStream, 0);
|
||||||
if (_VideoEnabled && _Video != -1)
|
if (_VideoEnabled && _Video != -1)
|
||||||
CVideo.VdSkip(_Video, 0f, _CurrentPlaylistElement.VideoGap);
|
if (_CurrentPlaylistElement.Start != 0f)
|
||||||
|
CVideo.VdSkip(_Video, _CurrentPlaylistElement.Start, _CurrentPlaylistElement.VideoGap);
|
||||||
|
else
|
||||||
|
CVideo.VdSkip(_Video, 0f, _CurrentPlaylistElement.VideoGap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -498,7 +519,10 @@ namespace Vocaluxe.Base
|
|||||||
if (_Video == -1)
|
if (_Video == -1)
|
||||||
{
|
{
|
||||||
_Video = CVideo.VdLoad(_CurrentPlaylistElement.VideoFilePath);
|
_Video = CVideo.VdLoad(_CurrentPlaylistElement.VideoFilePath);
|
||||||
CVideo.VdSkip(_Video, 0f, _CurrentPlaylistElement.VideoGap);
|
if (_CurrentPlaylistElement.Start != 0f)
|
||||||
|
CVideo.VdSkip(_Video, _CurrentPlaylistElement.Start, _CurrentPlaylistElement.VideoGap);
|
||||||
|
else
|
||||||
|
CVideo.VdSkip(_Video, 0f, _CurrentPlaylistElement.VideoGap);
|
||||||
_VideoEnabled = true;
|
_VideoEnabled = true;
|
||||||
_FadeTimer.Reset();
|
_FadeTimer.Reset();
|
||||||
_FadeTimer.Start();
|
_FadeTimer.Start();
|
||||||
|
|||||||
Reference in new issue
Block a user