demux: adaptive: fix include order

modules/demux/adaptive/ChunksSource.hpp

@@ -20,10 +20,6 @@
 #ifndef CHUNKSSOURCE_HPP
 #define CHUNKSSOURCE_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 
 namespace adaptive

modules/demux/adaptive/SegmentTracker.cpp

@@ -17,6 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "SegmentTracker.hpp"
 #include "playlist/AbstractPlaylist.hpp"
 #include "playlist/BaseRepresentation.h"

modules/demux/adaptive/SegmentTracker.hpp

@@ -22,10 +22,6 @@
 
 #include <StreamFormat.hpp>
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <list>
 

modules/demux/adaptive/StreamFormat.cpp

@@ -17,6 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "StreamFormat.hpp"
 
 using namespace adaptive;

modules/demux/adaptive/Streams.cpp

@@ -17,6 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "Streams.hpp"
 #include "http/HTTPConnection.hpp"
 #include "http/HTTPConnectionManager.h"

modules/demux/adaptive/Streams.hpp

@@ -20,10 +20,6 @@
 #ifndef STREAM_HPP
 #define STREAM_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include "StreamFormat.hpp"
 #include "ChunksSource.hpp"

modules/demux/adaptive/http/BytesRange.cpp

@@ -17,6 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "BytesRange.hpp"
 
 using namespace adaptive::http;

modules/demux/adaptive/http/BytesRange.hpp

@@ -20,10 +20,6 @@
 #ifndef BYTESRANGE_HPP
 #define BYTESRANGE_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 
 namespace adaptive

modules/demux/adaptive/http/ConnectionParams.cpp

@@ -17,6 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "ConnectionParams.hpp"
 
 #include <vlc_url.h>

modules/demux/adaptive/http/ConnectionParams.hpp

@@ -20,10 +20,6 @@
 #ifndef CONNECTIONPARAMS_HPP
 #define CONNECTIONPARAMS_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <string>
 

modules/demux/adaptive/http/Downloader.cpp

@@ -17,6 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "Downloader.hpp"
 
 #include <vlc_threads.h>

modules/demux/adaptive/http/Downloader.hpp

@@ -22,10 +22,6 @@
 
 #include "Chunk.h"
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <list>
 

modules/demux/adaptive/http/HTTPConnection.cpp

@@ -17,6 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "HTTPConnection.hpp"
 #include "ConnectionParams.hpp"

modules/demux/adaptive/http/HTTPConnection.hpp

@@ -25,10 +25,6 @@
 #ifndef HTTPCONNECTION_H_
 #define HTTPCONNECTION_H_
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "ConnectionParams.hpp"
 #include "BytesRange.hpp"
 #include <vlc_common.h>

modules/demux/adaptive/http/HTTPConnectionManager.h

@@ -25,10 +25,6 @@
 #ifndef HTTPCONNECTIONMANAGER_H_
 #define HTTPCONNECTIONMANAGER_H_
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "../logic/IDownloadRateObserver.h"
 
 #include <vlc_common.h>

modules/demux/adaptive/http/Sockets.cpp

@@ -17,6 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "Sockets.hpp"
 
 #include <vlc_network.h>

modules/demux/adaptive/http/Sockets.hpp

@@ -20,10 +20,6 @@
 #ifndef SOCKETS_HPP
 #define SOCKETS_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <vlc_tls.h>
 #include <string>

modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp

@@ -17,6 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "AlwaysLowestAdaptationLogic.hpp"
 #include "Representationselectors.hpp"
 

modules/demux/adaptive/logic/IDownloadRateObserver.h

@@ -25,10 +25,6 @@
 #ifndef IDOWNLOADRATEOBSERVER_H_
 #define IDOWNLOADRATEOBSERVER_H_
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 
 namespace adaptive

modules/demux/adaptive/logic/Representationselectors.cpp

@@ -17,6 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "Representationselectors.hpp"
 #include "../playlist/BaseRepresentation.h"
 #include "../playlist/BaseAdaptationSet.h"

modules/demux/adaptive/logic/Representationselectors.hpp

@@ -20,10 +20,6 @@
 #ifndef REPRESENTATIONSELECTORS_HPP
 #define REPRESENTATIONSELECTORS_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vector>
 #include <vlc_common.h>
 

modules/demux/adaptive/mp4/AtomsReader.cpp

@@ -17,6 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "AtomsReader.hpp"
 #include <new>
 

modules/demux/adaptive/mp4/AtomsReader.hpp

@@ -20,10 +20,6 @@
 #ifndef ATOMSREADER_HPP
 #define ATOMSREADER_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <vlc_stream.h>
 extern "C" {

modules/demux/adaptive/playlist/ID.cpp

@@ -17,6 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "ID.hpp"
 #include <sstream>
 

modules/demux/adaptive/playlist/SegmentBase.cpp

@@ -21,6 +21,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "SegmentBase.h"
 

modules/demux/adaptive/playlist/SegmentChunk.cpp

@@ -17,6 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "SegmentChunk.hpp"
 #include "Segment.h"
 #include "BaseRepresentation.h"

modules/demux/adaptive/playlist/SegmentInformation.cpp

@@ -17,6 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "SegmentInformation.hpp"
 
 #include "Segment.h"

modules/demux/adaptive/playlist/SegmentInformation.hpp

@@ -20,10 +20,6 @@
 #ifndef SEGMENTINFORMATION_HPP
 #define SEGMENTINFORMATION_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "ICanonicalUrl.hpp"
 #include "../tools/Properties.hpp"
 #include "SegmentInfoCommon.h"

modules/demux/adaptive/playlist/SegmentList.cpp

@@ -21,6 +21,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "SegmentList.h"
 #include "Segment.h"

modules/demux/adaptive/playlist/SegmentList.h

@@ -25,10 +25,6 @@
 #ifndef SEGMENTLIST_H_
 #define SEGMENTLIST_H_
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "SegmentInfoCommon.h"
 
 namespace adaptive

modules/demux/adaptive/playlist/SegmentTimeline.cpp

@@ -20,6 +20,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "SegmentTimeline.h"
 

modules/demux/adaptive/playlist/SegmentTimeline.h

@@ -24,10 +24,6 @@
 #ifndef SEGMENTTIMELINE_H
 #define SEGMENTTIMELINE_H
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "SegmentInfoCommon.h"
 #include <vlc_common.h>
 #include <list>

modules/demux/adaptive/playlist/Url.cpp

@@ -17,6 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "Url.hpp"
 #include "BaseRepresentation.h"
 #include "SegmentTemplate.h"

modules/demux/adaptive/playlist/Url.hpp

@@ -20,10 +20,6 @@
 #ifndef URL_HPP
 #define URL_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <string>
 #include <vector>
 #include <vlc_common.h>

modules/demux/adaptive/plumbing/CommandsQueue.cpp

@@ -17,6 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "CommandsQueue.hpp"
 #include "FakeESOutID.hpp"
 #include "FakeESOut.hpp"

modules/demux/adaptive/plumbing/CommandsQueue.hpp

@@ -20,10 +20,6 @@
 #ifndef COMMANDSQUEUE_HPP_
 #define COMMANDSQUEUE_HPP_
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <vlc_es.h>
 #include <vlc_atomic.h>

modules/demux/adaptive/plumbing/Demuxer.cpp

@@ -17,6 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "Demuxer.hpp"
 
 #include <vlc_stream.h>

modules/demux/adaptive/plumbing/Demuxer.hpp

@@ -20,10 +20,6 @@
 #ifndef DEMUXER_HPP
 #define DEMUXER_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <string>
 

modules/demux/adaptive/plumbing/FakeESOut.cpp

@@ -17,6 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "FakeESOut.hpp"
 #include "FakeESOutID.hpp"
 #include <vlc_es_out.h>

modules/demux/adaptive/plumbing/FakeESOut.hpp

@@ -20,10 +20,6 @@
 #ifndef FAKEESOUT_HPP
 #define FAKEESOUT_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "CommandsQueue.hpp"
 #include <vlc_atomic.h>
 

modules/demux/adaptive/plumbing/FakeESOutID.cpp

@@ -17,6 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "FakeESOutID.hpp"
 #include "FakeESOut.hpp"
 

modules/demux/adaptive/plumbing/FakeESOutID.hpp

@@ -20,10 +20,6 @@
 #ifndef FAKEESOUTID_HPP
 #define FAKEESOUTID_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <vlc_es.h>
 

modules/demux/adaptive/plumbing/SourceStream.cpp

@@ -17,6 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "SourceStream.hpp"
 
 #include "../ChunksSource.hpp"

modules/demux/adaptive/plumbing/SourceStream.hpp

@@ -20,10 +20,6 @@
 #ifndef SOURCESTREAM_HPP
 #define SOURCESTREAM_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <vlc_block.h>
 

modules/demux/adaptive/tools/Conversions.cpp

@@ -17,6 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "Conversions.hpp"
 
 #include <vlc_charset.h>

modules/demux/adaptive/tools/Conversions.hpp

@@ -20,10 +20,6 @@
 #ifndef CONVERSIONS_HPP
 #define CONVERSIONS_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <string>
 #include <sstream>

modules/demux/adaptive/tools/Retrieve.cpp

@@ -17,6 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "Retrieve.hpp"
 
 #include "../http/HTTPConnectionManager.h"

modules/demux/adaptive/tools/Retrieve.hpp

@@ -20,10 +20,6 @@
 #ifndef RETRIEVE_HPP
 #define RETRIEVE_HPP
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <string>
 

modules/demux/adaptive/xml/DOMParser.h

@@ -25,10 +25,6 @@
 #ifndef DOMPARSER_H_
 #define DOMPARSER_H_
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_common.h>
 #include <vlc_stream.h>