Merge pull request #8046 from AlwinEsch/dsp-fixes

[adsp] Several small fixes
xbmc · Sep 14, 2015 · 4ef6894 · 4ef6894
2 parents b3f0fd1 + 56798ff
commit 4ef6894
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -1209,7 +1209,7 @@ bool CApplication::Initialize()
       uiInitializationFinished = firstWindow != WINDOW_STARTUP_ANIM;
 
       CStereoscopicsManager::GetInstance().Initialize();
-      CApplicationMessenger::GetInstance().SendMsg(TMSG_SETAUDIODSPSTATE, ACTIVE_AE_DSP_STATE_ON); // send a blocking message to active AudioDSP engine
+      CApplicationMessenger::GetInstance().SendMsg(TMSG_SETAUDIODSPSTATE, ACTIVE_AE_DSP_STATE_ON, ACTIVE_AE_DSP_SYNC_ACTIVATE); // send a blocking message to active AudioDSP engine
     }
 
   }
@@ -1434,7 +1434,7 @@ void CApplication::OnSettingChanged(const CSetting *setting)
     {
       if (((CSettingBool *) setting)->GetValue())
       {
-        CApplicationMessenger::GetInstance().PostMsg(TMSG_SETAUDIODSPSTATE, ACTIVE_AE_DSP_STATE_ON);
+        CApplicationMessenger::GetInstance().PostMsg(TMSG_SETAUDIODSPSTATE, ACTIVE_AE_DSP_STATE_ON, ACTIVE_AE_DSP_SYNC_ACTIVATE);
         CApplicationMessenger::GetInstance().PostMsg(TMSG_MEDIA_RESTART); // send non blocking media restart message
       }
       else

diff --git a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSP.cpp b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSP.cpp
@@ -93,7 +93,7 @@ void CActiveAEDSP::OnApplicationMessage(KODI::MESSAGING::ThreadMessage* pMsg)
     case TMSG_SETAUDIODSPSTATE:
       if(pMsg->param1 == ACTIVE_AE_DSP_STATE_ON)
       {
-        if(pMsg->param1 == ACTIVE_AE_DSP_ASYNC_ACTIVATE)
+        if(pMsg->param2 == ACTIVE_AE_DSP_ASYNC_ACTIVATE)
         {
           Activate(true);
         }

diff --git a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSP.h b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSP.h
@@ -33,6 +33,7 @@
 
 #define ACTIVE_AE_DSP_STATE_ON  0
 #define ACTIVE_AE_DSP_STATE_OFF 1
+#define ACTIVE_AE_DSP_SYNC_ACTIVATE  0
 #define ACTIVE_AE_DSP_ASYNC_ACTIVATE  1
 
 extern "C" {
@@ -76,7 +77,7 @@ namespace ActiveAE
      * @brief Stop the ActiveAEDSP and destroy all objects it created.
      */
     virtual ~CActiveAEDSP();
-    //@{
+
     /*!
      * @brief Get the instance of the ActiveAEDSP.
      * @return The ActiveAEDSP instance.

diff --git a/xbmc/messaging/ApplicationMessenger.h b/xbmc/messaging/ApplicationMessenger.h
@@ -91,7 +91,7 @@
 #define TMSG_LOADPROFILE                  TMSG_MASK_APPLICATION + 27
 #define TMSG_VIDEORESIZE                  TMSG_MASK_APPLICATION + 28
 
-#define TMSG_SETAUDIODSPSTATE             TMSG_MASK_AUDIO_DSP   + 30
+#define TMSG_SETAUDIODSPSTATE             TMSG_MASK_AUDIO_DSP   + 0
 
 #define TMSG_GUI_INFOLABEL                TMSG_MASK_GUIINFOMANAGER + 0
 #define TMSG_GUI_INFOBOOL                 TMSG_MASK_GUIINFOMANAGER + 1

diff --git a/xbmc/windows/GUIWindowLoginScreen.cpp b/xbmc/windows/GUIWindowLoginScreen.cpp
@@ -337,7 +337,7 @@ void CGUIWindowLoginScreen::LoadProfile(unsigned int profile)
   CStereoscopicsManager::GetInstance().Initialize();
 
   // start audio DSP related services with a blocking message
-  CApplicationMessenger::GetInstance().SendMsg(TMSG_SETAUDIODSPSTATE, ACTIVE_AE_DSP_STATE_ON);
+  CApplicationMessenger::GetInstance().SendMsg(TMSG_SETAUDIODSPSTATE, ACTIVE_AE_DSP_STATE_ON, ACTIVE_AE_DSP_SYNC_ACTIVATE);
 
   // if the user interfaces has been fully initialized let everyone know
   if (uiInitializationFinished)