Merge pull request #20 from Vocaluxe/release-0.1
merge Release 0.1 branch changes into develop branch
This commit is contained in:
commit
bd879fef04
4 files changed
+3
-4
No files matched your search
Binary file not shown.
@@ -489,7 +489,7 @@ namespace Vocaluxe.Lib.Sound
|
|||||||
if (Finished)
|
if (Finished)
|
||||||
_SyncTimer.Pause();
|
_SyncTimer.Pause();
|
||||||
|
|
||||||
return _SyncTimer.Time;
|
return _CurrentTime; // _SyncTimer.Time;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -666,7 +666,6 @@ namespace Vocaluxe.Lib.Video
|
|||||||
if (num == -1)
|
if (num == -1)
|
||||||
{
|
{
|
||||||
_BufferFull = true;
|
_BufferFull = true;
|
||||||
EventDecode.Reset();
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -743,7 +742,7 @@ namespace Vocaluxe.Lib.Video
|
|||||||
{
|
{
|
||||||
float td = _SetTime + _VideoSkipTime - _FrameBuffer[i].time;
|
float td = _SetTime + _VideoSkipTime - _FrameBuffer[i].time;
|
||||||
|
|
||||||
if (td > _VideoTimeBase * 2 || td < -1f * _VideoTimeBase * (_FrameBuffer.Length + 1))
|
if (td > _VideoTimeBase * 2)
|
||||||
{
|
{
|
||||||
_FrameBuffer[i].displayed = true;
|
_FrameBuffer[i].displayed = true;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -141,7 +141,7 @@ namespace Vocaluxe
|
|||||||
CLog.StopBenchmark(0, "Init Game");
|
CLog.StopBenchmark(0, "Init Game");
|
||||||
|
|
||||||
Application.DoEvents();
|
Application.DoEvents();
|
||||||
System.Threading.Thread.Sleep(10000);
|
|
||||||
// Start Main Loop
|
// Start Main Loop
|
||||||
_SplashScreen.Close();
|
_SplashScreen.Close();
|
||||||
CDraw.MainLoop();
|
CDraw.MainLoop();
|
||||||
|
|||||||
Reference in new issue
Block a user