aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Hochecker <fernetmenta@online.de>2014-09-26 12:58:51 +0200
committerRainer Hochecker <fernetmenta@online.de>2014-09-26 18:05:39 +0200
commit79e0ba643e788df34d5ce26207b1f8cb1e5e9e11 (patch)
treeaa241fe61efe4beffedc7c200b968150594ee3b5
parent44f14c6a178f411c9c0ab866ecd627b99f2b085f (diff)
ActiveAE: better 2 duplicate loc than recursive locking and an addition function call, fix after d66354dccada58c5da5ff5d940cd0942b9264a64
-rw-r--r--xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
index de07de5692..2d013c83f0 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
@@ -91,7 +91,8 @@ void CEngineStats::GetDelay(AEDelayStatus& status)
void CEngineStats::GetDelay(AEDelayStatus& status, CActiveAEStream *stream)
{
CSingleLock lock(m_lock);
- GetDelay(status);
+ status = m_sinkDelay;
+ status.delay += (double)m_bufferedSamples / m_sinkSampleRate;
status.delay += m_sinkLatency;
status.delay += stream->m_bufferedTime / stream->m_streamResampleRatio;