[gui] Kill g_audioManager #14198
Merged
[gui] Kill g_audioManager #14198
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hudokkow
added
Type: Cleanup
|
Looks good. There may be some places where we need to check |
Rechi
reviewed
Jul 19, 2018
| @@ -52,7 +52,7 @@ JSONRPC_STATUS CInputOperations::SendAction(int actionID, bool wakeScreensaver / | |||
| if(!wakeScreensaver || !handleScreenSaver()) | |||
| { | |||
| g_application.ResetSystemIdleTimer(); | |||
| g_audioManager.PlayActionSound(actionID); | |||
| CServiceBroker::GetGUI()->GetAudioManager().PlayActionSound(actionID); | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
FernetMenta
reviewed
Jul 19, 2018
xbmc/addons/UISoundsResource.cpp
Outdated
| @@ -42,7 +42,7 @@ bool CUISoundsResource::IsInUse() const | |||
| void CUISoundsResource::OnPostInstall(bool update, bool modal) | |||
| { | |||
| if (IsInUse()) | |||
| g_audioManager.Load(); | |||
| CServiceBroker::GetGUI()->GetAudioManager().Load(); | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
FernetMenta
reviewed
Jul 19, 2018
xbmc/input/InputManager.cpp
Outdated
| @@ -697,11 +697,11 @@ bool CInputManager::ExecuteInputAction(const CAction &action) | |||
| { | |||
| bResult = g_application.OnAction(action); | |||
| if (bResult) | |||
| g_audioManager.PlayActionSound(action); | |||
| CServiceBroker::GetGUI()->GetAudioManager().PlayActionSound(action); | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
FernetMenta
reviewed
Jul 19, 2018
xbmc/input/InputManager.cpp
Outdated
| } | ||
| else | ||
| { | ||
| g_audioManager.PlayActionSound(action); | ||
| CServiceBroker::GetGUI()->GetAudioManager().PlayActionSound(action); |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
all calls from non gui components should test for nullptr |
jenkins4kodi
added
the
Rebase needed
jenkins4kodi
removed
the
Rebase needed
|
Done. Thanks for the review. |
FernetMenta
reviewed
Jul 19, 2018
xbmc/Application.cpp
Outdated
| @@ -2096,7 +2096,7 @@ bool CApplication::OnAction(const CAction &action) | |||
| if (!m_appPlayer.IsPaused() && m_appPlayer.GetPlaySpeed() != 1) | |||
| m_appPlayer.SetPlaySpeed(1); | |||
|
|
|||
| g_audioManager.Enable(m_appPlayer.IsPaused()); | |||
| CServiceBroker::GetGUI()->GetAudioManager().Enable(m_appPlayer.IsPaused()); | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
hudokkow
force-pushed
the
audiomanager
branch
4 times, most recently
from
9640667
to
248e4cf
Compare
FernetMenta
reviewed
Jul 20, 2018
xbmc/Application.cpp
Outdated
| @@ -2156,7 +2158,7 @@ bool CApplication::OnAction(const CAction &action) | |||
| { | |||
| // unpause, and set the playspeed back to normal | |||
| m_appPlayer.Pause(); | |||
| g_audioManager.Enable(m_appPlayer.IsPaused()); | |||
| CServiceBroker::GetGUI()->GetAudioManager().Enable(m_appPlayer.IsPaused()); | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
FernetMenta
reviewed
Jul 20, 2018
xbmc/Application.cpp
Outdated
| @@ -2869,7 +2871,7 @@ void CApplication::Stop(int exitCode) | |||
| UnregisterActionListener(&m_appPlayer.GetSeekHandler()); | |||
| UnregisterActionListener(&CPlayerController::GetInstance()); | |||
|
|
|||
| g_audioManager.DeInitialize(); | |||
| CServiceBroker::GetGUI()->GetAudioManager().DeInitialize(); | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
FernetMenta
reviewed
Jul 20, 2018
xbmc/Application.cpp
Outdated
| @@ -3205,7 +3207,7 @@ bool CApplication::PlayFile(CFileItem item, const std::string& player, bool bRes | |||
| m_appPlayer.SetMute(m_muted); | |||
|
|
|||
| #if !defined(TARGET_POSIX) | |||
| g_audioManager.Enable(false); | |||
| CServiceBroker::GetGUI()->GetAudioManager().Enable(false); | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
FernetMenta
reviewed
Jul 20, 2018
xbmc/Application.cpp
Outdated
| @@ -3218,7 +3220,7 @@ void CApplication::PlaybackCleanup() | |||
| { | |||
| if (!m_appPlayer.IsPlaying()) | |||
| { | |||
| g_audioManager.Enable(true); | |||
| CServiceBroker::GetGUI()->GetAudioManager().Enable(true); | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
finally player will not depend on GUI. player can also be used for transcoding |
|
Done. Thanks for the guidance! 👍 |
FernetMenta
approved these changes
Jul 21, 2018
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
Kill a global following @FernetMenta's #13724 example.
How Has This Been Tested?
Runtime tested on Ubuntu and Win10 x64.