Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[adsp] Several small fixes #8046

Merged
merged 4 commits into from
Sep 14, 2015
Merged

[adsp] Several small fixes #8046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43fffe6
[adsp] remove wrong description line
AlwinEsch Sep 13, 2015
1a23d66
[adsp] fix wrong used settings parameter
AlwinEsch Sep 13, 2015
cc8efdb
[adsp] add use of ACTIVE_AE_DSP_SYNC_ACTIVATE on ...PostMsg(TMSG_SETA…
AlwinEsch Sep 13, 2015
56798ff
[adsp] fix wrong TMSG_SETAUDIODSPSTATE id
AlwinEsch Sep 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions xbmc/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 2 additions & 1 deletion xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion xbmc/messaging/ApplicationMessenger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion xbmc/windows/GUIWindowLoginScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down