diff options
| author | ace20022 <ace20022@xbmc.org> | 2015-04-20 16:48:07 +0200 |
|---|---|---|
| committer | ace20022 <ace20022@xbmc.org> | 2015-04-22 18:12:46 +0200 |
| commit | 81b7a33f77954926457ec3a76a04aa913acf5071 (patch) | |
| tree | 9c52438312535c2d5686e1fc9a7aa219bb795e59 | |
| parent | 462215b1f7db3a15ffabcff972287007721d2ccf (diff) | |
[dvdplayer] Cleanup includes.
52 files changed, 8 insertions, 99 deletions
diff --git a/xbmc/cores/VideoRenderers/OverlayRendererDX.cpp b/xbmc/cores/VideoRenderers/OverlayRendererDX.cpp index 280c12a52e..bfd6b7ccc6 100644 --- a/xbmc/cores/VideoRenderers/OverlayRendererDX.cpp +++ b/xbmc/cores/VideoRenderers/OverlayRendererDX.cpp @@ -29,6 +29,7 @@ #include "settings/Settings.h" #include "utils/MathUtils.h" #include "RenderManager.h" +#include "utils/log.h" #ifndef ASSERT #include <crtdbg.h> diff --git a/xbmc/cores/dvdplayer/DVDAudio.cpp b/xbmc/cores/dvdplayer/DVDAudio.cpp index d1601b1279..4a0bca931b 100644 --- a/xbmc/cores/dvdplayer/DVDAudio.cpp +++ b/xbmc/cores/dvdplayer/DVDAudio.cpp @@ -22,7 +22,6 @@ #include "utils/log.h" #include "DVDAudio.h" #include "DVDClock.h" -#include "DVDCodecs/DVDCodecs.h" #include "DVDCodecs/Audio/DVDAudioCodec.h" #include "cores/AudioEngine/AEFactory.h" #include "cores/AudioEngine/Interfaces/AEStream.h" diff --git a/xbmc/cores/dvdplayer/DVDAudio.h b/xbmc/cores/dvdplayer/DVDAudio.h index 057a40a1f4..16c26b2985 100644 --- a/xbmc/cores/dvdplayer/DVDAudio.h +++ b/xbmc/cores/dvdplayer/DVDAudio.h @@ -25,7 +25,6 @@ #endif #include "threads/CriticalSection.h" #include "PlatformDefs.h" -#include <queue> #include "cores/AudioEngine/Utils/AEChannelInfo.h" class IAEStream; diff --git a/xbmc/cores/dvdplayer/DVDClock.cpp b/xbmc/cores/dvdplayer/DVDClock.cpp index 2629530d8d..1365682209 100644 --- a/xbmc/cores/dvdplayer/DVDClock.cpp +++ b/xbmc/cores/dvdplayer/DVDClock.cpp @@ -24,7 +24,6 @@ #include "utils/MathUtils.h" #include "threads/SingleLock.h" #include "utils/log.h" -#include "settings/Settings.h" int64_t CDVDClock::m_systemOffset; int64_t CDVDClock::m_systemFrequency; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp index 4ba6ed9894..5e8ae98c9e 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp @@ -21,9 +21,6 @@ #include "DVDAudioCodecPassthrough.h" #include "DVDCodecs/DVDCodecs.h" #include "DVDStreamInfo.h" -#include "cores/AudioEngine/Utils/AEUtil.h" -#include "settings/Settings.h" -#include "utils/log.h" #include <algorithm> diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp index 0cd267a7c1..0a16b4bfa7 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp @@ -32,6 +32,7 @@ #endif #if defined(HAVE_VIDEOTOOLBOXDECODER) #include "Video/DVDVideoCodecVideoToolBox.h" +#include "utils/SystemInfo.h" #endif #include "Video/DVDVideoCodecFFmpeg.h" #include "Video/DVDVideoCodecOpenMax.h" @@ -61,7 +62,6 @@ #include "settings/AdvancedSettings.h" #include "settings/Settings.h" #include "settings/VideoSettings.h" -#include "utils/SystemInfo.h" #include "utils/StringUtils.h" CDVDVideoCodec* CDVDFactoryCodec::OpenCodec(CDVDVideoCodec* pCodec, CDVDStreamInfo &hints, CDVDCodecOptions &options ) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp index 113c9fd68c..1bb0102012 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp @@ -19,8 +19,6 @@ */ #include "DVDOverlayCodecFFmpeg.h" -#include "DVDOverlayText.h" -#include "DVDOverlaySpu.h" #include "DVDOverlayImage.h" #include "DVDStreamInfo.h" #include "DVDClock.h" diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp index a057acc880..f5803dfb53 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp @@ -19,7 +19,6 @@ */ #include "system.h" -#include "DVDClock.h" #include "DVDOverlayCodecTX3G.h" #include "DVDOverlayText.h" #include "DVDStreamInfo.h" diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp index af4eaac826..3fb323437e 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp @@ -19,7 +19,6 @@ */ #include "system.h" -#include "DVDClock.h" #include "DVDOverlayCodecText.h" #include "DVDOverlayText.h" #include "DVDStreamInfo.h" diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h index 4e3b2237d0..db0e64604c 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h +++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h @@ -21,7 +21,6 @@ */ #include "DVDOverlayCodec.h" -#include "libavcodec/avcodec.h" class CDVDOverlayText; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySpu.h b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySpu.h index 0d9b5bcf94..e2ef7893cb 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySpu.h +++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySpu.h @@ -21,6 +21,7 @@ */ #include "DVDOverlay.h" +#include <string.h> class CDVDOverlaySpu : public CDVDOverlay { diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp index 4fb3248ca3..0de32a4dcc 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp @@ -28,7 +28,6 @@ #include "DVDClock.h" #include "DVDCodecs/DVDCodecs.h" #include "DVDCodecs/DVDCodecUtils.h" -#include "DVDVideoPPFFmpeg.h" #if defined(TARGET_POSIX) || defined(TARGET_WINDOWS) #include "utils/CPUInfo.h" #endif @@ -37,7 +36,6 @@ #include "settings/VideoSettings.h" #include "utils/log.h" #include <memory> -#include "threads/Atomics.h" #ifndef TARGET_POSIX #define RINT(x) ((x) >= 0 ? ((int)((x) + 0.5)) : ((int)((x) - 0.5))) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp index d82cf2802b..28601ef359 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp @@ -34,16 +34,12 @@ #include "DXVA.h" #include "windowing/WindowingFactory.h" -#include "../../../VideoRenderers/WinRenderer.h" #include "settings/Settings.h" -#include "settings/MediaSettings.h" #include <memory> #include "utils/AutoPtrHandle.h" #include "utils/StringUtils.h" #include "settings/AdvancedSettings.h" -#include "settings/MediaSettings.h" #include "cores/VideoRenderers/RenderManager.h" -#include "win32/WIN32Util.h" #include "utils/Log.h" #define ALLOW_ADDING_SURFACES 0 diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h index 5b23a96f64..4c444a9229 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h @@ -28,8 +28,6 @@ #include <deque> #include <vector> #include <list> -#include "settings/VideoSettings.h" -#include "guilib/Geometry.h" namespace DXVA { diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h index becd55b0ee..763fc93c8e 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h @@ -33,7 +33,6 @@ extern "C" { #endif } #include "DynamicDll.h" -#include "utils/log.h" class DllLibMpeg2Interface { diff --git a/xbmc/cores/dvdplayer/DVDDemuxSPU.h b/xbmc/cores/dvdplayer/DVDDemuxSPU.h index 396af7f369..1fc90d7d12 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxSPU.h +++ b/xbmc/cores/dvdplayer/DVDDemuxSPU.h @@ -20,7 +20,6 @@ * */ -#include "DVDCodecs/Video/DVDVideoCodec.h" #include "DVDCodecs/Overlay/DVDOverlaySpu.h" struct AVPicture; diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp index 2f833c515c..dfdbe6dc48 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp @@ -19,7 +19,6 @@ */ #include "DVDDemux.h" -#include "DVDCodecs/DVDCodecs.h" void CDemuxStreamTeletext::GetStreamInfo(std::string& strInfo) { diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp index 97869832b6..0fe63649c3 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp @@ -21,7 +21,6 @@ #include "DVDInputStreams/DVDInputStream.h" #include "DVDDemuxBXA.h" #include "DVDDemuxUtils.h" -#include "utils/log.h" #include "utils/StringUtils.h" #include "../DVDClock.h" diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCC.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCC.cpp index 5aa65fe069..b04a1f8bd6 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCC.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCC.cpp @@ -22,7 +22,6 @@ #include "DVDClock.h" #include "DVDDemuxCC.h" #include "cores/dvdplayer/DVDCodecs/Overlay/contrib/cc_decoder708.h" -#include "utils/log.h" #include <algorithm> diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.cpp index 72067da56f..d6ad5fa4ee 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.cpp @@ -21,7 +21,6 @@ #include "DVDInputStreams/DVDInputStream.h" #include "DVDDemuxCDDA.h" #include "DVDDemuxUtils.h" -#include "utils/log.h" #include "../DVDClock.h" // CDDA audio demuxer based on AirTunes audio Demuxer. diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.h index 6a3c50ac29..8682d99c43 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.h +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.h @@ -20,7 +20,6 @@ */ #include "DVDDemux.h" -#include "utils/log.h" #ifdef TARGET_WINDOWS #define __attribute__(dummy_val) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp index 643c219a5f..74ff31f07c 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -30,11 +30,9 @@ #endif #include "DVDDemuxFFmpeg.h" #include "DVDInputStreams/DVDInputStream.h" -#include "DVDInputStreams/DVDInputStreamNavigator.h" #ifdef HAVE_LIBBLURAY #include "DVDInputStreams/DVDInputStreamBluray.h" #endif -#include "DVDInputStreams/DVDInputStreamPVRManager.h" #include "DVDInputStreams/DVDInputStreamFFmpeg.h" #include "DVDDemuxUtils.h" #include "DVDClock.h" // for DVD_TIME_BASE @@ -45,9 +43,7 @@ #include "filesystem/CurlFile.h" #include "filesystem/Directory.h" #include "utils/log.h" -#include "threads/Thread.h" #include "threads/SystemClock.h" -#include "utils/TimeUtils.h" #include "utils/StringUtils.h" #include "URL.h" #include "cores/FFmpeg.h" diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp index a69342aa68..3adf742865 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp @@ -18,7 +18,6 @@ * */ -#include "DVDCodecs/DVDCodecs.h" #include "DVDInputStreams/DVDInputStreamHttp.h" #include "DVDDemuxShoutcast.h" #include "DVDDemuxUtils.h" diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp index 64eb97dd21..c63e15d799 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp @@ -24,7 +24,6 @@ #include "DVDStreamInfo.h" #include "DVDCodecs/DVDCodecs.h" #include "DVDDemuxers/DVDDemuxFFmpeg.h" -#include "DVDDemuxers/DVDDemuxUtils.h" #include "DVDClock.h" #include "DVDSubtitles/DVDSubtitleStream.h" diff --git a/xbmc/cores/dvdplayer/DVDFileInfo.cpp b/xbmc/cores/dvdplayer/DVDFileInfo.cpp index ac905b6028..8525e6b385 100644 --- a/xbmc/cores/dvdplayer/DVDFileInfo.cpp +++ b/xbmc/cores/dvdplayer/DVDFileInfo.cpp @@ -18,8 +18,8 @@ * */ +#include <string> #include <cstdlib> - #include "threads/SystemClock.h" #include "DVDFileInfo.h" #include "FileItem.h" @@ -28,10 +28,8 @@ #include "video/VideoInfoTag.h" #include "filesystem/StackDirectory.h" #include "utils/log.h" -#include "utils/TimeUtils.h" #include "utils/URIUtils.h" -#include "DVDClock.h" #include "DVDStreamInfo.h" #include "DVDInputStreams/DVDInputStream.h" #ifdef HAVE_LIBBLURAY @@ -55,7 +53,6 @@ #include "TextureCache.h" #include "Util.h" #include "utils/LangCodeExpander.h" -#include "pvr/PVRManager.h" bool CDVDFileInfo::GetFileDuration(const std::string &path, int& duration) diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp index 5d49a03b59..3bf1016f0a 100644 --- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp +++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp @@ -23,7 +23,6 @@ #include "DVDInputStream.h" #include "DVDInputStreamFile.h" #include "DVDInputStreamNavigator.h" -#include "DVDInputStreamHttp.h" #include "DVDInputStreamFFmpeg.h" #include "DVDInputStreamPVRManager.h" #include "DVDInputStreamTV.h" diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp index 61667bd7ee..aae94bb9d0 100644 --- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp +++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp @@ -29,14 +29,12 @@ #include "settings/Settings.h" #include "LangInfo.h" #include "utils/log.h" -#include "utils/StringUtils.h" #include "utils/URIUtils.h" #include "filesystem/File.h" #include "filesystem/Directory.h" #include "DllLibbluray.h" #include "URL.h" #include "guilib/Geometry.h" -#include "utils/StringUtils.h" #include "dialogs/GUIDialogKaiToast.h" #include "guilib/LocalizeStrings.h" #include "settings/DiscSettings.h" diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp index 7f5929fc0a..936bbb2106 100644 --- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp @@ -21,8 +21,8 @@ #include "DVDInputStreamFFmpeg.h" #include "playlists/PlayListM3U.h" #include "settings/Settings.h" -#include "Util.h" #include "utils/log.h" +#include <limits.h> using namespace XFILE; diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp index fd49f121c3..a1a4e56e58 100644 --- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp +++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp @@ -25,7 +25,6 @@ #include "pvr/PVRManager.h" #include "pvr/channels/PVRChannel.h" #include "utils/log.h" -#include "utils/StringUtils.h" #include "pvr/addons/PVRClients.h" #include "pvr/channels/PVRChannelGroupsContainer.h" #include "settings/Settings.h" diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp index 9381e939d6..98e74d26bc 100644 --- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp +++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp @@ -19,7 +19,6 @@ */ #include "DVDInputStreamTV.h" -#include "pvr/channels/PVRChannel.h" #include "filesystem/SlingboxFile.h" #include "URL.h" diff --git a/xbmc/cores/dvdplayer/DVDMessage.cpp b/xbmc/cores/dvdplayer/DVDMessage.cpp index 1e0867bbcc..88cfd2545f 100644 --- a/xbmc/cores/dvdplayer/DVDMessage.cpp +++ b/xbmc/cores/dvdplayer/DVDMessage.cpp @@ -22,12 +22,8 @@ #include "threads/SystemClock.h" #include "DVDMessage.h" #include "DVDDemuxers/DVDDemuxUtils.h" -#include "DVDStreamInfo.h" -#include "utils/TimeUtils.h" -#include "utils/log.h" #include "threads/CriticalSection.h" #include "threads/Condition.h" -#include "threads/SystemClock.h" #include "utils/MathUtils.h" class CDVDMsgGeneralSynchronizePriv diff --git a/xbmc/cores/dvdplayer/DVDMessageQueue.cpp b/xbmc/cores/dvdplayer/DVDMessageQueue.cpp index 92fa67af6d..fa0ef4e478 100644 --- a/xbmc/cores/dvdplayer/DVDMessageQueue.cpp +++ b/xbmc/cores/dvdplayer/DVDMessageQueue.cpp @@ -19,7 +19,6 @@ */ #include "DVDMessageQueue.h" -#include "DVDDemuxers/DVDDemuxUtils.h" #include "utils/log.h" #include "threads/SingleLock.h" #include "DVDClock.h" diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp index 4a6c574296..4179a26b53 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -22,10 +22,8 @@ #include "DVDPlayer.h" #include "DVDInputStreams/DVDInputStream.h" -#include "DVDInputStreams/DVDInputStreamFile.h" #include "DVDInputStreams/DVDFactoryInputStream.h" #include "DVDInputStreams/DVDInputStreamNavigator.h" -#include "DVDInputStreams/DVDInputStreamTV.h" #include "DVDInputStreams/DVDInputStreamPVRManager.h" #include "DVDDemuxers/DVDDemux.h" @@ -33,8 +31,6 @@ #include "DVDDemuxers/DVDDemuxVobsub.h" #include "DVDDemuxers/DVDFactoryDemuxer.h" #include "DVDDemuxers/DVDDemuxFFmpeg.h" -#include "DVDCodecs/DVDCodecs.h" -#include "DVDCodecs/DVDFactoryCodec.h" #include "DVDFileInfo.h" @@ -49,9 +45,6 @@ #include "guilib/StereoscopicsManager.h" #include "Application.h" #include "ApplicationMessenger.h" -#include "filesystem/File.h" -#include "pictures/Picture.h" -#include "libswscale/swscale.h" #include "DVDDemuxers/DVDDemuxCC.h" #ifdef HAS_VIDEO_PLAYBACK @@ -68,23 +61,17 @@ #include "settings/Settings.h" #include "settings/MediaSettings.h" #include "utils/log.h" -#include "utils/TimeUtils.h" #include "utils/StreamDetails.h" #include "pvr/PVRManager.h" -#include "pvr/channels/PVRChannel.h" -#include "filesystem/PVRFile.h" -#include "video/dialogs/GUIDialogFullScreenInfo.h" #include "utils/StreamUtils.h" #include "utils/Variant.h" #include "storage/MediaManager.h" #include "dialogs/GUIDialogBusy.h" #include "dialogs/GUIDialogKaiToast.h" -#include "xbmc/playlists/PlayListM3U.h" #include "utils/StringUtils.h" #include "Util.h" #include "LangInfo.h" #include "URL.h" -#include "utils/LangCodeExpander.h" #include "video/VideoReferenceClock.h" #ifdef HAS_OMXPLAYER @@ -92,6 +79,7 @@ #include "cores/omxplayer/OMXPlayerVideo.h" #include "cores/omxplayer/OMXHelper.h" #endif +#include "DVDPlayerAudio.h" using namespace std; using namespace PVR; diff --git a/xbmc/cores/dvdplayer/DVDPlayer.h b/xbmc/cores/dvdplayer/DVDPlayer.h index e12a800ba1..f9e4bf76f8 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.h +++ b/xbmc/cores/dvdplayer/DVDPlayer.h @@ -27,18 +27,12 @@ #include "DVDMessageQueue.h" #include "DVDClock.h" -#include "DVDPlayerAudio.h" #include "DVDPlayerVideo.h" #include "DVDPlayerSubtitle.h" #include "DVDPlayerTeletext.h" -//#include "DVDChapterReader.h" -#include "DVDSubtitles/DVDFactorySubtitle.h" -#include "utils/BitstreamStats.h" - #include "Edl.h" #include "FileItem.h" -#include "threads/SingleLock.h" #include "utils/StreamDetails.h" #include "threads/SystemClock.h" @@ -94,6 +88,7 @@ class CDemuxStreamVideo; class CDemuxStreamAudio; class CStreamInfo; class CDVDDemuxCC; +class CDVDPlayer; namespace PVR { diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp index a345a880ea..f1a7dfccf6 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp @@ -22,12 +22,10 @@ #include "DVDPlayerAudio.h" #include "DVDPlayer.h" #include "DVDCodecs/Audio/DVDAudioCodec.h" -#include "DVDCodecs/DVDCodecs.h" #include "DVDCodecs/DVDFactoryCodec.h" #include "settings/Settings.h" #include "video/VideoReferenceClock.h" #include "utils/log.h" -#include "utils/TimeUtils.h" #include "utils/MathUtils.h" #include "cores/AudioEngine/AEFactory.h" #include "cores/AudioEngine/Utils/AEUtil.h" diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.h b/xbmc/cores/dvdplayer/DVDPlayerAudio.h index 99ce952c77..141ae4addb 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerAudio.h +++ b/xbmc/cores/dvdplayer/DVDPlayerAudio.h @@ -24,15 +24,11 @@ #include "DVDAudio.h" #include "DVDClock.h" #include "DVDMessageQueue.h" -#include "DVDDemuxers/DVDDemuxUtils.h" #include "DVDStreamInfo.h" #include "utils/BitstreamStats.h" #include "IDVDPlayer.h" -#include "cores/AudioEngine/Utils/AEAudioFormat.h" - #include <list> -#include <queue> class CDVDPlayer; class CDVDAudioCodec; diff --git a/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp b/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp index a3da90d043..f086162d6b 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp @@ -21,19 +21,11 @@ #include "DVDPlayerSubtitle.h" #include "DVDCodecs/Overlay/DVDOverlay.h" #include "DVDCodecs/Overlay/DVDOverlaySpu.h" -#include "DVDCodecs/Overlay/DVDOverlayText.h" #include "DVDCodecs/Overlay/DVDOverlayCodec.h" #include "DVDClock.h" -#include "DVDInputStreams/DVDFactoryInputStream.h" -#include "DVDInputStreams/DVDInputStream.h" -#include "DVDInputStreams/DVDInputStreamNavigator.h" #include "DVDSubtitles/DVDSubtitleParser.h" -#include "DVDSubtitles/DVDSubtitleStream.h" -#include "DVDCodecs/DVDCodecs.h" #include "DVDCodecs/DVDFactoryCodec.h" -#include "DVDDemuxers/DVDDemuxUtils.h" #include "utils/log.h" -#include "utils/StringUtils.h" #include "threads/SingleLock.h" #ifdef TARGET_POSIX #include "config.h" diff --git a/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp b/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp index 9fe5a77a43..2b5402e564 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp @@ -21,7 +21,6 @@ #include "DVDPlayerTeletext.h" #include "DVDClock.h" #include "DVDStreamInfo.h" -#include "DVDCodecs/DVDCodecs.h" #include "utils/log.h" #include "threads/SingleLock.h" diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp index ded4eefe02..d59384d179 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp @@ -33,16 +33,12 @@ #include "DVDCodecs/Video/DVDVideoPPFFmpeg.h" #include "DVDCodecs/Video/DVDVideoCodecFFmpeg.h" #include "DVDDemuxers/DVDDemux.h" -#include "DVDDemuxers/DVDDemuxUtils.h" #include "DVDOverlayRenderer.h" -#include "DVDCodecs/DVDCodecs.h" -#include "DVDCodecs/Overlay/DVDOverlaySSA.h" #include "guilib/GraphicContext.h" #include <sstream> #include <iomanip> #include <numeric> #include <iterator> -#include "guilib/GraphicContext.h" #include "utils/log.h" using namespace std; diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.h b/xbmc/cores/dvdplayer/DVDPlayerVideo.h index 92638e90e9..68e5210cbc 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.h +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.h @@ -23,7 +23,6 @@ #include "threads/Thread.h" #include "IDVDPlayer.h" #include "DVDMessageQueue.h" -#include "DVDDemuxers/DVDDemuxUtils.h" #include "DVDCodecs/Video/DVDVideoCodec.h" #include "DVDClock.h" #include "DVDOverlayContainer.h" @@ -31,6 +30,7 @@ #ifdef HAS_VIDEO_PLAYBACK #include "cores/VideoRenderers/RenderManager.h" #endif +#include "utils/BitstreamStats.h" class CDemuxStreamVideo; diff --git a/xbmc/cores/dvdplayer/DVDStreamInfo.cpp b/xbmc/cores/dvdplayer/DVDStreamInfo.cpp index c1dbd85211..fa0defa66b 100644 --- a/xbmc/cores/dvdplayer/DVDStreamInfo.cpp +++ b/xbmc/cores/dvdplayer/DVDStreamInfo.cpp @@ -20,7 +20,6 @@ #include "DVDStreamInfo.h" -#include "DVDCodecs/DVDCodecs.h" #include "DVDDemuxers/DVDDemux.h" CDVDStreamInfo::CDVDStreamInfo() { extradata = NULL; Clear(); } diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp index bfbc9f7100..e457778645 100644 --- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp +++ b/xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp @@ -28,7 +28,6 @@ #include "DVDSubtitleParserSami.h" #include "DVDSubtitleParserSSA.h" #include "DVDSubtitleParserVplayer.h" -#include "utils/log.h" using namespace std; diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp index c28cb16541..83f52f7ee5 100644 --- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp +++ b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp @@ -19,7 +19,6 @@ */ #include "DVDSubtitleLineCollection.h" -#include "DVDClock.h" CDVDSubtitleLineCollection::CDVDSubtitleLineCollection() diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.h index f52858d11f..8ba234a37d 100644 --- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.h +++ b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.h @@ -21,7 +21,6 @@ */ #include "DVDSubtitleParser.h" -#include "DVDSubtitleLineCollection.h" class CDVDSubtitleParserMPL2 : public CDVDSubtitleParserText { diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h index 7528263116..5ead065ccc 100644 --- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h +++ b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h @@ -21,7 +21,6 @@ */ #include "DVDSubtitleParser.h" -#include "DVDSubtitleLineCollection.h" class CDVDSubtitleParserMicroDVD : public CDVDSubtitleParserText { diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.h index d1799cf24e..52dfd3a439 100644 --- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.h +++ b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.h @@ -21,7 +21,6 @@ */ #include "DVDSubtitleParser.h" -#include "DVDSubtitleLineCollection.h" #include "DVDSubtitlesLibass.h" diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.h index 2f5a10dcb5..da5653a3ca 100644 --- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.h +++ b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.h @@ -21,7 +21,6 @@ */ #include "DVDSubtitleParser.h" -#include "DVDSubtitleLineCollection.h" class CDVDOverlayText; class CRegExp; diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.h index 98cf192944..3bc54affe5 100644 --- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.h +++ b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.h @@ -21,7 +21,6 @@ */ #include "DVDSubtitleParser.h" -#include "DVDSubtitleLineCollection.h" class CDVDSubtitleParserSubrip : public CDVDSubtitleParserText { diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.h index 97c960929c..150e44821a 100644 --- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.h +++ b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.h @@ -21,7 +21,6 @@ */ #include "DVDSubtitleParser.h" -#include "DVDSubtitleLineCollection.h" class CDVDSubtitleParserVplayer : public CDVDSubtitleParserText { diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp index 0b5b050bbd..d3e0240f8e 100644 --- a/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp +++ b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp @@ -27,7 +27,6 @@ #include "utils/URIUtils.h" #include "utils/StringUtils.h" #include "threads/SingleLock.h" -#include "threads/Atomics.h" #include "guilib/GraphicContext.h" using namespace std; diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h b/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h index 78716e61b5..f9de4f15e7 100644 --- a/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h +++ b/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h @@ -27,7 +27,6 @@ extern "C" { #include <ass/ass.h> } #include "DynamicDll.h" -#include "utils/log.h" #ifndef LIBASS_VERSION /* Legacy version. */ typedef struct ass_library_s ASS_Library; diff --git a/xbmc/cores/dvdplayer/Edl.cpp b/xbmc/cores/dvdplayer/Edl.cpp index bb0b753162..b4012922d8 100644 --- a/xbmc/cores/dvdplayer/Edl.cpp +++ b/xbmc/cores/dvdplayer/Edl.cpp @@ -26,7 +26,6 @@ #include "utils/log.h" #include "utils/XBMCTinyXML.h" #include "PlatformDefs.h" -#include "URL.h" #include "pvr/recordings/PVRRecordings.h" #include "pvr/PVRManager.h" |