changed: split off IPlayer callback to a separate file

helps keep rebuilds down if IPlayer.h is touched.
brings it down from 149 files rebuilt to 30 (149 for new file).
thus no spurious rebuilds was found but callback should change
less

diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index b82c641..a976ecb 100644 (file)
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -30,6 +30,7 @@
 #include "Util.h"
 #include "URL.h"
 #include "guilib/TextureManager.h"
+#include "cores/IPlayer.h"
 #include "cores/dvdplayer/DVDFileInfo.h"
 #include "cores/AudioEngine/AEFactory.h"
 #include "cores/AudioEngine/Utils/AEUtil.h"

diff --git a/xbmc/Application.h b/xbmc/Application.h
index 9bd8ab4..0b97e1c 100644 (file)
--- a/xbmc/Application.h
+++ b/xbmc/Application.h
@@ -44,7 +44,7 @@ namespace MEDIA_DETECT
   class CAutorun;
 }
 
-#include "cores/IPlayer.h"
+#include "cores/IPlayerCallback.h"
 #include "cores/playercorefactory/PlayerCoreFactory.h"
 #include "PlayListPlayer.h"
 #if !defined(_WIN32) && defined(HAS_DVD_DRIVE)
@@ -68,6 +68,7 @@ class DPMSSupport;
 class CSplash;
 class CBookmark;
 class CWebServer;
+class IPlayer;
 #ifdef HAS_WEB_SERVER
 class CWebServer;
 class CHTTPImageHandler;

diff --git a/xbmc/ApplicationMessenger.cpp b/xbmc/ApplicationMessenger.cpp
index 2d6da98..dd5696e 100644 (file)
--- a/xbmc/ApplicationMessenger.cpp
+++ b/xbmc/ApplicationMessenger.cpp
@@ -40,6 +40,7 @@
 #include "guilib/GUIDialog.h"
 #include "GUIInfoManager.h"
 #include "utils/Splash.h"
+#include "cores/IPlayer.h"
 #include "cores/VideoRenderers/RenderManager.h"
 #include "cores/AudioEngine/AEFactory.h"
 #include "music/tags/MusicInfoTag.h"

diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
index 686f31d..8a08de0 100644 (file)
--- a/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp
@@ -74,6 +74,7 @@
 #include "video/VideoThumbLoader.h"
 #include "music/MusicThumbLoader.h"
 #include "video/VideoDatabase.h"
+#include "cores/IPlayer.h"
 #include "cores/AudioEngine/Utils/AEUtil.h"
 
 #define SYSHEATUPDATEINTERVAL 60000

diff --git a/xbmc/addons/Visualisation.cpp b/xbmc/addons/Visualisation.cpp
index 418dcbc..f275fe9 100644 (file)
--- a/xbmc/addons/Visualisation.cpp
+++ b/xbmc/addons/Visualisation.cpp
@@ -28,6 +28,7 @@
 #include "windowing/WindowingFactory.h"
 #include "utils/URIUtils.h"
 #include "utils/StringUtils.h"
+#include "cores/IPlayer.h"
 #include "cores/AudioEngine/AEFactory.h"
 #include "cores/AudioEngine/Utils/AEConvert.h"
 #ifdef _LINUX

diff --git a/xbmc/cores/IPlayer.h b/xbmc/cores/IPlayer.h
index 08c5aa2..6b713dc 100644 (file)
--- a/xbmc/cores/IPlayer.h
+++ b/xbmc/cores/IPlayer.h
@@ -22,6 +22,7 @@
 
 #include "system.h" // until we get sane int types used here
 #include "IAudioCallback.h"
+#include "IPlayerCallback.h"
 #include "utils/StdString.h"
 #include "guilib/Geometry.h"
 
@@ -35,21 +36,6 @@ namespace PVR
   class CPVRChannel;
 }
 
-class IPlayerCallback
-{
-public:
-  virtual ~IPlayerCallback() {}
-  virtual void OnPlayBackEnded() = 0;
-  virtual void OnPlayBackStarted() = 0;
-  virtual void OnPlayBackPaused() {};
-  virtual void OnPlayBackResumed() {};
-  virtual void OnPlayBackStopped() = 0;
-  virtual void OnQueueNextItem() = 0;
-  virtual void OnPlayBackSeek(int iTime, int seekOffset) {};
-  virtual void OnPlayBackSeekChapter(int iChapter) {};
-  virtual void OnPlayBackSpeedChanged(int iSpeed) {};
-};
-
 class CPlayerOptions
 {
 public:

diff --git a/xbmc/cores/IPlayerCallback.h b/xbmc/cores/IPlayerCallback.h
new file mode 100644 (file)
index 0000000..1ea65e1
--- /dev/null
+++ b/xbmc/cores/IPlayerCallback.h
@@ -0,0 +1,36 @@
+/*
+ *      Copyright (C) 2005-2013 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+class IPlayerCallback
+{
+public:
+  virtual ~IPlayerCallback() {}
+  virtual void OnPlayBackEnded() = 0;
+  virtual void OnPlayBackStarted() = 0;
+  virtual void OnPlayBackPaused() {};
+  virtual void OnPlayBackResumed() {};
+  virtual void OnPlayBackStopped() = 0;
+  virtual void OnQueueNextItem() = 0;
+  virtual void OnPlayBackSeek(int iTime, int seekOffset) {};
+  virtual void OnPlayBackSeekChapter(int iChapter) {};
+  virtual void OnPlayBackSpeedChanged(int iSpeed) {};
+};

diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
index 473e014..7771daf 100644 (file)
--- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
@@ -45,6 +45,7 @@
 #include "utils/GLUtils.h"
 #include "RenderCapture.h"
 #include "RenderFormats.h"
+#include "cores/IPlayer.h"
 
 #ifdef HAVE_LIBVDPAU
 #include "cores/dvdplayer/DVDCodecs/Video/VDPAU.h"

diff --git a/xbmc/cores/playercorefactory/PlayerCoreFactory.h b/xbmc/cores/playercorefactory/PlayerCoreFactory.h
index 97fc87e..9e964ba 100644 (file)
--- a/xbmc/cores/playercorefactory/PlayerCoreFactory.h
+++ b/xbmc/cores/playercorefactory/PlayerCoreFactory.h
@@ -20,15 +20,20 @@
  *
  */
 
-#include "cores/IPlayer.h"
+#include "cores/IPlayerCallback.h"
 #include "threads/CriticalSection.h"
+#include "utils/StdString.h"
+
+#include <vector>
 
 /*----------------------------------------------------------------------
 |   forward references
 +---------------------------------------------------------------------*/
 class TiXmlElement;
+class CFileItem;
 class CPlayerCoreConfig;
 class CPlayerSelectionRule;
+class IPlayer;
 
 // do not remove mplayer - will break scripts
 enum EPLAYERCORES

diff --git a/xbmc/guilib/GUIVideoControl.cpp b/xbmc/guilib/GUIVideoControl.cpp
index 5b45108..fbebd4c 100644 (file)
--- a/xbmc/guilib/GUIVideoControl.cpp
+++ b/xbmc/guilib/GUIVideoControl.cpp
@@ -22,6 +22,7 @@
 #include "GUIVideoControl.h"
 #include "GUIWindowManager.h"
 #include "Application.h"
+#include "cores/IPlayer.h"
 #ifdef HAS_VIDEO_PLAYBACK
 #include "cores/VideoRenderers/RenderManager.h"
 #else

diff --git a/xbmc/guilib/GraphicContext.cpp b/xbmc/guilib/GraphicContext.cpp
index 3a24abd..ece7fdc 100644 (file)
--- a/xbmc/guilib/GraphicContext.cpp
+++ b/xbmc/guilib/GraphicContext.cpp
@@ -33,6 +33,7 @@
 #include "GUIWindowManager.h"
 #include "utils/JobManager.h"
 #include "video/VideoReferenceClock.h"
+#include "cores/IPlayer.h"
 
 using namespace std;
 

diff --git a/xbmc/interfaces/Builtins.cpp b/xbmc/interfaces/Builtins.cpp
index 8f320c4..93d34ea 100644 (file)
--- a/xbmc/interfaces/Builtins.cpp
+++ b/xbmc/interfaces/Builtins.cpp
@@ -53,6 +53,7 @@
 #include "Util.h"
 #include "URL.h"
 #include "music/MusicDatabase.h"
+#include "cores/IPlayer.h"
 
 #include "filesystem/PluginDirectory.h"
 #ifdef HAS_FILESYSTEM_RAR

diff --git a/xbmc/interfaces/json-rpc/PlayerOperations.cpp b/xbmc/interfaces/json-rpc/PlayerOperations.cpp
index 9bb7f72..f60e6f8 100644 (file)
--- a/xbmc/interfaces/json-rpc/PlayerOperations.cpp
+++ b/xbmc/interfaces/json-rpc/PlayerOperations.cpp
@@ -41,6 +41,7 @@
 #include "pvr/PVRManager.h"
 #include "pvr/channels/PVRChannel.h"
 #include "pvr/channels/PVRChannelGroupsContainer.h"
+#include "cores/IPlayer.h"
 
 using namespace JSONRPC;
 using namespace PLAYLIST;

diff --git a/xbmc/interfaces/legacy/Player.cpp b/xbmc/interfaces/legacy/Player.cpp
index 9d8b76e..433dea9 100644 (file)
--- a/xbmc/interfaces/legacy/Player.cpp
+++ b/xbmc/interfaces/legacy/Player.cpp
@@ -30,6 +30,7 @@
 #include "AddonUtils.h"
 #include "utils/LangCodeExpander.h"
 #include "utils/log.h"
+#include "cores/IPlayer.h"
 
 namespace XBMCAddon
 {

diff --git a/xbmc/interfaces/python/XBPython.h b/xbmc/interfaces/python/XBPython.h
index 23b60cf..3faa99f 100644 (file)
--- a/xbmc/interfaces/python/XBPython.h
+++ b/xbmc/interfaces/python/XBPython.h
@@ -22,7 +22,7 @@
  */
 
 #include "XBPyThread.h"
-#include "cores/IPlayer.h"
+#include "cores/IPlayerCallback.h"
 #include "threads/CriticalSection.h"
 #include "interfaces/IAnnouncer.h"
 #include "addons/IAddon.h"

diff --git a/xbmc/music/karaoke/karaokewindowbackground.h b/xbmc/music/karaoke/karaokewindowbackground.h
index 51e1753..d44b74e 100644 (file)
--- a/xbmc/music/karaoke/karaokewindowbackground.h
+++ b/xbmc/music/karaoke/karaokewindowbackground.h
@@ -23,7 +23,7 @@
 
 // C++ Interface: karaokewindowbackground
 
-#include "cores/IPlayer.h"
+#include "cores/IPlayerCallback.h"
 
 class CGUIWindow;
 class CGUIImage;

diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp
index 5f43def..1ede03f 100644 (file)
--- a/xbmc/music/windows/GUIWindowMusicBase.cpp
+++ b/xbmc/music/windows/GUIWindowMusicBase.cpp
@@ -64,6 +64,7 @@
 #include "utils/StringUtils.h"
 #include "URL.h"
 #include "music/infoscanner/MusicInfoScanner.h"
+#include "cores/IPlayer.h"
 
 using namespace std;
 using namespace XFILE;

diff --git a/xbmc/music/windows/GUIWindowMusicSongs.cpp b/xbmc/music/windows/GUIWindowMusicSongs.cpp
index ec0ccdf..b4674bd 100644 (file)
--- a/xbmc/music/windows/GUIWindowMusicSongs.cpp
+++ b/xbmc/music/windows/GUIWindowMusicSongs.cpp
@@ -37,6 +37,7 @@
 #include "utils/URIUtils.h"
 #include "Autorun.h"
 #include "cdrip/CDDARipper.h"
+#include "cores/IPlayer.h"
 
 #define CONTROL_BTNVIEWASICONS     2
 #define CONTROL_BTNSORTBY          3

diff --git a/xbmc/network/AirPlayServer.cpp b/xbmc/network/AirPlayServer.cpp
index 8cf73af..11daa97 100644 (file)
--- a/xbmc/network/AirPlayServer.cpp
+++ b/xbmc/network/AirPlayServer.cpp
@@ -37,6 +37,7 @@
 #include "utils/Variant.h"
 #include "guilib/GUIWindowManager.h"
 #include "URL.h"
+#include "cores/IPlayer.h"
 
 #ifdef TARGET_WINDOWS
 #define close closesocket

diff --git a/xbmc/pvr/addons/PVRClients.cpp b/xbmc/pvr/addons/PVRClients.cpp
index 8a0cc1b..dc6324e 100644 (file)
--- a/xbmc/pvr/addons/PVRClients.cpp
+++ b/xbmc/pvr/addons/PVRClients.cpp
@@ -34,6 +34,7 @@
 #include "pvr/channels/PVRChannelGroupInternal.h"
 #include "pvr/recordings/PVRRecordings.h"
 #include "pvr/timers/PVRTimers.h"
+#include "cores/IPlayer.h"
 
 #ifdef HAS_VIDEO_PLAYBACK
 #include "cores/VideoRenderers/RenderManager.h"

diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
index 8b94e26..0334a66 100644 (file)
--- a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
+++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
@@ -30,6 +30,7 @@
 #include "view/ViewState.h"
 #include "settings/GUISettings.h"
 #include "GUIInfoManager.h"
+#include "cores/IPlayer.h"
 
 #include "pvr/PVRManager.h"
 #include "pvr/channels/PVRChannelGroupsContainer.h"

diff --git a/xbmc/pvr/windows/GUIWindowPVRCommon.cpp b/xbmc/pvr/windows/GUIWindowPVRCommon.cpp
index b92e115..06e3b38 100644 (file)
--- a/xbmc/pvr/windows/GUIWindowPVRCommon.cpp
+++ b/xbmc/pvr/windows/GUIWindowPVRCommon.cpp
@@ -45,6 +45,7 @@
 #include "utils/log.h"
 #include "utils/URIUtils.h"
 #include "GUIUserMessages.h"
+#include "cores/IPlayer.h"
 
 using namespace std;
 using namespace PVR;

diff --git a/xbmc/video/Teletext.cpp b/xbmc/video/Teletext.cpp
index bb74f90..edddd2d 100644 (file)
--- a/xbmc/video/Teletext.cpp
+++ b/xbmc/video/Teletext.cpp
@@ -32,6 +32,7 @@
 #include "utils/TimeUtils.h"
 #include "filesystem/SpecialProtocol.h"
 #include "guilib/GraphicContext.h"
+#include "cores/IPlayer.h"
 
 #ifdef HAS_SDL
 #include <SDL/SDL_stdinc.h>

diff --git a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
index ac4d6a6..06ae29b 100644 (file)
--- a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
+++ b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
@@ -37,6 +37,7 @@
 #include "guilib/LocalizeStrings.h"
 #include "pvr/PVRManager.h"
 #include "cores/AudioEngine/Utils/AEUtil.h"
+#include "cores/IPlayer.h"
 
 using namespace std;
 using namespace XFILE;

diff --git a/xbmc/video/dialogs/GUIDialogTeletext.cpp b/xbmc/video/dialogs/GUIDialogTeletext.cpp
index 91042c9..f70730c 100644 (file)
--- a/xbmc/video/dialogs/GUIDialogTeletext.cpp
+++ b/xbmc/video/dialogs/GUIDialogTeletext.cpp
@@ -27,6 +27,7 @@
 #include "settings/Settings.h"
 #include "guilib/LocalizeStrings.h"
 #include "dialogs/GUIDialogKaiToast.h"
+#include "cores/IPlayer.h"
 
 using namespace std;
 

diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
index 4ed7715..c095fc5 100644 (file)
--- a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
+++ b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
@@ -41,6 +41,7 @@
 #include "utils/log.h"
 #include "utils/Variant.h"
 #include "Util.h"
+#include "cores/IPlayer.h"
 
 using namespace std;
 

diff --git a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
index 20c879f..ffe3c68 100644 (file)
--- a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
+++ b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
@@ -24,6 +24,7 @@
 #include "GUIUserMessages.h"
 #include "guilib/GUIWindowManager.h"
 #include "input/MouseStat.h"
+#include "cores/IPlayer.h"
 
 #include "pvr/PVRManager.h"
 #include "pvr/channels/PVRChannelGroupsContainer.h"

diff --git a/xbmc/video/windows/GUIWindowFullScreen.cpp b/xbmc/video/windows/GUIWindowFullScreen.cpp
index fb11628..e7d0dbc 100644 (file)
--- a/xbmc/video/windows/GUIWindowFullScreen.cpp
+++ b/xbmc/video/windows/GUIWindowFullScreen.cpp
@@ -56,6 +56,7 @@
 #include "pvr/PVRManager.h"
 #include "pvr/channels/PVRChannelGroupsContainer.h"
 #include "windowing/WindowingFactory.h"
+#include "cores/IPlayer.h"
 
 #include <stdio.h>
 #include <algorithm>