Some enhancements to reduce VdLoad calls

This commit is contained in:
Stephan Sundermann committed 2012-03-05 21:29:10 +01:00
1 parent 050d4bd8be
commit 973f4a181d
1 file changed
+10 -4
+10 -4
View File
@@ -62,6 +62,8 @@ namespace Vocaluxe.Base
{ {
CSound.Fade(_CurrentMusicStream, CConfig.BackgroundMusicVolume, CSettings.BackgroundMusicFadeTime); CSound.Fade(_CurrentMusicStream, CConfig.BackgroundMusicVolume, CSettings.BackgroundMusicFadeTime);
CSound.Play(_CurrentMusicStream); CSound.Play(_CurrentMusicStream);
if (_VideoEnabled && _Video != -1)
CVideo.VdResume(_Video);
_Playing = true; _Playing = true;
} }
else else
@@ -74,8 +76,9 @@ namespace Vocaluxe.Base
public static void Stop() public static void Stop()
{ {
if (_Video != 0) if (_VideoEnabled && _Video != 0)
CVideo.VdClose(_Video); CVideo.VdClose(_Video);
_Video = -1;
CSound.FadeAndStop(_CurrentMusicStream, 0f, CSettings.BackgroundMusicFadeTime); CSound.FadeAndStop(_CurrentMusicStream, 0f, CSettings.BackgroundMusicFadeTime);
_CurrentPlaylistElement = new PlaylistElement(); _CurrentPlaylistElement = new PlaylistElement();
@@ -84,7 +87,7 @@ namespace Vocaluxe.Base
public static void Pause() public static void Pause()
{ {
if (_Video != 0) if (_VideoEnabled && _Video != 0)
CVideo.VdPause(_Video); CVideo.VdPause(_Video);
CSound.FadeAndPause(_CurrentMusicStream, 0f, CSettings.BackgroundMusicFadeTime); CSound.FadeAndPause(_CurrentMusicStream, 0f, CSettings.BackgroundMusicFadeTime);
_Playing = false; _Playing = false;
@@ -156,8 +159,8 @@ namespace Vocaluxe.Base
if (_AllFileNames.Count > 0 && _CurrentMusicStream != -1) if (_AllFileNames.Count > 0 && _CurrentMusicStream != -1)
{ {
CSound.SetPosition(_CurrentMusicStream, 0); CSound.SetPosition(_CurrentMusicStream, 0);
if (_VideoEnabled) if (_VideoEnabled && _Video != -1)
LoadVideo(); CVideo.VdSkip(_Video, CSound.GetPosition(_CurrentMusicStream), _CurrentPlaylistElement.GetVideoGap());
} }
} }
@@ -351,6 +354,8 @@ namespace Vocaluxe.Base
} }
private static void LoadVideo() private static void LoadVideo()
{
if (_Video == -1)
{ {
CVideo.VdClose(_Video); CVideo.VdClose(_Video);
_Video = CVideo.VdLoad(_CurrentPlaylistElement.GetVideoFilePath()); _Video = CVideo.VdLoad(_CurrentPlaylistElement.GetVideoFilePath());
@@ -359,6 +364,7 @@ namespace Vocaluxe.Base
} }
} }
} }
}
class PlaylistElement class PlaylistElement
{ {