From e44eed1237f8d4652d99b90a3cdf342493f0a155 Mon Sep 17 00:00:00 2001 From: fritsch Date: Wed, 19 Feb 2014 09:25:18 +0100 Subject: [PATCH] ActiveAE: Wait at least c_retry * 1500 --- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 2 +- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp index ccbe99a..cfc21ee 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -2068,7 +2068,7 @@ bool CActiveAE::Initialize() Message *reply; if (m_controlPort.SendOutMessageSync(CActiveAEControlProtocol::INIT, &reply, - 5000)) + 10000)) { bool success = reply->signal == CActiveAEControlProtocol::ACC; reply->Release(); diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp index 4d66984..679f7d6 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp @@ -547,13 +547,13 @@ void CActiveAESink::EnumerateSinkList(bool force) if (!m_sinkInfoList.empty() && !force) return; - unsigned int c_retry = 5; + unsigned int c_retry = 4; m_sinkInfoList.clear(); CAESinkFactory::EnumerateEx(m_sinkInfoList); while(m_sinkInfoList.size() == 0 && c_retry > 0) { CLog::Log(LOGNOTICE, "No Devices found - retry: %d", c_retry); - Sleep(2000); + Sleep(1500); c_retry--; // retry the enumeration CAESinkFactory::EnumerateEx(m_sinkInfoList, true); -- 2.7.4