Merge branch 'develop' into challenge

This commit is contained in:
Alexander Eckart committed 2012-12-10 19:35:33 +01:00
commit 78bcd4c35a
5 files changed
+3 -2

No files matched your search

File renamed without changes.
File renamed without changes.
+3 -2
View File
@@ -474,7 +474,7 @@ namespace Vocaluxe.Lib.Sound
{ {
lock (_LockData) lock (_LockData)
{ {
return _NoMoreData && _data.BytesNotRead == 0L; return _NoMoreData && _data.BytesNotRead == 0L && _SyncTimer.Time >= _Duration;
} }
} }
} }
@@ -877,7 +877,8 @@ namespace Vocaluxe.Lib.Sound
float latency = buf.Length / _BytesPerSecond + CConfig.AudioLatency/1000f; float latency = buf.Length / _BytesPerSecond + CConfig.AudioLatency/1000f;
float time = _TimeCode - _data.BytesNotRead / _BytesPerSecond - latency; float time = _TimeCode - _data.BytesNotRead / _BytesPerSecond - latency;
_CurrentTime = _SyncTimer.Update(time); if (!_NoMoreData)
_CurrentTime = _SyncTimer.Update(time);
} }
try try