Merge branch 'release-0.4.1' of github.com:Vocaluxe/Vocaluxe into develop

This commit is contained in:
Florian Küpper committed 2017-11-09 15:27:22 +01:00
commit 15abc916e5
1 file changed
+15 -1
+15 -1
View File
@@ -53,19 +53,30 @@ namespace Vocaluxe.Base
{
_VideoTimer.Reset();
_Finished = false;
if (_VideoStream == null)
{
return;
}
//CVideo.VdSkip(_VideoStream, 0f, 0f);
_VideoTimer.Start();
CVideo.Resume(_VideoStream);
}
public void Pause()
{
if (_VideoStream != null)
{
CVideo.Pause(_VideoStream);
}
_VideoTimer.Stop();
}
public void Resume()
{
if (_VideoStream == null)
{
return;
}
CVideo.Resume(_VideoStream);
_VideoTimer.Start();
}
@@ -92,7 +103,7 @@ namespace Vocaluxe.Base
public void PreLoad()
{
if (!_Loaded)
if (!_Loaded || _VideoStream == null)
{
return;
}
@@ -110,8 +121,11 @@ namespace Vocaluxe.Base
}
public void Close()
{
if (_VideoStream != null)
{
CVideo.Close(ref _VideoStream);
}
_Loaded = false;
_Finished = false;
_VideoTimer.Reset();