diff options
| author | Arne Morten Kvarving <spiff@kodi.tv> | 2018-08-22 11:17:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-22 11:17:53 +0200 |
| commit | 12de04933e79ca5049164e6938a4753061096b81 (patch) | |
| tree | 201e62a2f399a8ca42e21966918b56ba9f4560f9 | |
| parent | 8710d80b7049035441c6ec69c6adc0e02db588b8 (diff) | |
| parent | 880d11b64a1ec0fb6009c0ff7a5ad6ea4db69c62 (diff) | |
Merge pull request #14336 from garbear/include-cleanup
Include cleanup
| -rw-r--r-- | xbmc/PlayListPlayer.cpp | 6 | ||||
| -rw-r--r-- | xbmc/addons/Service.cpp | 1 | ||||
| -rw-r--r-- | xbmc/addons/binary-addons/AddonDll.cpp | 1 | ||||
| -rw-r--r-- | xbmc/favourites/FavouritesService.cpp | 1 |
4 files changed, 3 insertions, 6 deletions
diff --git a/xbmc/PlayListPlayer.cpp b/xbmc/PlayListPlayer.cpp index efe6384b78..f4801ce12e 100644 --- a/xbmc/PlayListPlayer.cpp +++ b/xbmc/PlayListPlayer.cpp @@ -10,7 +10,6 @@ #include "PlayListPlayer.h" #include "Application.h" #include "PartyModeManager.h" -#include "ServiceManager.h" #include "settings/AdvancedSettings.h" #include "GUIUserMessages.h" #include "guilib/GUIComponent.h" @@ -28,6 +27,7 @@ #include "messaging/ApplicationMessenger.h" #include "filesystem/VideoDatabaseFile.h" #include "messaging/helpers/DialogOKHelper.h" +#include "ServiceBroker.h" using namespace PLAYLIST; using namespace KODI::MESSAGING; @@ -599,14 +599,14 @@ void CPlayListPlayer::ReShuffle(int iPlaylist, int iPosition) (g_application.GetAppPlayer().IsPlayingVideo() && iPlaylist == PLAYLIST_VIDEO) ) { - CServiceBroker::GetPlaylistPlayer().GetPlaylist(iPlaylist).Shuffle(m_iCurrentSong + 2); + GetPlaylist(iPlaylist).Shuffle(m_iCurrentSong + 2); } } // otherwise, shuffle from the passed position // which is the position of the first new item added else { - CServiceBroker::GetPlaylistPlayer().GetPlaylist(iPlaylist).Shuffle(iPosition); + GetPlaylist(iPlaylist).Shuffle(iPosition); } } diff --git a/xbmc/addons/Service.cpp b/xbmc/addons/Service.cpp index 99e0265a8d..045e247007 100644 --- a/xbmc/addons/Service.cpp +++ b/xbmc/addons/Service.cpp @@ -7,7 +7,6 @@ */ #include "Service.h" #include "AddonManager.h" -#include "ServiceBroker.h" #include "interfaces/generic/ScriptInvocationManager.h" #include "utils/log.h" #include "utils/StringUtils.h" diff --git a/xbmc/addons/binary-addons/AddonDll.cpp b/xbmc/addons/binary-addons/AddonDll.cpp index 786be7aa82..604a6e1179 100644 --- a/xbmc/addons/binary-addons/AddonDll.cpp +++ b/xbmc/addons/binary-addons/AddonDll.cpp @@ -10,7 +10,6 @@ #include "addons/AddonStatusHandler.h" #include "GUIUserMessages.h" -#include "ServiceBroker.h" #include "addons/settings/AddonSettings.h" #include "addons/settings/GUIDialogAddonSettings.h" #include "events/EventLog.h" diff --git a/xbmc/favourites/FavouritesService.cpp b/xbmc/favourites/FavouritesService.cpp index 899b2fe261..140f918966 100644 --- a/xbmc/favourites/FavouritesService.cpp +++ b/xbmc/favourites/FavouritesService.cpp @@ -9,7 +9,6 @@ #include "FavouritesService.h" #include "filesystem/File.h" #include "Util.h" -#include "profiles/ProfilesManager.h" #include "FileItem.h" #include "utils/XBMCTinyXML.h" #include "utils/log.h" |