Merge pull request #3378 from FernetMenta/aefixes

ActiveAE: make sure sink list is not empty when settings query the default

3 files changed, 11 insertions, 4 deletions

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
index c0746dc8f4..6fbed5ceea 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
@@ -322,7 +322,7 @@ void CActiveAE::StateMachine(int signal, Protocol *port, Message *msg)
         {
         case CActiveAEControlProtocol::INIT:
           m_extError = false;
-          m_sink.EnumerateSinkList();
+          m_sink.EnumerateSinkList(false);
           LoadSettings();
           Configure();
           msg->Reply(CActiveAEControlProtocol::ACC);
@@ -589,7 +589,7 @@ void CActiveAE::StateMachine(int signal, Protocol *port, Message *msg)
           m_extError = false;
           if (!displayReset)
           {
-            m_sink.EnumerateSinkList();
+            m_sink.EnumerateSinkList(true);
             LoadSettings();
           }
           Configure();
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp
index 98b31f97ee..1dec4f5fd7 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp
@@ -491,8 +491,11 @@ void CActiveAESink::Process()
   }
 }
 
-void CActiveAESink::EnumerateSinkList()
+void CActiveAESink::EnumerateSinkList(bool force)
 {
+  if (!m_sinkInfoList.empty() && !force)
+    return;
+
   unsigned int c_retry = 5;
   m_sinkInfoList.clear();
   CAESinkFactory::EnumerateEx(m_sinkInfoList);
@@ -528,6 +531,8 @@ void CActiveAESink::PrintSinks()
 
 void CActiveAESink::EnumerateOutputDevices(AEDeviceList &devices, bool passthrough)
 {
+  EnumerateSinkList(false);
+
   for (AESinkInfoList::iterator itt = m_sinkInfoList.begin(); itt != m_sinkInfoList.end(); ++itt)
   {
     AESinkInfo sinkInfo = *itt;
@@ -556,6 +561,8 @@ void CActiveAESink::EnumerateOutputDevices(AEDeviceList &devices, bool passthrou
 
 std::string CActiveAESink::GetDefaultDevice(bool passthrough)
 {
+  EnumerateSinkList(false);
+
   for (AESinkInfoList::iterator itt = m_sinkInfoList.begin(); itt != m_sinkInfoList.end(); ++itt)
   {
     AESinkInfo sinkInfo = *itt;
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h
index fb69646dab..59bad57e26 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h
@@ -83,7 +83,7 @@ class CActiveAESink : private CThread
 {
 public:
   CActiveAESink(CEvent *inMsgEvent);
-  void EnumerateSinkList();
+  void EnumerateSinkList(bool force);
   void EnumerateOutputDevices(AEDeviceList &devices, bool passthrough);
   std::string GetDefaultDevice(bool passthrough);
   void Start();