diff options
author | Martijn Kaijser <martijn@xbmc.org> | 2016-04-01 00:20:11 +0200 |
---|---|---|
committer | Martijn Kaijser <martijn@xbmc.org> | 2016-04-01 00:20:11 +0200 |
commit | 72769f6951f60711d96cc5cd6206baad952ee3ad (patch) | |
tree | ddde32c9a8b8f35b5d1507d4fc29e602afe8b08c | |
parent | d5bdc8c15680b180264a368a913dc66e9a850af4 (diff) | |
parent | 7b49b8cad778f9b816abe60296098b642babe727 (diff) |
Merge pull request #9494 from MaxKellermann/includes1
Include cleanup in VideoPlayer, workaround for utils/RegExp.h
30 files changed, 51 insertions, 22 deletions
diff --git a/xbmc/cores/VideoPlayer/DVDAudio.cpp b/xbmc/cores/VideoPlayer/DVDAudio.cpp index bbea8c1028..8227deacc2 100644 --- a/xbmc/cores/VideoPlayer/DVDAudio.cpp +++ b/xbmc/cores/VideoPlayer/DVDAudio.cpp @@ -18,13 +18,12 @@ * */ +#include "DVDAudio.h" #include "threads/SingleLock.h" #include "utils/log.h" -#include "DVDAudio.h" #include "DVDClock.h" #include "DVDCodecs/Audio/DVDAudioCodec.h" #include "cores/AudioEngine/AEFactory.h" -#include "cores/AudioEngine/Interfaces/AEStream.h" #include "cores/AudioEngine/Utils/AEAudioFormat.h" #include "settings/MediaSettings.h" diff --git a/xbmc/cores/VideoPlayer/DVDClock.cpp b/xbmc/cores/VideoPlayer/DVDClock.cpp index 0b96e31574..73c72cea9b 100644 --- a/xbmc/cores/VideoPlayer/DVDClock.cpp +++ b/xbmc/cores/VideoPlayer/DVDClock.cpp @@ -25,6 +25,8 @@ #include "threads/SingleLock.h" #include "utils/log.h" +#include <inttypes.h> + int64_t CDVDClock::m_systemOffset; int64_t CDVDClock::m_systemFrequency; CCriticalSection CDVDClock::m_systemsection; diff --git a/xbmc/cores/VideoPlayer/DVDClock.h b/xbmc/cores/VideoPlayer/DVDClock.h index ea5ba3d083..b42ed9d4ff 100644 --- a/xbmc/cores/VideoPlayer/DVDClock.h +++ b/xbmc/cores/VideoPlayer/DVDClock.h @@ -20,9 +20,10 @@ * */ -#include "system.h" #include "threads/CriticalSection.h" +#include <stdint.h> + #define DVD_TIME_BASE 1000000 #define DVD_NOPTS_VALUE 0xFFF0000000000000 diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.cpp index b066a5539c..f7d6a9682e 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.cpp @@ -18,6 +18,7 @@ * */ #include "DVDOverlayCodec.h" +#include "DVDDemuxers/DVDDemuxPacket.h" #include "cores/VideoPlayer/DVDClock.h" void CDVDOverlayCodec::GetAbsoluteTimes(double &starttime, double &stoptime, DemuxPacket *pkt, bool &replace, double offset/* = 0.0*/) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.h index 2c5f7e1331..7b7e45aa7f 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.h +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.h @@ -20,7 +20,6 @@ * */ -#include "DVDOverlay.h" #include "PlatformDefs.h" #include "cores/VideoPlayer/DVDDemuxers/DVDDemux.h" @@ -31,6 +30,7 @@ #define OC_BUFFER 0x00000002 // the decoder needs more data #define OC_OVERLAY 0x00000004 // the decoder decoded an overlay, call Decode(NULL, 0) again to parse the rest of the data +class CDVDOverlay; class CDVDStreamInfo; class CDVDCodecOption; class CDVDCodecOptions; diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp index abde289f94..24f2de06da 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp @@ -22,6 +22,7 @@ #include "DVDOverlayImage.h" #include "DVDStreamInfo.h" #include "DVDClock.h" +#include "DVDDemuxers/DVDDemuxPacket.h" #include "utils/log.h" #include "utils/EndianSwap.h" #include "guilib/GraphicContext.h" diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp index a955e9f072..c67e3a6afd 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp @@ -25,6 +25,7 @@ #include "DVDStreamInfo.h" #include "DVDCodecs/DVDCodecs.h" #include "DVDClock.h" +#include "DVDDemuxers/DVDDemuxPacket.h" #include "Util.h" #include "utils/StringUtils.h" diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp index e8abb13260..a0b99820a8 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp @@ -23,6 +23,7 @@ #include "DVDOverlayText.h" #include "DVDStreamInfo.h" #include "DVDCodecs/DVDCodecs.h" +#include "DVDDemuxers/DVDDemuxPacket.h" #include "settings/Settings.h" #include "utils/log.h" #include "utils/StringUtils.h" diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp index 9207c1ac1a..bbe98f1813 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp @@ -23,6 +23,7 @@ #include "DVDOverlayText.h" #include "DVDStreamInfo.h" #include "DVDCodecs/DVDCodecs.h" +#include "DVDDemuxers/DVDDemuxPacket.h" #include "utils/log.h" #include "cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagSami.h" diff --git a/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp b/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp index 7c93e8e9e4..5075d3b1a1 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp @@ -20,6 +20,7 @@ #include "DVDDemuxSPU.h" #include "DVDClock.h" +#include "DVDCodecs/Overlay/DVDOverlaySpu.h" #include "utils/log.h" #undef ALIGN diff --git a/xbmc/cores/VideoPlayer/DVDDemuxSPU.h b/xbmc/cores/VideoPlayer/DVDDemuxSPU.h index 521ee46287..ab56941f13 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxSPU.h +++ b/xbmc/cores/VideoPlayer/DVDDemuxSPU.h @@ -20,11 +20,10 @@ * */ -#include "DVDCodecs/Overlay/DVDOverlaySpu.h" - #include <stdint.h> struct AVFrame; +class CDVDOverlaySpu; typedef struct SPUData { diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h index 7b2df09d84..43da792b97 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h @@ -23,8 +23,8 @@ #include <string> #include <vector> #include "system.h" -#include "DVDDemuxPacket.h" +struct DemuxPacket; class CDVDInputStream; #ifndef __GNUC__ diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp index d32e69803e..609b8a5b0f 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp @@ -24,6 +24,7 @@ #include "DVDDemuxUtils.h" #include "DVDClock.h" #include "utils/log.h" +#include "system.h" extern "C" { #include "libavcodec/avcodec.h" diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp index 90d3eb7736..a241dcbc00 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp @@ -23,7 +23,8 @@ #include "DVDInputStreams/DVDInputStream.h" #include "DVDStreamInfo.h" #include "DVDCodecs/DVDCodecs.h" -#include "DVDDemuxers/DVDDemuxFFmpeg.h" +#include "DVDDemuxFFmpeg.h" +#include "DVDDemuxPacket.h" #include "DVDClock.h" #include "DVDSubtitles/DVDSubtitleStream.h" diff --git a/xbmc/cores/VideoPlayer/DVDFileInfo.cpp b/xbmc/cores/VideoPlayer/DVDFileInfo.cpp index b75ab947f7..d6a9b613cb 100644 --- a/xbmc/cores/VideoPlayer/DVDFileInfo.cpp +++ b/xbmc/cores/VideoPlayer/DVDFileInfo.cpp @@ -18,11 +18,8 @@ * */ -#include <string> -#include <cstdlib> -#include <memory> -#include "threads/SystemClock.h" #include "DVDFileInfo.h" +#include "threads/SystemClock.h" #include "FileItem.h" #include "settings/AdvancedSettings.h" #include "pictures/Picture.h" @@ -56,6 +53,8 @@ #include "Util.h" #include "utils/LangCodeExpander.h" +#include <cstdlib> +#include <memory> bool CDVDFileInfo::GetFileDuration(const std::string &path, int& duration) { diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.cpp index a2ef4118e6..6db1d8dc94 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.cpp +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.cpp @@ -20,6 +20,7 @@ #include "DVDInputStream.h" #include "URL.h" +#include "DVDStreamInfo.h" CDVDInputStream::CDVDInputStream(DVDStreamType streamType, CFileItem& fileitem) { diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.h b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.h index 005f11b334..fdd160f7bd 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.h +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.h @@ -21,6 +21,7 @@ */ #include "DVDInputStream.h" +#include "DVDDemuxers/DVDDemux.h" #include "../IVideoPlayer.h" #include "../DVDCodecs/Overlay/DVDOverlaySpu.h" #include <string> diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.cpp index 09f1a31567..369e3b4862 100644 --- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.cpp +++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.cpp @@ -20,6 +20,7 @@ #include "DVDFactoryInputStream.h" #include "DVDInputStreamPVRManager.h" +#include "DVDDemuxers/DVDDemuxPacket.h" #include "URL.h" #include "pvr/PVRManager.h" #include "pvr/channels/PVRChannel.h" diff --git a/xbmc/cores/VideoPlayer/DVDMessage.cpp b/xbmc/cores/VideoPlayer/DVDMessage.cpp index 4879562102..5aed6918d2 100644 --- a/xbmc/cores/VideoPlayer/DVDMessage.cpp +++ b/xbmc/cores/VideoPlayer/DVDMessage.cpp @@ -122,3 +122,11 @@ CDVDMsgDemuxerPacket::~CDVDMsgDemuxerPacket() if (m_packet) CDVDDemuxUtils::FreeDemuxPacket(m_packet); } + +unsigned int CDVDMsgDemuxerPacket::GetPacketSize() +{ + if (m_packet) + return m_packet->iSize; + else + return 0; +} diff --git a/xbmc/cores/VideoPlayer/DVDMessage.h b/xbmc/cores/VideoPlayer/DVDMessage.h index 7424eae855..20bfd94592 100644 --- a/xbmc/cores/VideoPlayer/DVDMessage.h +++ b/xbmc/cores/VideoPlayer/DVDMessage.h @@ -29,11 +29,11 @@ #endif // include as less is possible to prevent dependencies -#include "system.h" -#include "DVDDemuxers/DVDDemux.h" #include "DVDResource.h" +#include <string> +#include <string.h> -#include <assert.h> +struct DemuxPacket; class CDVDMsg : public IDVDResourceCounted<CDVDMsg> { @@ -269,7 +269,7 @@ public: CDVDMsgDemuxerPacket(DemuxPacket* packet, bool drop = false); virtual ~CDVDMsgDemuxerPacket(); DemuxPacket* GetPacket() { return m_packet; } - unsigned int GetPacketSize() { if(m_packet) return m_packet->iSize; else return 0; } + unsigned int GetPacketSize(); bool GetPacketDrop() { return m_drop; } DemuxPacket* m_packet; bool m_drop; diff --git a/xbmc/cores/VideoPlayer/DVDMessageQueue.cpp b/xbmc/cores/VideoPlayer/DVDMessageQueue.cpp index cb5d507f91..41e4ecea26 100644 --- a/xbmc/cores/VideoPlayer/DVDMessageQueue.cpp +++ b/xbmc/cores/VideoPlayer/DVDMessageQueue.cpp @@ -19,6 +19,7 @@ */ #include "DVDMessageQueue.h" +#include "DVDDemuxers/DVDDemuxPacket.h" #include "utils/log.h" #include "threads/SingleLock.h" #include "DVDClock.h" diff --git a/xbmc/cores/VideoPlayer/Edl.h b/xbmc/cores/VideoPlayer/Edl.h index ff26078dc4..52728344df 100644 --- a/xbmc/cores/VideoPlayer/Edl.h +++ b/xbmc/cores/VideoPlayer/Edl.h @@ -22,7 +22,6 @@ #include <string> #include <vector> -#include <stdint.h> class CEdl { diff --git a/xbmc/cores/VideoPlayer/IVideoPlayer.h b/xbmc/cores/VideoPlayer/IVideoPlayer.h index a1b8d5ef0b..c1708b9e82 100644 --- a/xbmc/cores/VideoPlayer/IVideoPlayer.h +++ b/xbmc/cores/VideoPlayer/IVideoPlayer.h @@ -20,10 +20,7 @@ * */ -#include "DVDStreamInfo.h" -#include "DVDMessageQueue.h" #include "DVDClock.h" -#include "cores/VideoPlayer/Process/ProcessInfo.h" #define VideoPlayer_AUDIO 1 #define VideoPlayer_VIDEO 2 @@ -36,6 +33,9 @@ template <typename T> class CRectGen; typedef CRectGen<float> CRect; class DVDNavResult; +class CDVDMsg; +class CDVDStreamInfo; +class CProcessInfo; struct SPlayerState { diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp index 04d9214757..44e19cf53b 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp @@ -18,9 +18,9 @@ * */ -#include "system.h" -#include "VideoPlayerRadioRDS.h" #include "VideoPlayer.h" +#include "VideoPlayerRadioRDS.h" +#include "system.h" #include "DVDInputStreams/DVDInputStream.h" #include "DVDInputStreams/DVDFactoryInputStream.h" diff --git a/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp index 29ab69c457..ebdf2d8b7a 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp @@ -22,6 +22,7 @@ #include "VideoPlayerAudio.h" #include "DVDCodecs/Audio/DVDAudioCodec.h" #include "DVDCodecs/DVDFactoryCodec.h" +#include "DVDDemuxers/DVDDemuxPacket.h" #include "settings/Settings.h" #include "video/VideoReferenceClock.h" #include "utils/log.h" diff --git a/xbmc/cores/VideoPlayer/VideoPlayerSubtitle.cpp b/xbmc/cores/VideoPlayer/VideoPlayerSubtitle.cpp index 1f01c470c0..7eb525bd35 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayerSubtitle.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayerSubtitle.cpp @@ -25,6 +25,7 @@ #include "DVDClock.h" #include "DVDSubtitles/DVDSubtitleParser.h" #include "DVDCodecs/DVDFactoryCodec.h" +#include "DVDDemuxers/DVDDemuxPacket.h" #include "utils/log.h" #include "threads/SingleLock.h" #if defined(HAVE_CONFIG_H) diff --git a/xbmc/cores/VideoPlayer/VideoPlayerTeletext.cpp b/xbmc/cores/VideoPlayer/VideoPlayerTeletext.cpp index f51e6435db..0299a87401 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayerTeletext.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayerTeletext.cpp @@ -21,6 +21,7 @@ #include "VideoPlayerTeletext.h" #include "DVDClock.h" #include "DVDStreamInfo.h" +#include "DVDDemuxers/DVDDemuxPacket.h" #include "utils/log.h" #include "threads/SingleLock.h" diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp index bd3fe736ea..4b6c66b9f8 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp @@ -32,6 +32,7 @@ #include "DVDCodecs/Video/DVDVideoPPFFmpeg.h" #include "DVDCodecs/Video/DVDVideoCodecFFmpeg.h" #include "DVDDemuxers/DVDDemux.h" +#include "DVDDemuxers/DVDDemuxPacket.h" #include "guilib/GraphicContext.h" #include <sstream> #include <iomanip> diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.h b/xbmc/cores/VideoPlayer/VideoPlayerVideo.h index 514906642c..34a4c7d54e 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayerVideo.h +++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.h @@ -23,6 +23,7 @@ #include "threads/Thread.h" #include "IVideoPlayer.h" #include "DVDMessageQueue.h" +#include "DVDStreamInfo.h" #include "DVDCodecs/Video/DVDVideoCodec.h" #include "DVDClock.h" #include "DVDOverlayContainer.h" diff --git a/xbmc/utils/RegExp.h b/xbmc/utils/RegExp.h index abe9610662..e4071e43e1 100644 --- a/xbmc/utils/RegExp.h +++ b/xbmc/utils/RegExp.h @@ -25,6 +25,11 @@ #include <string> #include <vector> +/* make sure stdlib.h is included before including pcre.h inside the + namespace; this works around stdlib.h definitions also living in + the PCRE namespace */ +#include <stdlib.h> + namespace PCRE { struct real_pcre_jit_stack; // forward declaration for PCRE without JIT typedef struct real_pcre_jit_stack pcre_jit_stack; |