Merge pull request #9947 from notspiff/remove_pp_include

changed: get rid of PlayListPlayer include in Application.h
xbmc · Jun 11, 2016 · af1fef1 · af1fef1
2 parents 5c84a06 + 6e5c67a
commit af1fef1
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 3 deletions.
diff --git a/xbmc/Application.h b/xbmc/Application.h
@@ -52,9 +52,13 @@ namespace MEDIA_DETECT
   class CAutorun;
 }
 
+namespace PLAYLIST
+{
+  class CPlayList;
+}
+
 #include "cores/IPlayerCallback.h"
 #include "cores/playercorefactory/PlayerCoreFactory.h"
-#include "PlayListPlayer.h"
 #include "settings/lib/ISettingsHandler.h"
 #include "settings/lib/ISettingCallback.h"
 #include "settings/lib/ISubSettings.h"
@@ -177,8 +181,8 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs
   virtual int  GetMessageMask() override;
   virtual void OnApplicationMessage(KODI::MESSAGING::ThreadMessage* pMsg) override;
 
-  bool PlayMedia(const CFileItem& item, const std::string &player, int iPlaylist = PLAYLIST_MUSIC);
-  bool PlayMediaSync(const CFileItem& item, int iPlaylist = PLAYLIST_MUSIC);
+  bool PlayMedia(const CFileItem& item, const std::string &player, int iPlaylist);
+  bool PlayMediaSync(const CFileItem& item, int iPlaylist);
   bool ProcessAndStartPlaylist(const std::string& strPlayList, PLAYLIST::CPlayList& playlist, int iPlaylist, int track=0);
   PlayBackRet PlayFile(CFileItem item, const std::string& player, bool bRestart = false);
   void SaveFileState(bool bForeground = false);

diff --git a/xbmc/ApplicationPlayer.cpp b/xbmc/ApplicationPlayer.cpp
@@ -21,6 +21,7 @@
 #include "ApplicationPlayer.h"
 #include "cores/IPlayer.h"
 #include "Application.h"
+#include "PlayListPlayer.h"
 #include "settings/MediaSettings.h"
 
 CApplicationPlayer::CApplicationPlayer()

diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
@@ -44,6 +44,7 @@
 #include "music/tags/MusicInfoTag.h"
 #include "guilib/IGUIContainer.h"
 #include "guilib/GUIWindowManager.h"
+#include "PlayListPlayer.h"
 #include "playlists/PlayList.h"
 #include "profiles/ProfilesManager.h"
 #include "windowing/WindowingFactory.h"

diff --git a/xbmc/interfaces/legacy/ModuleXbmc.cpp b/xbmc/interfaces/legacy/ModuleXbmc.cpp
@@ -43,6 +43,7 @@
 #include "utils/Crc32.h"
 #include "FileItem.h"
 #include "LangInfo.h"
+#include "PlayListPlayer.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/Settings.h"
 #include "guilib/TextureManager.h"

diff --git a/xbmc/network/AirPlayServer.cpp b/xbmc/network/AirPlayServer.cpp
@@ -37,6 +37,7 @@
 #include "FileItem.h"
 #include "Application.h"
 #include "messaging/ApplicationMessenger.h"
+#include "PlayListPlayer.h"
 #include "utils/md5.h"
 #include "utils/Variant.h"
 #include "settings/Settings.h"

diff --git a/xbmc/network/upnp/UPnPRenderer.cpp b/xbmc/network/upnp/UPnPRenderer.cpp
@@ -34,6 +34,7 @@
 #include "pictures/PictureInfoTag.h"
 #include "interfaces/AnnouncementManager.h"
 #include "settings/Settings.h"
+#include "PlayListPlayer.h"
 #include "TextureDatabase.h"
 #include "ThumbLoader.h"
 #include "URL.h"

diff --git a/xbmc/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp
@@ -35,6 +35,7 @@
 #include "input/Key.h"
 #include "dialogs/GUIDialogOK.h"
 #include "view/GUIViewState.h"
+#include "PlayListPlayer.h"
 #include "playlists/PlayList.h"
 #include "settings/MediaSourceSettings.h"
 #include "settings/Settings.h"

diff --git a/xbmc/pictures/GUIWindowSlideShow.cpp b/xbmc/pictures/GUIWindowSlideShow.cpp
@@ -45,6 +45,7 @@
 #include "interfaces/AnnouncementManager.h"
 #include "pictures/GUIViewStatePictures.h"
 #include "pictures/PictureThumbLoader.h"
+#include "PlayListPlayer.h"
 #ifdef TARGET_POSIX
 #include "linux/XTimeUtils.h"
 #endif

diff --git a/xbmc/platform/darwin/ios-common/AnnounceReceiver.mm b/xbmc/platform/darwin/ios-common/AnnounceReceiver.mm
@@ -31,6 +31,7 @@
 #import "music/MusicDatabase.h"
 #import "TextureCache.h"
 #import "filesystem/SpecialProtocol.h"
+#include "PlayListPlayer.h"
 #import "playlists/PlayList.h"
 
 #import "threads/Atomics.h"

diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp
@@ -39,6 +39,7 @@
 #include "messaging/helpers/DialogHelper.h"
 #include "music/tags/MusicInfoTag.h"
 #include "network/Network.h"
+#include "PlayListPlayer.h"
 #include "pvr/addons/PVRClients.h"
 #include "pvr/channels/PVRChannel.h"
 #include "pvr/channels/PVRChannelGroupInternal.h"

diff --git a/xbmc/windows/GUIWindowFileManager.cpp b/xbmc/windows/GUIWindowFileManager.cpp
@@ -41,6 +41,7 @@
 #include "guilib/GUIKeyboardFactory.h"
 #include "dialogs/GUIDialogProgress.h"
 #include "filesystem/FavouritesDirectory.h"
+#include "PlayListPlayer.h"
 #include "playlists/PlayList.h"
 #include "storage/MediaManager.h"
 #include "settings/MediaSourceSettings.h"

diff --git a/xbmc/windows/GUIWindowLoginScreen.cpp b/xbmc/windows/GUIWindowLoginScreen.cpp
@@ -42,6 +42,7 @@
 #endif
 #include "messaging/ApplicationMessenger.h"
 #include "network/Network.h"
+#include "PlayListPlayer.h"
 #include "profiles/Profile.h"
 #include "profiles/ProfilesManager.h"
 #include "profiles/dialogs/GUIDialogProfileSettings.h"