From 395db15f198240ba5958b072ee4b93c8899147e3 Mon Sep 17 00:00:00 2001
From: Francois Cartegnie <fcvlcdev@free.fr>
Date: Fri, 19 Feb 2016 19:17:52 +0100
Subject: [PATCH] demux: adaptative: rename to adaptive
---
modules/MODULES_LIST | 2 +-
modules/demux/Makefile.am | 220 +++++++++---------
.../{adaptative => adaptive}/ChunksSource.hpp | 2 +-
.../PlaylistManager.cpp | 12 +-
.../PlaylistManager.h | 2 +-
.../SegmentTracker.cpp | 6 +-
.../SegmentTracker.hpp | 2 +-
.../{adaptative => adaptive}/StreamFormat.cpp | 2 +-
.../{adaptative => adaptive}/StreamFormat.hpp | 2 +-
.../{adaptative => adaptive}/Streams.cpp | 4 +-
.../{adaptative => adaptive}/Streams.hpp | 2 +-
.../demux/{adaptative => adaptive}/Time.hpp | 0
.../adaptative.cpp => adaptive/adaptive.cpp} | 22 +-
.../http/BytesRange.cpp | 2 +-
.../http/BytesRange.hpp | 2 +-
.../{adaptative => adaptive}/http/Chunk.cpp | 2 +-
.../{adaptative => adaptive}/http/Chunk.h | 2 +-
.../http/Downloader.cpp | 2 +-
.../http/Downloader.hpp | 2 +-
.../http/HTTPConnection.cpp | 4 +-
.../http/HTTPConnection.hpp | 2 +-
.../http/HTTPConnectionManager.cpp | 2 +-
.../http/HTTPConnectionManager.h | 2 +-
.../{adaptative => adaptive}/http/Sockets.cpp | 2 +-
.../{adaptative => adaptive}/http/Sockets.hpp | 2 +-
.../logic/AbstractAdaptationLogic.cpp | 2 +-
.../logic/AbstractAdaptationLogic.h | 2 +-
.../logic/AlwaysBestAdaptationLogic.cpp | 4 +-
.../logic/AlwaysBestAdaptationLogic.h | 2 +-
.../logic/AlwaysLowestAdaptationLogic.cpp | 4 +-
.../logic/AlwaysLowestAdaptationLogic.hpp | 2 +-
.../logic/IDownloadRateObserver.h | 2 +-
.../logic/RateBasedAdaptationLogic.cpp | 4 +-
.../logic/RateBasedAdaptationLogic.h | 2 +-
.../logic/Representationselectors.cpp | 2 +-
.../logic/Representationselectors.hpp | 2 +-
.../mp4/AtomsReader.cpp | 2 +-
.../mp4/AtomsReader.hpp | 2 +-
.../playlist/AbstractPlaylist.cpp | 2 +-
.../playlist/AbstractPlaylist.hpp | 2 +-
.../playlist/BaseAdaptationSet.cpp | 4 +-
.../playlist/BaseAdaptationSet.h | 2 +-
.../playlist/BasePeriod.cpp | 2 +-
.../playlist/BasePeriod.h | 2 +-
.../playlist/BaseRepresentation.cpp | 4 +-
.../playlist/BaseRepresentation.h | 2 +-
.../playlist/CommonAttributesElements.cpp | 2 +-
.../playlist/CommonAttributesElements.h | 2 +-
.../playlist/ICanonicalUrl.hpp | 2 +-
.../{adaptative => adaptive}/playlist/ID.cpp | 2 +-
.../{adaptative => adaptive}/playlist/ID.hpp | 2 +-
.../playlist/Inheritables.cpp | 2 +-
.../playlist/Inheritables.hpp | 2 +-
.../playlist/Segment.cpp | 4 +-
.../playlist/Segment.h | 2 +-
.../playlist/SegmentBase.cpp | 2 +-
.../playlist/SegmentBase.h | 2 +-
.../playlist/SegmentChunk.cpp | 4 +-
.../playlist/SegmentChunk.hpp | 2 +-
.../playlist/SegmentInfoCommon.cpp | 2 +-
.../playlist/SegmentInfoCommon.h | 2 +-
.../playlist/SegmentInformation.cpp | 2 +-
.../playlist/SegmentInformation.hpp | 2 +-
.../playlist/SegmentList.cpp | 2 +-
.../playlist/SegmentList.h | 2 +-
.../playlist/SegmentTemplate.cpp | 2 +-
.../playlist/SegmentTemplate.h | 2 +-
.../playlist/SegmentTimeline.cpp | 2 +-
.../playlist/SegmentTimeline.h | 2 +-
.../playlist/Templates.hpp | 2 +-
.../{adaptative => adaptive}/playlist/Url.cpp | 2 +-
.../{adaptative => adaptive}/playlist/Url.hpp | 2 +-
.../plumbing/CommandsQueue.cpp | 4 +-
.../plumbing/CommandsQueue.hpp | 2 +-
.../plumbing/Demuxer.cpp | 2 +-
.../plumbing/Demuxer.hpp | 2 +-
.../plumbing/FakeESOut.cpp | 4 +-
.../plumbing/FakeESOut.hpp | 2 +-
.../plumbing/FakeESOutID.cpp | 2 +-
.../plumbing/FakeESOutID.hpp | 2 +-
.../plumbing/SourceStream.cpp | 2 +-
.../plumbing/SourceStream.hpp | 2 +-
.../tools/Conversions.cpp | 0
.../tools/Conversions.hpp | 0
.../{adaptative => adaptive}/tools/Debug.hpp | 0
.../{adaptative => adaptive}/tools/Helper.cpp | 2 +-
.../{adaptative => adaptive}/tools/Helper.h | 2 +-
.../tools/Properties.hpp | 0
.../tools/Retrieve.cpp | 4 +-
.../tools/Retrieve.hpp | 2 +-
.../xml/DOMHelper.cpp | 2 +-
.../{adaptative => adaptive}/xml/DOMHelper.h | 2 +-
.../xml/DOMParser.cpp | 2 +-
.../{adaptative => adaptive}/xml/DOMParser.h | 2 +-
.../{adaptative => adaptive}/xml/Node.cpp | 2 +-
.../demux/{adaptative => adaptive}/xml/Node.h | 2 +-
modules/demux/dash/DASHManager.cpp | 10 +-
modules/demux/dash/DASHManager.h | 8 +-
modules/demux/dash/DASHStream.hpp | 4 +-
modules/demux/dash/mp4/IndexReader.cpp | 2 +-
modules/demux/dash/mp4/IndexReader.hpp | 8 +-
modules/demux/dash/mpd/AdaptationSet.cpp | 2 +-
modules/demux/dash/mpd/AdaptationSet.h | 6 +-
.../dash/mpd/DASHCommonAttributesElements.cpp | 4 +-
modules/demux/dash/mpd/DASHSegment.cpp | 8 +-
modules/demux/dash/mpd/DASHSegment.h | 6 +-
modules/demux/dash/mpd/IsoffMainParser.cpp | 24 +-
modules/demux/dash/mpd/IsoffMainParser.h | 8 +-
modules/demux/dash/mpd/MPD.h | 8 +-
modules/demux/dash/mpd/Period.h | 8 +-
modules/demux/dash/mpd/Representation.cpp | 4 +-
modules/demux/dash/mpd/Representation.h | 8 +-
modules/demux/hls/HLSManager.cpp | 8 +-
modules/demux/hls/HLSManager.hpp | 6 +-
modules/demux/hls/HLSStreams.hpp | 4 +-
modules/demux/hls/playlist/HLSSegment.cpp | 4 +-
modules/demux/hls/playlist/HLSSegment.hpp | 4 +-
modules/demux/hls/playlist/M3U8.cpp | 4 +-
modules/demux/hls/playlist/M3U8.hpp | 4 +-
modules/demux/hls/playlist/Parser.cpp | 16 +-
modules/demux/hls/playlist/Parser.hpp | 6 +-
modules/demux/hls/playlist/Representation.cpp | 6 +-
modules/demux/hls/playlist/Representation.hpp | 10 +-
modules/demux/smooth/SmoothManager.cpp | 8 +-
modules/demux/smooth/SmoothManager.hpp | 8 +-
modules/demux/smooth/SmoothStream.hpp | 4 +-
modules/demux/smooth/mp4/IndexReader.cpp | 12 +-
modules/demux/smooth/mp4/IndexReader.hpp | 8 +-
.../smooth/playlist/ForgedInitSegment.cpp | 4 +-
.../smooth/playlist/ForgedInitSegment.hpp | 8 +-
modules/demux/smooth/playlist/Manifest.cpp | 2 +-
modules/demux/smooth/playlist/Manifest.hpp | 4 +-
modules/demux/smooth/playlist/MemoryChunk.hpp | 4 +-
modules/demux/smooth/playlist/Parser.cpp | 18 +-
modules/demux/smooth/playlist/Parser.hpp | 8 +-
.../demux/smooth/playlist/Representation.cpp | 6 +-
.../demux/smooth/playlist/Representation.hpp | 10 +-
.../demux/smooth/playlist/SmoothSegment.cpp | 4 +-
.../demux/smooth/playlist/SmoothSegment.hpp | 4 +-
po/POTFILES.in | 2 +-
140 files changed, 381 insertions(+), 381 deletions(-)
rename modules/demux/{adaptative => adaptive}/ChunksSource.hpp (98%)
rename modules/demux/{adaptative => adaptive}/PlaylistManager.cpp (97%)
rename modules/demux/{adaptative => adaptive}/PlaylistManager.h (99%)
rename modules/demux/{adaptative => adaptive}/SegmentTracker.cpp (98%)
rename modules/demux/{adaptative => adaptive}/SegmentTracker.hpp (99%)
rename modules/demux/{adaptative => adaptive}/StreamFormat.cpp (98%)
rename modules/demux/{adaptative => adaptive}/StreamFormat.hpp (98%)
rename modules/demux/{adaptative => adaptive}/Streams.cpp (99%)
rename modules/demux/{adaptative => adaptive}/Streams.hpp (99%)
rename modules/demux/{adaptative => adaptive}/Time.hpp (100%)
rename modules/demux/{adaptative/adaptative.cpp => adaptive/adaptive.cpp} (92%)
rename modules/demux/{adaptative => adaptive}/http/BytesRange.cpp (97%)
rename modules/demux/{adaptative => adaptive}/http/BytesRange.hpp (98%)
rename modules/demux/{adaptative => adaptive}/http/Chunk.cpp (99%)
rename modules/demux/{adaptative => adaptive}/http/Chunk.h (99%)
rename modules/demux/{adaptative => adaptive}/http/Downloader.cpp (98%)
rename modules/demux/{adaptative => adaptive}/http/Downloader.hpp (98%)
rename modules/demux/{adaptative => adaptive}/http/HTTPConnection.cpp (98%)
rename modules/demux/{adaptative => adaptive}/http/HTTPConnection.hpp (99%)
rename modules/demux/{adaptative => adaptive}/http/HTTPConnectionManager.cpp (99%)
rename modules/demux/{adaptative => adaptive}/http/HTTPConnectionManager.h (99%)
rename modules/demux/{adaptative => adaptive}/http/Sockets.cpp (99%)
rename modules/demux/{adaptative => adaptive}/http/Sockets.hpp (99%)
rename modules/demux/{adaptative => adaptive}/logic/AbstractAdaptationLogic.cpp (97%)
rename modules/demux/{adaptative => adaptive}/logic/AbstractAdaptationLogic.h (99%)
rename modules/demux/{adaptative => adaptive}/logic/AlwaysBestAdaptationLogic.cpp (95%)
rename modules/demux/{adaptative => adaptive}/logic/AlwaysBestAdaptationLogic.h (98%)
rename modules/demux/{adaptative => adaptive}/logic/AlwaysLowestAdaptationLogic.cpp (94%)
rename modules/demux/{adaptative => adaptive}/logic/AlwaysLowestAdaptationLogic.hpp (98%)
rename modules/demux/{adaptative => adaptive}/logic/IDownloadRateObserver.h (98%)
rename modules/demux/{adaptative => adaptive}/logic/RateBasedAdaptationLogic.cpp (98%)
rename modules/demux/{adaptative => adaptive}/logic/RateBasedAdaptationLogic.h (99%)
rename modules/demux/{adaptative => adaptive}/logic/Representationselectors.cpp (99%)
rename modules/demux/{adaptative => adaptive}/logic/Representationselectors.hpp (98%)
rename modules/demux/{adaptative => adaptive}/mp4/AtomsReader.cpp (98%)
rename modules/demux/{adaptative => adaptive}/mp4/AtomsReader.hpp (98%)
rename modules/demux/{adaptative => adaptive}/playlist/AbstractPlaylist.cpp (98%)
rename modules/demux/{adaptative => adaptive}/playlist/AbstractPlaylist.hpp (99%)
rename modules/demux/{adaptative => adaptive}/playlist/BaseAdaptationSet.cpp (97%)
rename modules/demux/{adaptative => adaptive}/playlist/BaseAdaptationSet.h (99%)
rename modules/demux/{adaptative => adaptive}/playlist/BasePeriod.cpp (98%)
rename modules/demux/{adaptative => adaptive}/playlist/BasePeriod.h (99%)
rename modules/demux/{adaptative => adaptive}/playlist/BaseRepresentation.cpp (98%)
rename modules/demux/{adaptative => adaptive}/playlist/BaseRepresentation.h (99%)
rename modules/demux/{adaptative => adaptive}/playlist/CommonAttributesElements.cpp (98%)
rename modules/demux/{adaptative => adaptive}/playlist/CommonAttributesElements.h (99%)
rename modules/demux/{adaptative => adaptive}/playlist/ICanonicalUrl.hpp (98%)
rename modules/demux/{adaptative => adaptive}/playlist/ID.cpp (97%)
rename modules/demux/{adaptative => adaptive}/playlist/ID.hpp (98%)
rename modules/demux/{adaptative => adaptive}/playlist/Inheritables.cpp (98%)
rename modules/demux/{adaptative => adaptive}/playlist/Inheritables.hpp (99%)
rename modules/demux/{adaptative => adaptive}/playlist/Segment.cpp (98%)
rename modules/demux/{adaptative => adaptive}/playlist/Segment.h (99%)
rename modules/demux/{adaptative => adaptive}/playlist/SegmentBase.cpp (97%)
rename modules/demux/{adaptative => adaptive}/playlist/SegmentBase.h (98%)
rename modules/demux/{adaptative => adaptive}/playlist/SegmentChunk.cpp (96%)
rename modules/demux/{adaptative => adaptive}/playlist/SegmentChunk.hpp (98%)
rename modules/demux/{adaptative => adaptive}/playlist/SegmentInfoCommon.cpp (98%)
rename modules/demux/{adaptative => adaptive}/playlist/SegmentInfoCommon.h (99%)
rename modules/demux/{adaptative => adaptive}/playlist/SegmentInformation.cpp (99%)
rename modules/demux/{adaptative => adaptive}/playlist/SegmentInformation.hpp (99%)
rename modules/demux/{adaptative => adaptive}/playlist/SegmentList.cpp (99%)
rename modules/demux/{adaptative => adaptive}/playlist/SegmentList.h (99%)
rename modules/demux/{adaptative => adaptive}/playlist/SegmentTemplate.cpp (98%)
rename modules/demux/{adaptative => adaptive}/playlist/SegmentTemplate.h (99%)
rename modules/demux/{adaptative => adaptive}/playlist/SegmentTimeline.cpp (99%)
rename modules/demux/{adaptative => adaptive}/playlist/SegmentTimeline.h (99%)
rename modules/demux/{adaptative => adaptive}/playlist/Templates.hpp (98%)
rename modules/demux/{adaptative => adaptive}/playlist/Url.cpp (98%)
rename modules/demux/{adaptative => adaptive}/playlist/Url.hpp (99%)
rename modules/demux/{adaptative => adaptive}/plumbing/CommandsQueue.cpp (98%)
rename modules/demux/{adaptative => adaptive}/plumbing/CommandsQueue.hpp (99%)
rename modules/demux/{adaptative => adaptive}/plumbing/Demuxer.cpp (99%)
rename modules/demux/{adaptative => adaptive}/plumbing/Demuxer.hpp (99%)
rename modules/demux/{adaptative => adaptive}/plumbing/FakeESOut.cpp (99%)
rename modules/demux/{adaptative => adaptive}/plumbing/FakeESOut.hpp (99%)
rename modules/demux/{adaptative => adaptive}/plumbing/FakeESOutID.cpp (98%)
rename modules/demux/{adaptative => adaptive}/plumbing/FakeESOutID.hpp (98%)
rename modules/demux/{adaptative => adaptive}/plumbing/SourceStream.cpp (99%)
rename modules/demux/{adaptative => adaptive}/plumbing/SourceStream.hpp (99%)
rename modules/demux/{adaptative => adaptive}/tools/Conversions.cpp (100%)
rename modules/demux/{adaptative => adaptive}/tools/Conversions.hpp (100%)
rename modules/demux/{adaptative => adaptive}/tools/Debug.hpp (100%)
rename modules/demux/{adaptative => adaptive}/tools/Helper.cpp (98%)
rename modules/demux/{adaptative => adaptive}/tools/Helper.h (98%)
rename modules/demux/{adaptative => adaptive}/tools/Properties.hpp (100%)
rename modules/demux/{adaptative => adaptive}/tools/Retrieve.cpp (95%)
rename modules/demux/{adaptative => adaptive}/tools/Retrieve.hpp (98%)
rename modules/demux/{adaptative => adaptive}/xml/DOMHelper.cpp (98%)
rename modules/demux/{adaptative => adaptive}/xml/DOMHelper.h (98%)
rename modules/demux/{adaptative => adaptive}/xml/DOMParser.cpp (99%)
rename modules/demux/{adaptative => adaptive}/xml/DOMParser.h (99%)
rename modules/demux/{adaptative => adaptive}/xml/Node.cpp (99%)
rename modules/demux/{adaptative => adaptive}/xml/Node.h (99%)
diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index 8083c5996496..55822e1eda96 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -23,7 +23,7 @@ $Id$
* access_realrtsp: Real RTSP access
* access_wasapi: WASAPI audio input
* accesstweaks: access control tweaking module (dev tool)
- * adaptative: Unified adaptative streaming module (DASH/HLS)
+ * adaptive: Unified adaptive streaming module (DASH/HLS)
* addonsfsstorage: Local storage extensions repository
* addonsvorepository: Videolan extensions repository
* adjust: Contrast/Hue/saturation/Brightness adjust module
diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index db63e7cefdda..5bbc732dbb45 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -264,102 +264,102 @@ if HAVE_DVBPSI
demux_LTLIBRARIES += libts_plugin.la
endif
-libadaptative_plugin_la_SOURCES = \
- demux/adaptative/playlist/AbstractPlaylist.cpp \
- demux/adaptative/playlist/AbstractPlaylist.hpp \
- demux/adaptative/playlist/BaseAdaptationSet.cpp \
- demux/adaptative/playlist/BaseAdaptationSet.h \
- demux/adaptative/playlist/BasePeriod.cpp \
- demux/adaptative/playlist/BasePeriod.h \
- demux/adaptative/playlist/BaseRepresentation.cpp \
- demux/adaptative/playlist/BaseRepresentation.h \
- demux/adaptative/playlist/CommonAttributesElements.cpp \
- demux/adaptative/playlist/CommonAttributesElements.h \
- demux/adaptative/playlist/ICanonicalUrl.hpp \
- demux/adaptative/playlist/ID.hpp \
- demux/adaptative/playlist/ID.cpp \
- demux/adaptative/playlist/Inheritables.hpp \
- demux/adaptative/playlist/Inheritables.cpp \
- demux/adaptative/playlist/Segment.cpp \
- demux/adaptative/playlist/Segment.h \
- demux/adaptative/playlist/SegmentBase.cpp \
- demux/adaptative/playlist/SegmentBase.h \
- demux/adaptative/playlist/SegmentChunk.cpp \
- demux/adaptative/playlist/SegmentChunk.hpp \
- demux/adaptative/playlist/SegmentInfoCommon.cpp \
- demux/adaptative/playlist/SegmentInfoCommon.h \
- demux/adaptative/playlist/SegmentList.cpp \
- demux/adaptative/playlist/SegmentList.h \
- demux/adaptative/playlist/SegmentTimeline.cpp \
- demux/adaptative/playlist/SegmentTimeline.h \
- demux/adaptative/playlist/SegmentInformation.cpp \
- demux/adaptative/playlist/SegmentInformation.hpp \
- demux/adaptative/playlist/SegmentTemplate.cpp \
- demux/adaptative/playlist/SegmentTemplate.h \
- demux/adaptative/playlist/Url.cpp \
- demux/adaptative/playlist/Url.hpp \
- demux/adaptative/playlist/Templates.hpp \
- demux/adaptative/logic/AbstractAdaptationLogic.cpp \
- demux/adaptative/logic/AbstractAdaptationLogic.h \
- demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp \
- demux/adaptative/logic/AlwaysBestAdaptationLogic.h \
- demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp \
- demux/adaptative/logic/AlwaysLowestAdaptationLogic.hpp \
- demux/adaptative/logic/IDownloadRateObserver.h \
- demux/adaptative/logic/RateBasedAdaptationLogic.h \
- demux/adaptative/logic/RateBasedAdaptationLogic.cpp \
- demux/adaptative/logic/Representationselectors.hpp \
- demux/adaptative/logic/Representationselectors.cpp \
- demux/adaptative/mp4/AtomsReader.cpp \
- demux/adaptative/mp4/AtomsReader.hpp \
- demux/adaptative/http/BytesRange.cpp \
- demux/adaptative/http/BytesRange.hpp \
- demux/adaptative/http/Chunk.cpp \
- demux/adaptative/http/Chunk.h \
- demux/adaptative/http/Downloader.cpp \
- demux/adaptative/http/Downloader.hpp \
- demux/adaptative/http/HTTPConnection.cpp \
- demux/adaptative/http/HTTPConnection.hpp \
- demux/adaptative/http/HTTPConnectionManager.cpp \
- demux/adaptative/http/HTTPConnectionManager.h \
- demux/adaptative/http/Sockets.hpp \
- demux/adaptative/http/Sockets.cpp \
- demux/adaptative/plumbing/CommandsQueue.cpp \
- demux/adaptative/plumbing/CommandsQueue.hpp \
- demux/adaptative/plumbing/Demuxer.cpp \
- demux/adaptative/plumbing/Demuxer.hpp \
- demux/adaptative/plumbing/FakeESOut.cpp \
- demux/adaptative/plumbing/FakeESOut.hpp \
- demux/adaptative/plumbing/FakeESOutID.cpp \
- demux/adaptative/plumbing/FakeESOutID.hpp \
- demux/adaptative/plumbing/SourceStream.cpp \
- demux/adaptative/plumbing/SourceStream.hpp \
- demux/adaptative/ChunksSource.hpp \
- demux/adaptative/PlaylistManager.cpp \
- demux/adaptative/PlaylistManager.h \
- demux/adaptative/SegmentTracker.cpp \
- demux/adaptative/SegmentTracker.hpp \
- demux/adaptative/StreamFormat.cpp \
- demux/adaptative/StreamFormat.hpp \
- demux/adaptative/Streams.cpp \
- demux/adaptative/Streams.hpp \
- demux/adaptative/Time.hpp \
- demux/adaptative/tools/Conversions.hpp \
- demux/adaptative/tools/Conversions.cpp \
- demux/adaptative/tools/Debug.hpp \
- demux/adaptative/tools/Helper.cpp \
- demux/adaptative/tools/Helper.h \
- demux/adaptative/tools/Properties.hpp \
- demux/adaptative/tools/Retrieve.cpp \
- demux/adaptative/tools/Retrieve.hpp \
- demux/adaptative/xml/DOMHelper.cpp \
- demux/adaptative/xml/DOMHelper.h \
- demux/adaptative/xml/DOMParser.cpp \
- demux/adaptative/xml/DOMParser.h \
- demux/adaptative/xml/Node.cpp \
- demux/adaptative/xml/Node.h
-
-libadaptative_dash_SOURCES = \
+libadaptive_plugin_la_SOURCES = \
+ demux/adaptive/playlist/AbstractPlaylist.cpp \
+ demux/adaptive/playlist/AbstractPlaylist.hpp \
+ demux/adaptive/playlist/BaseAdaptationSet.cpp \
+ demux/adaptive/playlist/BaseAdaptationSet.h \
+ demux/adaptive/playlist/BasePeriod.cpp \
+ demux/adaptive/playlist/BasePeriod.h \
+ demux/adaptive/playlist/BaseRepresentation.cpp \
+ demux/adaptive/playlist/BaseRepresentation.h \
+ demux/adaptive/playlist/CommonAttributesElements.cpp \
+ demux/adaptive/playlist/CommonAttributesElements.h \
+ demux/adaptive/playlist/ICanonicalUrl.hpp \
+ demux/adaptive/playlist/ID.hpp \
+ demux/adaptive/playlist/ID.cpp \
+ demux/adaptive/playlist/Inheritables.hpp \
+ demux/adaptive/playlist/Inheritables.cpp \
+ demux/adaptive/playlist/Segment.cpp \
+ demux/adaptive/playlist/Segment.h \
+ demux/adaptive/playlist/SegmentBase.cpp \
+ demux/adaptive/playlist/SegmentBase.h \
+ demux/adaptive/playlist/SegmentChunk.cpp \
+ demux/adaptive/playlist/SegmentChunk.hpp \
+ demux/adaptive/playlist/SegmentInfoCommon.cpp \
+ demux/adaptive/playlist/SegmentInfoCommon.h \
+ demux/adaptive/playlist/SegmentList.cpp \
+ demux/adaptive/playlist/SegmentList.h \
+ demux/adaptive/playlist/SegmentTimeline.cpp \
+ demux/adaptive/playlist/SegmentTimeline.h \
+ demux/adaptive/playlist/SegmentInformation.cpp \
+ demux/adaptive/playlist/SegmentInformation.hpp \
+ demux/adaptive/playlist/SegmentTemplate.cpp \
+ demux/adaptive/playlist/SegmentTemplate.h \
+ demux/adaptive/playlist/Url.cpp \
+ demux/adaptive/playlist/Url.hpp \
+ demux/adaptive/playlist/Templates.hpp \
+ demux/adaptive/logic/AbstractAdaptationLogic.cpp \
+ demux/adaptive/logic/AbstractAdaptationLogic.h \
+ demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp \
+ demux/adaptive/logic/AlwaysBestAdaptationLogic.h \
+ demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp \
+ demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp \
+ demux/adaptive/logic/IDownloadRateObserver.h \
+ demux/adaptive/logic/RateBasedAdaptationLogic.h \
+ demux/adaptive/logic/RateBasedAdaptationLogic.cpp \
+ demux/adaptive/logic/Representationselectors.hpp \
+ demux/adaptive/logic/Representationselectors.cpp \
+ demux/adaptive/mp4/AtomsReader.cpp \
+ demux/adaptive/mp4/AtomsReader.hpp \
+ demux/adaptive/http/BytesRange.cpp \
+ demux/adaptive/http/BytesRange.hpp \
+ demux/adaptive/http/Chunk.cpp \
+ demux/adaptive/http/Chunk.h \
+ demux/adaptive/http/Downloader.cpp \
+ demux/adaptive/http/Downloader.hpp \
+ demux/adaptive/http/HTTPConnection.cpp \
+ demux/adaptive/http/HTTPConnection.hpp \
+ demux/adaptive/http/HTTPConnectionManager.cpp \
+ demux/adaptive/http/HTTPConnectionManager.h \
+ demux/adaptive/http/Sockets.hpp \
+ demux/adaptive/http/Sockets.cpp \
+ demux/adaptive/plumbing/CommandsQueue.cpp \
+ demux/adaptive/plumbing/CommandsQueue.hpp \
+ demux/adaptive/plumbing/Demuxer.cpp \
+ demux/adaptive/plumbing/Demuxer.hpp \
+ demux/adaptive/plumbing/FakeESOut.cpp \
+ demux/adaptive/plumbing/FakeESOut.hpp \
+ demux/adaptive/plumbing/FakeESOutID.cpp \
+ demux/adaptive/plumbing/FakeESOutID.hpp \
+ demux/adaptive/plumbing/SourceStream.cpp \
+ demux/adaptive/plumbing/SourceStream.hpp \
+ demux/adaptive/ChunksSource.hpp \
+ demux/adaptive/PlaylistManager.cpp \
+ demux/adaptive/PlaylistManager.h \
+ demux/adaptive/SegmentTracker.cpp \
+ demux/adaptive/SegmentTracker.hpp \
+ demux/adaptive/StreamFormat.cpp \
+ demux/adaptive/StreamFormat.hpp \
+ demux/adaptive/Streams.cpp \
+ demux/adaptive/Streams.hpp \
+ demux/adaptive/Time.hpp \
+ demux/adaptive/tools/Conversions.hpp \
+ demux/adaptive/tools/Conversions.cpp \
+ demux/adaptive/tools/Debug.hpp \
+ demux/adaptive/tools/Helper.cpp \
+ demux/adaptive/tools/Helper.h \
+ demux/adaptive/tools/Properties.hpp \
+ demux/adaptive/tools/Retrieve.cpp \
+ demux/adaptive/tools/Retrieve.hpp \
+ demux/adaptive/xml/DOMHelper.cpp \
+ demux/adaptive/xml/DOMHelper.h \
+ demux/adaptive/xml/DOMParser.cpp \
+ demux/adaptive/xml/DOMParser.h \
+ demux/adaptive/xml/Node.cpp \
+ demux/adaptive/xml/Node.h
+
+libadaptive_dash_SOURCES = \
demux/dash/mpd/AdaptationSet.cpp \
demux/dash/mpd/AdaptationSet.h \
demux/dash/mpd/DASHCommonAttributesElements.cpp \
@@ -389,7 +389,7 @@ libadaptative_dash_SOURCES = \
demux/dash/DASHStream.cpp \
demux/dash/DASHStream.hpp
-libadaptative_hls_SOURCES = \
+libadaptive_hls_SOURCES = \
demux/hls/playlist/M3U8.hpp \
demux/hls/playlist/M3U8.cpp \
demux/hls/playlist/Parser.hpp \
@@ -405,7 +405,7 @@ libadaptative_hls_SOURCES = \
demux/hls/HLSStreams.hpp \
demux/hls/HLSStreams.cpp
-libadaptative_smooth_SOURCES = \
+libadaptive_smooth_SOURCES = \
demux/smooth/mp4/IndexReader.cpp \
demux/smooth/mp4/IndexReader.hpp \
demux/smooth/playlist/ForgedInitSegment.hpp \
@@ -424,24 +424,24 @@ libadaptative_smooth_SOURCES = \
demux/smooth/SmoothManager.cpp \
demux/smooth/SmoothStream.hpp \
demux/smooth/SmoothStream.cpp
-libadaptative_smooth_SOURCES += mux/mp4/libmp4mux.c mux/mp4/libmp4mux.h \
+libadaptive_smooth_SOURCES += mux/mp4/libmp4mux.c mux/mp4/libmp4mux.h \
packetizer/h264_nal.c packetizer/h264_nal.h
-libadaptative_plugin_la_SOURCES += $(libadaptative_hls_SOURCES)
-libadaptative_plugin_la_SOURCES += $(libadaptative_dash_SOURCES)
-libadaptative_plugin_la_SOURCES += $(libadaptative_smooth_SOURCES)
-libadaptative_plugin_la_SOURCES += demux/adaptative/adaptative.cpp
-libadaptative_plugin_la_SOURCES += demux/mp4/libmp4.c demux/mp4/libmp4.h
-libadaptative_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir)/demux/adaptative
-libadaptative_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM)
+libadaptive_plugin_la_SOURCES += $(libadaptive_hls_SOURCES)
+libadaptive_plugin_la_SOURCES += $(libadaptive_dash_SOURCES)
+libadaptive_plugin_la_SOURCES += $(libadaptive_smooth_SOURCES)
+libadaptive_plugin_la_SOURCES += demux/adaptive/adaptive.cpp
+libadaptive_plugin_la_SOURCES += demux/mp4/libmp4.c demux/mp4/libmp4.h
+libadaptive_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir)/demux/adaptive
+libadaptive_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM)
if HAVE_ZLIB
-libadaptative_plugin_la_LIBADD += -lz
+libadaptive_plugin_la_LIBADD += -lz
endif
if HAVE_GCRYPT
-libadaptative_plugin_la_CXXFLAGS += $(GCRYPT_CFLAGS)
-libadaptative_plugin_la_LIBADD += $(GCRYPT_LIBS)
+libadaptive_plugin_la_CXXFLAGS += $(GCRYPT_CFLAGS)
+libadaptive_plugin_la_LIBADD += $(GCRYPT_LIBS)
endif
-demux_LTLIBRARIES += libadaptative_plugin.la
+demux_LTLIBRARIES += libadaptive_plugin.la
libttml_plugin_la_SOURCES = demux/ttml.c
demux_LTLIBRARIES += libttml_plugin.la
diff --git a/modules/demux/adaptative/ChunksSource.hpp b/modules/demux/adaptive/ChunksSource.hpp
similarity index 98%
rename from modules/demux/adaptative/ChunksSource.hpp
rename to modules/demux/adaptive/ChunksSource.hpp
index 52ee7fe2ad97..c5796019678b 100644
--- a/modules/demux/adaptative/ChunksSource.hpp
+++ b/modules/demux/adaptive/ChunksSource.hpp
@@ -26,7 +26,7 @@
#include <vlc_common.h>
-namespace adaptative
+namespace adaptive
{
class ChunksSource
{
diff --git a/modules/demux/adaptative/PlaylistManager.cpp b/modules/demux/adaptive/PlaylistManager.cpp
similarity index 97%
rename from modules/demux/adaptative/PlaylistManager.cpp
rename to modules/demux/adaptive/PlaylistManager.cpp
index 52e4467075b8..0011533394c9 100644
--- a/modules/demux/adaptative/PlaylistManager.cpp
+++ b/modules/demux/adaptive/PlaylistManager.cpp
@@ -39,9 +39,9 @@
#include <ctime>
-using namespace adaptative::http;
-using namespace adaptative::logic;
-using namespace adaptative;
+using namespace adaptive::http;
+using namespace adaptive::logic;
+using namespace adaptive;
PlaylistManager::PlaylistManager( demux_t *p_demux_,
AbstractPlaylist *pl,
@@ -444,7 +444,7 @@ AbstractAdaptationLogic *PlaylistManager::createLogic(AbstractAdaptationLogic::L
{
case AbstractAdaptationLogic::FixedRate:
{
- size_t bps = var_InheritInteger(p_demux, "adaptative-bw") * 8192;
+ size_t bps = var_InheritInteger(p_demux, "adaptive-bw") * 8192;
return new (std::nothrow) FixedRateAdaptationLogic(bps);
}
case AbstractAdaptationLogic::AlwaysLowest:
@@ -454,8 +454,8 @@ AbstractAdaptationLogic *PlaylistManager::createLogic(AbstractAdaptationLogic::L
case AbstractAdaptationLogic::Default:
case AbstractAdaptationLogic::RateBased:
{
- int width = var_InheritInteger(p_demux, "adaptative-width");
- int height = var_InheritInteger(p_demux, "adaptative-height");
+ int width = var_InheritInteger(p_demux, "adaptive-width");
+ int height = var_InheritInteger(p_demux, "adaptive-height");
RateBasedAdaptationLogic *logic =
new (std::nothrow) RateBasedAdaptationLogic(VLC_OBJECT(p_demux), width, height);
conn->setDownloadRateObserver(logic);
diff --git a/modules/demux/adaptative/PlaylistManager.h b/modules/demux/adaptive/PlaylistManager.h
similarity index 99%
rename from modules/demux/adaptative/PlaylistManager.h
rename to modules/demux/adaptive/PlaylistManager.h
index a6fbf293d626..d2ddd4cd162f 100644
--- a/modules/demux/adaptative/PlaylistManager.h
+++ b/modules/demux/adaptive/PlaylistManager.h
@@ -26,7 +26,7 @@
#include "Streams.hpp"
#include <vector>
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/SegmentTracker.cpp b/modules/demux/adaptive/SegmentTracker.cpp
similarity index 98%
rename from modules/demux/adaptative/SegmentTracker.cpp
rename to modules/demux/adaptive/SegmentTracker.cpp
index a36eaf7fa5fa..48214ec72477 100644
--- a/modules/demux/adaptative/SegmentTracker.cpp
+++ b/modules/demux/adaptive/SegmentTracker.cpp
@@ -25,9 +25,9 @@
#include "playlist/SegmentChunk.hpp"
#include "logic/AbstractAdaptationLogic.h"
-using namespace adaptative;
-using namespace adaptative::logic;
-using namespace adaptative::playlist;
+using namespace adaptive;
+using namespace adaptive::logic;
+using namespace adaptive::playlist;
SegmentTrackerEvent::SegmentTrackerEvent(SegmentChunk *s)
{
diff --git a/modules/demux/adaptative/SegmentTracker.hpp b/modules/demux/adaptive/SegmentTracker.hpp
similarity index 99%
rename from modules/demux/adaptative/SegmentTracker.hpp
rename to modules/demux/adaptive/SegmentTracker.hpp
index b80a642d0a67..3a668fee5d1b 100644
--- a/modules/demux/adaptative/SegmentTracker.hpp
+++ b/modules/demux/adaptive/SegmentTracker.hpp
@@ -29,7 +29,7 @@
#include <vlc_common.h>
#include <list>
-namespace adaptative
+namespace adaptive
{
namespace http
{
diff --git a/modules/demux/adaptative/StreamFormat.cpp b/modules/demux/adaptive/StreamFormat.cpp
similarity index 98%
rename from modules/demux/adaptative/StreamFormat.cpp
rename to modules/demux/adaptive/StreamFormat.cpp
index 362696967c94..889167bb28ad 100644
--- a/modules/demux/adaptative/StreamFormat.cpp
+++ b/modules/demux/adaptive/StreamFormat.cpp
@@ -19,7 +19,7 @@
*****************************************************************************/
#include "StreamFormat.hpp"
-using namespace adaptative;
+using namespace adaptive;
StreamFormat::operator unsigned() const
{
diff --git a/modules/demux/adaptative/StreamFormat.hpp b/modules/demux/adaptive/StreamFormat.hpp
similarity index 98%
rename from modules/demux/adaptative/StreamFormat.hpp
rename to modules/demux/adaptive/StreamFormat.hpp
index e729f3ef06a8..b4a978feab06 100644
--- a/modules/demux/adaptative/StreamFormat.hpp
+++ b/modules/demux/adaptive/StreamFormat.hpp
@@ -22,7 +22,7 @@
#include <string>
-namespace adaptative
+namespace adaptive
{
class StreamFormat
diff --git a/modules/demux/adaptative/Streams.cpp b/modules/demux/adaptive/Streams.cpp
similarity index 99%
rename from modules/demux/adaptative/Streams.cpp
rename to modules/demux/adaptive/Streams.cpp
index 31bfe6f2833c..a32bbe005c50 100644
--- a/modules/demux/adaptative/Streams.cpp
+++ b/modules/demux/adaptive/Streams.cpp
@@ -27,8 +27,8 @@
#include "tools/Debug.hpp"
#include <vlc_demux.h>
-using namespace adaptative;
-using namespace adaptative::http;
+using namespace adaptive;
+using namespace adaptive::http;
AbstractStream::AbstractStream(demux_t * demux_, const StreamFormat &format_)
{
diff --git a/modules/demux/adaptative/Streams.hpp b/modules/demux/adaptive/Streams.hpp
similarity index 99%
rename from modules/demux/adaptative/Streams.hpp
rename to modules/demux/adaptive/Streams.hpp
index 8155c39523f4..5a64118bb429 100644
--- a/modules/demux/adaptative/Streams.hpp
+++ b/modules/demux/adaptive/Streams.hpp
@@ -35,7 +35,7 @@
#include <string>
-namespace adaptative
+namespace adaptive
{
class SegmentTracker;
diff --git a/modules/demux/adaptative/Time.hpp b/modules/demux/adaptive/Time.hpp
similarity index 100%
rename from modules/demux/adaptative/Time.hpp
rename to modules/demux/adaptive/Time.hpp
diff --git a/modules/demux/adaptative/adaptative.cpp b/modules/demux/adaptive/adaptive.cpp
similarity index 92%
rename from modules/demux/adaptative/adaptative.cpp
rename to modules/demux/adaptive/adaptive.cpp
index ea860b168637..8ac22cb6d19d 100644
--- a/modules/demux/adaptative/adaptative.cpp
+++ b/modules/demux/adaptive/adaptive.cpp
@@ -1,5 +1,5 @@
/*****************************************************************************
- * adaptative.cpp: Adaptative streaming module
+ * adaptive.cpp: Adaptative streaming module
*****************************************************************************
* Copyright © 2015 - VideoLAN and VLC Authors
*
@@ -47,9 +47,9 @@
#include "../smooth/SmoothStream.hpp"
#include "../smooth/playlist/Parser.hpp"
-using namespace adaptative::logic;
-using namespace adaptative::playlist;
-using namespace adaptative::xml;
+using namespace adaptive::logic;
+using namespace adaptive::playlist;
+using namespace adaptive::xml;
using namespace dash::mpd;
using namespace dash;
using namespace hls;
@@ -68,7 +68,7 @@ static void Close (vlc_object_t *);
#define ADAPT_HEIGHT_TEXT N_("Preferred Height")
#define ADAPT_BW_TEXT N_("Fixed Bandwidth in KiB/s")
-#define ADAPT_BW_LONGTEXT N_("Preferred bandwidth for non adaptative streams")
+#define ADAPT_BW_LONGTEXT N_("Preferred bandwidth for non adaptive streams")
#define ADAPT_LOGIC_TEXT N_("Adaptation Logic")
@@ -84,16 +84,16 @@ static const char *const ppsz_logics[] = { N_("Bandwidth Adaptive"),
vlc_module_begin ()
set_shortname( N_("Adaptative"))
- set_description( N_("Unified adaptative streaming for DASH/HLS") )
+ set_description( N_("Unified adaptive streaming for DASH/HLS") )
set_capability( "demux", 12 )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX )
- add_integer( "adaptative-logic", AbstractAdaptationLogic::Default,
+ add_integer( "adaptive-logic", AbstractAdaptationLogic::Default,
ADAPT_LOGIC_TEXT, NULL, false )
change_integer_list( pi_logics, ppsz_logics )
- add_integer( "adaptative-width", 480, ADAPT_WIDTH_TEXT, ADAPT_WIDTH_TEXT, true )
- add_integer( "adaptative-height", 360, ADAPT_HEIGHT_TEXT, ADAPT_HEIGHT_TEXT, true )
- add_integer( "adaptative-bw", 250, ADAPT_BW_TEXT, ADAPT_BW_LONGTEXT, false )
+ add_integer( "adaptive-width", 480, ADAPT_WIDTH_TEXT, ADAPT_WIDTH_TEXT, true )
+ add_integer( "adaptive-height", 360, ADAPT_HEIGHT_TEXT, ADAPT_HEIGHT_TEXT, true )
+ add_integer( "adaptive-bw", 250, ADAPT_BW_TEXT, ADAPT_BW_LONGTEXT, false )
set_callbacks( Open, Close )
vlc_module_end ()
@@ -123,7 +123,7 @@ static int Open(vlc_object_t *p_obj)
PlaylistManager *p_manager = NULL;
AbstractAdaptationLogic::LogicType logic =
- static_cast<AbstractAdaptationLogic::LogicType>(var_InheritInteger(p_obj, "adaptative-logic"));
+ static_cast<AbstractAdaptationLogic::LogicType>(var_InheritInteger(p_obj, "adaptive-logic"));
std::string playlisturl(p_demux->psz_access);
playlisturl.append("://");
diff --git a/modules/demux/adaptative/http/BytesRange.cpp b/modules/demux/adaptive/http/BytesRange.cpp
similarity index 97%
rename from modules/demux/adaptative/http/BytesRange.cpp
rename to modules/demux/adaptive/http/BytesRange.cpp
index 13cc7cde50ef..58c198fed22f 100644
--- a/modules/demux/adaptative/http/BytesRange.cpp
+++ b/modules/demux/adaptive/http/BytesRange.cpp
@@ -19,7 +19,7 @@
*****************************************************************************/
#include "BytesRange.hpp"
-using namespace adaptative::http;
+using namespace adaptive::http;
BytesRange::BytesRange()
{
diff --git a/modules/demux/adaptative/http/BytesRange.hpp b/modules/demux/adaptive/http/BytesRange.hpp
similarity index 98%
rename from modules/demux/adaptative/http/BytesRange.hpp
rename to modules/demux/adaptive/http/BytesRange.hpp
index b4b58fccbf52..4e7a8f433f2d 100644
--- a/modules/demux/adaptative/http/BytesRange.hpp
+++ b/modules/demux/adaptive/http/BytesRange.hpp
@@ -26,7 +26,7 @@
#include <vlc_common.h>
-namespace adaptative
+namespace adaptive
{
namespace http
{
diff --git a/modules/demux/adaptative/http/Chunk.cpp b/modules/demux/adaptive/http/Chunk.cpp
similarity index 99%
rename from modules/demux/adaptative/http/Chunk.cpp
rename to modules/demux/adaptive/http/Chunk.cpp
index e1a2280d5869..cd5dcf1d7f0b 100644
--- a/modules/demux/adaptative/http/Chunk.cpp
+++ b/modules/demux/adaptive/http/Chunk.cpp
@@ -36,7 +36,7 @@
#include <algorithm>
-using namespace adaptative::http;
+using namespace adaptive::http;
AbstractChunkSource::AbstractChunkSource()
{
diff --git a/modules/demux/adaptative/http/Chunk.h b/modules/demux/adaptive/http/Chunk.h
similarity index 99%
rename from modules/demux/adaptative/http/Chunk.h
rename to modules/demux/adaptive/http/Chunk.h
index 0e632b76d0a7..63c6d340212b 100644
--- a/modules/demux/adaptative/http/Chunk.h
+++ b/modules/demux/adaptive/http/Chunk.h
@@ -32,7 +32,7 @@
typedef struct block_t block_t;
-namespace adaptative
+namespace adaptive
{
namespace http
{
diff --git a/modules/demux/adaptative/http/Downloader.cpp b/modules/demux/adaptive/http/Downloader.cpp
similarity index 98%
rename from modules/demux/adaptative/http/Downloader.cpp
rename to modules/demux/adaptive/http/Downloader.cpp
index 97fc43a17a2b..ec6e0a30ab53 100644
--- a/modules/demux/adaptative/http/Downloader.cpp
+++ b/modules/demux/adaptive/http/Downloader.cpp
@@ -22,7 +22,7 @@
#include <vlc_threads.h>
#include <vlc_atomic.h>
-using namespace adaptative::http;
+using namespace adaptive::http;
Downloader::Downloader()
{
diff --git a/modules/demux/adaptative/http/Downloader.hpp b/modules/demux/adaptive/http/Downloader.hpp
similarity index 98%
rename from modules/demux/adaptative/http/Downloader.hpp
rename to modules/demux/adaptive/http/Downloader.hpp
index 2555a70ab36d..ec9fe8dd1d87 100644
--- a/modules/demux/adaptative/http/Downloader.hpp
+++ b/modules/demux/adaptive/http/Downloader.hpp
@@ -29,7 +29,7 @@
#include <vlc_common.h>
#include <list>
-namespace adaptative
+namespace adaptive
{
namespace http
diff --git a/modules/demux/adaptative/http/HTTPConnection.cpp b/modules/demux/adaptive/http/HTTPConnection.cpp
similarity index 98%
rename from modules/demux/adaptative/http/HTTPConnection.cpp
rename to modules/demux/adaptive/http/HTTPConnection.cpp
index dd148ead849a..9ffb79caf56c 100644
--- a/modules/demux/adaptative/http/HTTPConnection.cpp
+++ b/modules/demux/adaptive/http/HTTPConnection.cpp
@@ -20,11 +20,11 @@
#include "HTTPConnection.hpp"
#include "Sockets.hpp"
-#include "../adaptative/tools/Helper.h"
+#include "../adaptive/tools/Helper.h"
#include <sstream>
-using namespace adaptative::http;
+using namespace adaptive::http;
HTTPConnection::HTTPConnection(vlc_object_t *stream_, Socket *socket_, bool persistent)
{
diff --git a/modules/demux/adaptative/http/HTTPConnection.hpp b/modules/demux/adaptive/http/HTTPConnection.hpp
similarity index 99%
rename from modules/demux/adaptative/http/HTTPConnection.hpp
rename to modules/demux/adaptive/http/HTTPConnection.hpp
index ffb561e3b8d6..5364b079f40a 100644
--- a/modules/demux/adaptative/http/HTTPConnection.hpp
+++ b/modules/demux/adaptive/http/HTTPConnection.hpp
@@ -33,7 +33,7 @@
#include <vlc_common.h>
#include <string>
-namespace adaptative
+namespace adaptive
{
namespace http
{
diff --git a/modules/demux/adaptative/http/HTTPConnectionManager.cpp b/modules/demux/adaptive/http/HTTPConnectionManager.cpp
similarity index 99%
rename from modules/demux/adaptative/http/HTTPConnectionManager.cpp
rename to modules/demux/adaptive/http/HTTPConnectionManager.cpp
index e828e1e79683..4ab978683f6b 100644
--- a/modules/demux/adaptative/http/HTTPConnectionManager.cpp
+++ b/modules/demux/adaptive/http/HTTPConnectionManager.cpp
@@ -31,7 +31,7 @@
#include "Downloader.hpp"
#include <vlc_url.h>
-using namespace adaptative::http;
+using namespace adaptive::http;
HTTPConnectionManager::HTTPConnectionManager (vlc_object_t *stream) :
stream (stream),
diff --git a/modules/demux/adaptative/http/HTTPConnectionManager.h b/modules/demux/adaptive/http/HTTPConnectionManager.h
similarity index 99%
rename from modules/demux/adaptative/http/HTTPConnectionManager.h
rename to modules/demux/adaptive/http/HTTPConnectionManager.h
index af6044ed2a6c..877cd76f55bf 100644
--- a/modules/demux/adaptative/http/HTTPConnectionManager.h
+++ b/modules/demux/adaptive/http/HTTPConnectionManager.h
@@ -35,7 +35,7 @@
#include <vector>
#include <string>
-namespace adaptative
+namespace adaptive
{
namespace http
{
diff --git a/modules/demux/adaptative/http/Sockets.cpp b/modules/demux/adaptive/http/Sockets.cpp
similarity index 99%
rename from modules/demux/adaptative/http/Sockets.cpp
rename to modules/demux/adaptive/http/Sockets.cpp
index f98cd1b5ad6f..753c3545b9e9 100644
--- a/modules/demux/adaptative/http/Sockets.cpp
+++ b/modules/demux/adaptive/http/Sockets.cpp
@@ -22,7 +22,7 @@
#include <vlc_network.h>
#include <cerrno>
-using namespace adaptative::http;
+using namespace adaptive::http;
Socket::Socket()
{
diff --git a/modules/demux/adaptative/http/Sockets.hpp b/modules/demux/adaptive/http/Sockets.hpp
similarity index 99%
rename from modules/demux/adaptative/http/Sockets.hpp
rename to modules/demux/adaptive/http/Sockets.hpp
index 09608d7ad84c..c5187bfa9105 100644
--- a/modules/demux/adaptative/http/Sockets.hpp
+++ b/modules/demux/adaptive/http/Sockets.hpp
@@ -28,7 +28,7 @@
#include <vlc_tls.h>
#include <string>
-namespace adaptative
+namespace adaptive
{
namespace http
{
diff --git a/modules/demux/adaptative/logic/AbstractAdaptationLogic.cpp b/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp
similarity index 97%
rename from modules/demux/adaptative/logic/AbstractAdaptationLogic.cpp
rename to modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp
index 0e1e2e7c673a..3197f091e7d4 100644
--- a/modules/demux/adaptative/logic/AbstractAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp
@@ -27,7 +27,7 @@
#include "AbstractAdaptationLogic.h"
-using namespace adaptative::logic;
+using namespace adaptive::logic;
AbstractAdaptationLogic::AbstractAdaptationLogic ()
{
diff --git a/modules/demux/adaptative/logic/AbstractAdaptationLogic.h b/modules/demux/adaptive/logic/AbstractAdaptationLogic.h
similarity index 99%
rename from modules/demux/adaptative/logic/AbstractAdaptationLogic.h
rename to modules/demux/adaptive/logic/AbstractAdaptationLogic.h
index a456a3da5143..526e3bb8545e 100644
--- a/modules/demux/adaptative/logic/AbstractAdaptationLogic.h
+++ b/modules/demux/adaptive/logic/AbstractAdaptationLogic.h
@@ -28,7 +28,7 @@
#include "IDownloadRateObserver.h"
#include "../SegmentTracker.hpp"
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
similarity index 95%
rename from modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp
rename to modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
index bc43a4df94f0..0ba222b236d7 100644
--- a/modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
@@ -28,8 +28,8 @@
#include "AlwaysBestAdaptationLogic.h"
#include "Representationselectors.hpp"
-using namespace adaptative::logic;
-using namespace adaptative::playlist;
+using namespace adaptive::logic;
+using namespace adaptive::playlist;
AlwaysBestAdaptationLogic::AlwaysBestAdaptationLogic () :
AbstractAdaptationLogic ()
diff --git a/modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.h b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h
similarity index 98%
rename from modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.h
rename to modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h
index 4495946a3a75..9de0ab2686b4 100644
--- a/modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.h
+++ b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h
@@ -27,7 +27,7 @@
#include "AbstractAdaptationLogic.h"
-namespace adaptative
+namespace adaptive
{
namespace logic
{
diff --git a/modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp
similarity index 94%
rename from modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp
rename to modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp
index 38bb8216ddb9..ed20cf071ae0 100644
--- a/modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp
@@ -20,8 +20,8 @@
#include "AlwaysLowestAdaptationLogic.hpp"
#include "Representationselectors.hpp"
-using namespace adaptative::logic;
-using namespace adaptative::playlist;
+using namespace adaptive::logic;
+using namespace adaptive::playlist;
AlwaysLowestAdaptationLogic::AlwaysLowestAdaptationLogic():
AbstractAdaptationLogic()
diff --git a/modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.hpp b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp
similarity index 98%
rename from modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.hpp
rename to modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp
index 4876d2dda958..f972f02b958e 100644
--- a/modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.hpp
+++ b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp
@@ -22,7 +22,7 @@
#include "AbstractAdaptationLogic.h"
-namespace adaptative
+namespace adaptive
{
namespace logic
{
diff --git a/modules/demux/adaptative/logic/IDownloadRateObserver.h b/modules/demux/adaptive/logic/IDownloadRateObserver.h
similarity index 98%
rename from modules/demux/adaptative/logic/IDownloadRateObserver.h
rename to modules/demux/adaptive/logic/IDownloadRateObserver.h
index d5434ce7c4b3..622c89509c13 100644
--- a/modules/demux/adaptative/logic/IDownloadRateObserver.h
+++ b/modules/demux/adaptive/logic/IDownloadRateObserver.h
@@ -31,7 +31,7 @@
#include <vlc_common.h>
-namespace adaptative
+namespace adaptive
{
class IDownloadRateObserver
{
diff --git a/modules/demux/adaptative/logic/RateBasedAdaptationLogic.cpp b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
similarity index 98%
rename from modules/demux/adaptative/logic/RateBasedAdaptationLogic.cpp
rename to modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
index a8940bdbfc83..8645fd71f322 100644
--- a/modules/demux/adaptative/logic/RateBasedAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
@@ -33,8 +33,8 @@
#include "../http/Chunk.h"
#include "../tools/Debug.hpp"
-using namespace adaptative::logic;
-using namespace adaptative;
+using namespace adaptive::logic;
+using namespace adaptive;
RateBasedAdaptationLogic::RateBasedAdaptationLogic (vlc_object_t *p_obj_, int w, int h) :
AbstractAdaptationLogic (),
diff --git a/modules/demux/adaptative/logic/RateBasedAdaptationLogic.h b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
similarity index 99%
rename from modules/demux/adaptative/logic/RateBasedAdaptationLogic.h
rename to modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
index e2d8eb68526b..8cd233253457 100644
--- a/modules/demux/adaptative/logic/RateBasedAdaptationLogic.h
+++ b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
@@ -27,7 +27,7 @@
#include "AbstractAdaptationLogic.h"
-namespace adaptative
+namespace adaptive
{
namespace logic
{
diff --git a/modules/demux/adaptative/logic/Representationselectors.cpp b/modules/demux/adaptive/logic/Representationselectors.cpp
similarity index 99%
rename from modules/demux/adaptative/logic/Representationselectors.cpp
rename to modules/demux/adaptive/logic/Representationselectors.cpp
index e260447025ca..2730733798b9 100644
--- a/modules/demux/adaptative/logic/Representationselectors.cpp
+++ b/modules/demux/adaptive/logic/Representationselectors.cpp
@@ -23,7 +23,7 @@
#include "../playlist/BasePeriod.h"
#include <limits>
-using namespace adaptative::logic;
+using namespace adaptive::logic;
RepresentationSelector::RepresentationSelector()
{
diff --git a/modules/demux/adaptative/logic/Representationselectors.hpp b/modules/demux/adaptive/logic/Representationselectors.hpp
similarity index 98%
rename from modules/demux/adaptative/logic/Representationselectors.hpp
rename to modules/demux/adaptive/logic/Representationselectors.hpp
index b39aa9be950d..ce850324aa38 100644
--- a/modules/demux/adaptative/logic/Representationselectors.hpp
+++ b/modules/demux/adaptive/logic/Representationselectors.hpp
@@ -27,7 +27,7 @@
#include <vector>
#include <vlc_common.h>
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/mp4/AtomsReader.cpp b/modules/demux/adaptive/mp4/AtomsReader.cpp
similarity index 98%
rename from modules/demux/adaptative/mp4/AtomsReader.cpp
rename to modules/demux/adaptive/mp4/AtomsReader.cpp
index fe84e16ee551..e7d9678d410d 100644
--- a/modules/demux/adaptative/mp4/AtomsReader.cpp
+++ b/modules/demux/adaptive/mp4/AtomsReader.cpp
@@ -20,7 +20,7 @@
#include "AtomsReader.hpp"
#include <new>
-using namespace adaptative::mp4;
+using namespace adaptive::mp4;
AtomsReader::AtomsReader(vlc_object_t *object_)
{
diff --git a/modules/demux/adaptative/mp4/AtomsReader.hpp b/modules/demux/adaptive/mp4/AtomsReader.hpp
similarity index 98%
rename from modules/demux/adaptative/mp4/AtomsReader.hpp
rename to modules/demux/adaptive/mp4/AtomsReader.hpp
index 376e58ab6ef6..57692e26ac35 100644
--- a/modules/demux/adaptative/mp4/AtomsReader.hpp
+++ b/modules/demux/adaptive/mp4/AtomsReader.hpp
@@ -30,7 +30,7 @@ extern "C" {
#include "../../demux/mp4/libmp4.h"
}
-namespace adaptative
+namespace adaptive
{
namespace mp4
{
diff --git a/modules/demux/adaptative/playlist/AbstractPlaylist.cpp b/modules/demux/adaptive/playlist/AbstractPlaylist.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/AbstractPlaylist.cpp
rename to modules/demux/adaptive/playlist/AbstractPlaylist.cpp
index 45e136fe94dd..36d20bc46411 100644
--- a/modules/demux/adaptative/playlist/AbstractPlaylist.cpp
+++ b/modules/demux/adaptive/playlist/AbstractPlaylist.cpp
@@ -29,7 +29,7 @@
#include <vlc_common.h>
#include <vlc_stream.h>
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
AbstractPlaylist::AbstractPlaylist (stream_t *stream_) :
ICanonicalUrl(),
diff --git a/modules/demux/adaptative/playlist/AbstractPlaylist.hpp b/modules/demux/adaptive/playlist/AbstractPlaylist.hpp
similarity index 99%
rename from modules/demux/adaptative/playlist/AbstractPlaylist.hpp
rename to modules/demux/adaptive/playlist/AbstractPlaylist.hpp
index 9e0babc0f76f..07abef4c6612 100644
--- a/modules/demux/adaptative/playlist/AbstractPlaylist.hpp
+++ b/modules/demux/adaptive/playlist/AbstractPlaylist.hpp
@@ -27,7 +27,7 @@
#include "ICanonicalUrl.hpp"
#include "../tools/Properties.hpp"
-namespace adaptative
+namespace adaptive
{
namespace playlist
diff --git a/modules/demux/adaptative/playlist/BaseAdaptationSet.cpp b/modules/demux/adaptive/playlist/BaseAdaptationSet.cpp
similarity index 97%
rename from modules/demux/adaptative/playlist/BaseAdaptationSet.cpp
rename to modules/demux/adaptive/playlist/BaseAdaptationSet.cpp
index 3471e15bd40d..7f7a984d2cb6 100644
--- a/modules/demux/adaptative/playlist/BaseAdaptationSet.cpp
+++ b/modules/demux/adaptive/playlist/BaseAdaptationSet.cpp
@@ -36,8 +36,8 @@
#include "BasePeriod.h"
#include "Inheritables.hpp"
-using namespace adaptative;
-using namespace adaptative::playlist;
+using namespace adaptive;
+using namespace adaptive::playlist;
BaseAdaptationSet::BaseAdaptationSet(BasePeriod *period) :
CommonAttributesElements(),
diff --git a/modules/demux/adaptative/playlist/BaseAdaptationSet.h b/modules/demux/adaptive/playlist/BaseAdaptationSet.h
similarity index 99%
rename from modules/demux/adaptative/playlist/BaseAdaptationSet.h
rename to modules/demux/adaptive/playlist/BaseAdaptationSet.h
index f26133740524..fac1bdc6012e 100644
--- a/modules/demux/adaptative/playlist/BaseAdaptationSet.h
+++ b/modules/demux/adaptive/playlist/BaseAdaptationSet.h
@@ -32,7 +32,7 @@
#include "SegmentInformation.hpp"
#include "../StreamFormat.hpp"
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/playlist/BasePeriod.cpp b/modules/demux/adaptive/playlist/BasePeriod.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/BasePeriod.cpp
rename to modules/demux/adaptive/playlist/BasePeriod.cpp
index 33f11a2c3647..434bb4ab2d85 100644
--- a/modules/demux/adaptative/playlist/BasePeriod.cpp
+++ b/modules/demux/adaptive/playlist/BasePeriod.cpp
@@ -33,7 +33,7 @@
#include <vlc_common.h>
#include <vlc_arrays.h>
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
BasePeriod::BasePeriod(AbstractPlaylist *playlist_) :
SegmentInformation( playlist_ )
diff --git a/modules/demux/adaptative/playlist/BasePeriod.h b/modules/demux/adaptive/playlist/BasePeriod.h
similarity index 99%
rename from modules/demux/adaptative/playlist/BasePeriod.h
rename to modules/demux/adaptive/playlist/BasePeriod.h
index b5acf8e8c865..6fe64f047c5e 100644
--- a/modules/demux/adaptative/playlist/BasePeriod.h
+++ b/modules/demux/adaptive/playlist/BasePeriod.h
@@ -30,7 +30,7 @@
#include "SegmentInformation.hpp"
#include "../tools/Properties.hpp"
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/playlist/BaseRepresentation.cpp b/modules/demux/adaptive/playlist/BaseRepresentation.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/BaseRepresentation.cpp
rename to modules/demux/adaptive/playlist/BaseRepresentation.cpp
index 130e64796609..9823377fbc6c 100644
--- a/modules/demux/adaptative/playlist/BaseRepresentation.cpp
+++ b/modules/demux/adaptive/playlist/BaseRepresentation.cpp
@@ -33,8 +33,8 @@
#include "SegmentTimeline.h"
#include "ID.hpp"
-using namespace adaptative;
-using namespace adaptative::playlist;
+using namespace adaptive;
+using namespace adaptive::playlist;
BaseRepresentation::BaseRepresentation( BaseAdaptationSet *set ) :
SegmentInformation( set ),
diff --git a/modules/demux/adaptative/playlist/BaseRepresentation.h b/modules/demux/adaptive/playlist/BaseRepresentation.h
similarity index 99%
rename from modules/demux/adaptative/playlist/BaseRepresentation.h
rename to modules/demux/adaptive/playlist/BaseRepresentation.h
index 578fd3d25934..49a34a530c1b 100644
--- a/modules/demux/adaptative/playlist/BaseRepresentation.h
+++ b/modules/demux/adaptive/playlist/BaseRepresentation.h
@@ -32,7 +32,7 @@
#include "SegmentInformation.hpp"
#include "../StreamFormat.hpp"
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/playlist/CommonAttributesElements.cpp b/modules/demux/adaptive/playlist/CommonAttributesElements.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/CommonAttributesElements.cpp
rename to modules/demux/adaptive/playlist/CommonAttributesElements.cpp
index ccac5aaff245..4fbfa6e1c7cd 100644
--- a/modules/demux/adaptative/playlist/CommonAttributesElements.cpp
+++ b/modules/demux/adaptive/playlist/CommonAttributesElements.cpp
@@ -30,7 +30,7 @@
#include <vlc_common.h>
#include <vlc_arrays.h>
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
CommonAttributesElements::CommonAttributesElements() :
width( -1 ),
diff --git a/modules/demux/adaptative/playlist/CommonAttributesElements.h b/modules/demux/adaptive/playlist/CommonAttributesElements.h
similarity index 99%
rename from modules/demux/adaptative/playlist/CommonAttributesElements.h
rename to modules/demux/adaptive/playlist/CommonAttributesElements.h
index a20893615b78..8ff1576b75ee 100644
--- a/modules/demux/adaptative/playlist/CommonAttributesElements.h
+++ b/modules/demux/adaptive/playlist/CommonAttributesElements.h
@@ -27,7 +27,7 @@
#include <list>
#include <string>
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/playlist/ICanonicalUrl.hpp b/modules/demux/adaptive/playlist/ICanonicalUrl.hpp
similarity index 98%
rename from modules/demux/adaptative/playlist/ICanonicalUrl.hpp
rename to modules/demux/adaptive/playlist/ICanonicalUrl.hpp
index b751248fe918..a5f301b5c13d 100644
--- a/modules/demux/adaptative/playlist/ICanonicalUrl.hpp
+++ b/modules/demux/adaptive/playlist/ICanonicalUrl.hpp
@@ -22,7 +22,7 @@
#include "Url.hpp"
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/playlist/ID.cpp b/modules/demux/adaptive/playlist/ID.cpp
similarity index 97%
rename from modules/demux/adaptative/playlist/ID.cpp
rename to modules/demux/adaptive/playlist/ID.cpp
index a475a40b2a19..fae4d7d2ee65 100644
--- a/modules/demux/adaptative/playlist/ID.cpp
+++ b/modules/demux/adaptive/playlist/ID.cpp
@@ -20,7 +20,7 @@
#include "ID.hpp"
#include <sstream>
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
ID::ID(const std::string &id_)
{
diff --git a/modules/demux/adaptative/playlist/ID.hpp b/modules/demux/adaptive/playlist/ID.hpp
similarity index 98%
rename from modules/demux/adaptative/playlist/ID.hpp
rename to modules/demux/adaptive/playlist/ID.hpp
index bead7abcad97..a6729569608a 100644
--- a/modules/demux/adaptative/playlist/ID.hpp
+++ b/modules/demux/adaptive/playlist/ID.hpp
@@ -23,7 +23,7 @@
#include <string>
#include <inttypes.h>
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/playlist/Inheritables.cpp b/modules/demux/adaptive/playlist/Inheritables.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/Inheritables.cpp
rename to modules/demux/adaptive/playlist/Inheritables.cpp
index f497f6804b3c..4f3ca3b522ee 100644
--- a/modules/demux/adaptative/playlist/Inheritables.cpp
+++ b/modules/demux/adaptive/playlist/Inheritables.cpp
@@ -25,7 +25,7 @@
#include "Inheritables.hpp"
#include "SegmentTimeline.h"
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
Timelineable::Timelineable()
{
diff --git a/modules/demux/adaptative/playlist/Inheritables.hpp b/modules/demux/adaptive/playlist/Inheritables.hpp
similarity index 99%
rename from modules/demux/adaptative/playlist/Inheritables.hpp
rename to modules/demux/adaptive/playlist/Inheritables.hpp
index 63da71656e47..98da97c4d884 100644
--- a/modules/demux/adaptative/playlist/Inheritables.hpp
+++ b/modules/demux/adaptive/playlist/Inheritables.hpp
@@ -25,7 +25,7 @@
#include <stdint.h>
#include "ID.hpp"
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/playlist/Segment.cpp b/modules/demux/adaptive/playlist/Segment.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/Segment.cpp
rename to modules/demux/adaptive/playlist/Segment.cpp
index d196d2be023a..d30a92a52787 100644
--- a/modules/demux/adaptative/playlist/Segment.cpp
+++ b/modules/demux/adaptive/playlist/Segment.cpp
@@ -35,8 +35,8 @@
#include "../http/Downloader.hpp"
#include <cassert>
-using namespace adaptative::http;
-using namespace adaptative::playlist;
+using namespace adaptive::http;
+using namespace adaptive::playlist;
const int ISegment::SEQUENCE_INVALID = 0;
const int ISegment::SEQUENCE_FIRST = 1;
diff --git a/modules/demux/adaptative/playlist/Segment.h b/modules/demux/adaptive/playlist/Segment.h
similarity index 99%
rename from modules/demux/adaptative/playlist/Segment.h
rename to modules/demux/adaptive/playlist/Segment.h
index 84b0fee070c6..7e28578450e1 100644
--- a/modules/demux/adaptative/playlist/Segment.h
+++ b/modules/demux/adaptive/playlist/Segment.h
@@ -33,7 +33,7 @@
#include "../tools/Properties.hpp"
#include "Time.hpp"
-namespace adaptative
+namespace adaptive
{
namespace http
{
diff --git a/modules/demux/adaptative/playlist/SegmentBase.cpp b/modules/demux/adaptive/playlist/SegmentBase.cpp
similarity index 97%
rename from modules/demux/adaptative/playlist/SegmentBase.cpp
rename to modules/demux/adaptive/playlist/SegmentBase.cpp
index 573751c8778f..0ddac8bef667 100644
--- a/modules/demux/adaptative/playlist/SegmentBase.cpp
+++ b/modules/demux/adaptive/playlist/SegmentBase.cpp
@@ -24,7 +24,7 @@
#include "SegmentBase.h"
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
SegmentBase::SegmentBase(ICanonicalUrl *parent) :
Segment(parent),
diff --git a/modules/demux/adaptative/playlist/SegmentBase.h b/modules/demux/adaptive/playlist/SegmentBase.h
similarity index 98%
rename from modules/demux/adaptative/playlist/SegmentBase.h
rename to modules/demux/adaptive/playlist/SegmentBase.h
index f9c55ad3abf9..3144e2cff15c 100644
--- a/modules/demux/adaptative/playlist/SegmentBase.h
+++ b/modules/demux/adaptive/playlist/SegmentBase.h
@@ -29,7 +29,7 @@
#include "SegmentInfoCommon.h"
#include "../tools/Properties.hpp"
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/playlist/SegmentChunk.cpp b/modules/demux/adaptive/playlist/SegmentChunk.cpp
similarity index 96%
rename from modules/demux/adaptative/playlist/SegmentChunk.cpp
rename to modules/demux/adaptive/playlist/SegmentChunk.cpp
index 031a31a904a9..c07939ae424e 100644
--- a/modules/demux/adaptative/playlist/SegmentChunk.cpp
+++ b/modules/demux/adaptive/playlist/SegmentChunk.cpp
@@ -22,8 +22,8 @@
#include "BaseRepresentation.h"
#include <cassert>
-using namespace adaptative::playlist;
-using namespace adaptative;
+using namespace adaptive::playlist;
+using namespace adaptive;
SegmentChunk::SegmentChunk(ISegment *segment_, AbstractChunkSource *source) :
AbstractChunk(source)
diff --git a/modules/demux/adaptative/playlist/SegmentChunk.hpp b/modules/demux/adaptive/playlist/SegmentChunk.hpp
similarity index 98%
rename from modules/demux/adaptative/playlist/SegmentChunk.hpp
rename to modules/demux/adaptive/playlist/SegmentChunk.hpp
index 3711bc059f12..81afb138a7c4 100644
--- a/modules/demux/adaptative/playlist/SegmentChunk.hpp
+++ b/modules/demux/adaptive/playlist/SegmentChunk.hpp
@@ -25,7 +25,7 @@
#include "../http/Chunk.h"
#include "../StreamFormat.hpp"
-namespace adaptative
+namespace adaptive
{
namespace playlist
diff --git a/modules/demux/adaptative/playlist/SegmentInfoCommon.cpp b/modules/demux/adaptive/playlist/SegmentInfoCommon.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/SegmentInfoCommon.cpp
rename to modules/demux/adaptive/playlist/SegmentInfoCommon.cpp
index 8e91b8816220..74b9124a4bda 100644
--- a/modules/demux/adaptative/playlist/SegmentInfoCommon.cpp
+++ b/modules/demux/adaptive/playlist/SegmentInfoCommon.cpp
@@ -28,7 +28,7 @@
#include "SegmentInfoCommon.h"
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
SegmentInfoCommon::SegmentInfoCommon( ICanonicalUrl *parent ) :
ICanonicalUrl( parent ), Initializable(), Indexable(),
diff --git a/modules/demux/adaptative/playlist/SegmentInfoCommon.h b/modules/demux/adaptive/playlist/SegmentInfoCommon.h
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentInfoCommon.h
rename to modules/demux/adaptive/playlist/SegmentInfoCommon.h
index e813a253b8dd..47a499f77f6f 100644
--- a/modules/demux/adaptative/playlist/SegmentInfoCommon.h
+++ b/modules/demux/adaptive/playlist/SegmentInfoCommon.h
@@ -33,7 +33,7 @@
#include "ICanonicalUrl.hpp"
#include "../tools/Properties.hpp"
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/playlist/SegmentInformation.cpp b/modules/demux/adaptive/playlist/SegmentInformation.cpp
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentInformation.cpp
rename to modules/demux/adaptive/playlist/SegmentInformation.cpp
index a07d3a07b212..212b64772f2c 100644
--- a/modules/demux/adaptative/playlist/SegmentInformation.cpp
+++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp
@@ -30,7 +30,7 @@
#include <algorithm>
#include <cassert>
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
SegmentInformation::SegmentInformation(SegmentInformation *parent_) :
ICanonicalUrl( parent_ ),
diff --git a/modules/demux/adaptative/playlist/SegmentInformation.hpp b/modules/demux/adaptive/playlist/SegmentInformation.hpp
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentInformation.hpp
rename to modules/demux/adaptive/playlist/SegmentInformation.hpp
index 38eddc35ae39..7c9e9ce01297 100644
--- a/modules/demux/adaptative/playlist/SegmentInformation.hpp
+++ b/modules/demux/adaptive/playlist/SegmentInformation.hpp
@@ -30,7 +30,7 @@
#include <vlc_common.h>
#include <vector>
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/playlist/SegmentList.cpp b/modules/demux/adaptive/playlist/SegmentList.cpp
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentList.cpp
rename to modules/demux/adaptive/playlist/SegmentList.cpp
index 99c967071833..4a4d8b360010 100644
--- a/modules/demux/adaptative/playlist/SegmentList.cpp
+++ b/modules/demux/adaptive/playlist/SegmentList.cpp
@@ -26,7 +26,7 @@
#include "Segment.h"
#include "SegmentInformation.hpp"
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
SegmentList::SegmentList( SegmentInformation *parent ):
SegmentInfoCommon( parent ), TimescaleAble( parent )
diff --git a/modules/demux/adaptative/playlist/SegmentList.h b/modules/demux/adaptive/playlist/SegmentList.h
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentList.h
rename to modules/demux/adaptive/playlist/SegmentList.h
index 97d0f16c23dc..bb1cc76cd248 100644
--- a/modules/demux/adaptative/playlist/SegmentList.h
+++ b/modules/demux/adaptive/playlist/SegmentList.h
@@ -31,7 +31,7 @@
#include "SegmentInfoCommon.h"
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/playlist/SegmentTemplate.cpp b/modules/demux/adaptive/playlist/SegmentTemplate.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/SegmentTemplate.cpp
rename to modules/demux/adaptive/playlist/SegmentTemplate.cpp
index e3e5f9da16b1..0521fa4ae82d 100644
--- a/modules/demux/adaptative/playlist/SegmentTemplate.cpp
+++ b/modules/demux/adaptive/playlist/SegmentTemplate.cpp
@@ -28,7 +28,7 @@
#include "SegmentTimeline.h"
#include "SegmentInformation.hpp"
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
BaseSegmentTemplate::BaseSegmentTemplate( ICanonicalUrl *parent ) :
Segment( parent )
diff --git a/modules/demux/adaptative/playlist/SegmentTemplate.h b/modules/demux/adaptive/playlist/SegmentTemplate.h
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentTemplate.h
rename to modules/demux/adaptive/playlist/SegmentTemplate.h
index 27d351429951..e1958a966828 100644
--- a/modules/demux/adaptative/playlist/SegmentTemplate.h
+++ b/modules/demux/adaptive/playlist/SegmentTemplate.h
@@ -28,7 +28,7 @@
#include "../tools/Properties.hpp"
#include "SegmentInfoCommon.h"
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/playlist/SegmentTimeline.cpp b/modules/demux/adaptive/playlist/SegmentTimeline.cpp
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentTimeline.cpp
rename to modules/demux/adaptive/playlist/SegmentTimeline.cpp
index f249a56f3696..aec6367ba540 100644
--- a/modules/demux/adaptative/playlist/SegmentTimeline.cpp
+++ b/modules/demux/adaptive/playlist/SegmentTimeline.cpp
@@ -25,7 +25,7 @@
#include <algorithm>
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
SegmentTimeline::SegmentTimeline(TimescaleAble *parent)
:TimescaleAble(parent)
diff --git a/modules/demux/adaptative/playlist/SegmentTimeline.h b/modules/demux/adaptive/playlist/SegmentTimeline.h
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentTimeline.h
rename to modules/demux/adaptive/playlist/SegmentTimeline.h
index 46aa171bb554..cc06216e88de 100644
--- a/modules/demux/adaptative/playlist/SegmentTimeline.h
+++ b/modules/demux/adaptive/playlist/SegmentTimeline.h
@@ -32,7 +32,7 @@
#include <vlc_common.h>
#include <list>
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/playlist/Templates.hpp b/modules/demux/adaptive/playlist/Templates.hpp
similarity index 98%
rename from modules/demux/adaptative/playlist/Templates.hpp
rename to modules/demux/adaptive/playlist/Templates.hpp
index c5c4ddf83f8c..249fccafd646 100644
--- a/modules/demux/adaptative/playlist/Templates.hpp
+++ b/modules/demux/adaptive/playlist/Templates.hpp
@@ -20,7 +20,7 @@
#ifndef TEMPLATES_HPP
#define TEMPLATES_HPP
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/playlist/Url.cpp b/modules/demux/adaptive/playlist/Url.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/Url.cpp
rename to modules/demux/adaptive/playlist/Url.cpp
index 78e603719549..8efedf2b130a 100644
--- a/modules/demux/adaptative/playlist/Url.cpp
+++ b/modules/demux/adaptive/playlist/Url.cpp
@@ -21,7 +21,7 @@
#include "BaseRepresentation.h"
#include "SegmentTemplate.h"
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
Url::Url()
{
diff --git a/modules/demux/adaptative/playlist/Url.hpp b/modules/demux/adaptive/playlist/Url.hpp
similarity index 99%
rename from modules/demux/adaptative/playlist/Url.hpp
rename to modules/demux/adaptive/playlist/Url.hpp
index b238b7ec3f54..00d9fff6d15a 100644
--- a/modules/demux/adaptative/playlist/Url.hpp
+++ b/modules/demux/adaptive/playlist/Url.hpp
@@ -28,7 +28,7 @@
#include <vector>
#include <vlc_common.h>
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
diff --git a/modules/demux/adaptative/plumbing/CommandsQueue.cpp b/modules/demux/adaptive/plumbing/CommandsQueue.cpp
similarity index 98%
rename from modules/demux/adaptative/plumbing/CommandsQueue.cpp
rename to modules/demux/adaptive/plumbing/CommandsQueue.cpp
index 8324bc5afa91..8aff7c563524 100644
--- a/modules/demux/adaptative/plumbing/CommandsQueue.cpp
+++ b/modules/demux/adaptive/plumbing/CommandsQueue.cpp
@@ -24,7 +24,7 @@
#include <vlc_block.h>
#include <algorithm>
-using namespace adaptative;
+using namespace adaptive;
enum
{
@@ -112,7 +112,7 @@ EsOutAddCommand::~EsOutAddCommand()
void EsOutAddCommand::Execute( es_out_t * )
{
- /* Create the real ES on the adaptative demux */
+ /* Create the real ES on the adaptive demux */
p_fakeid->create();
}
diff --git a/modules/demux/adaptative/plumbing/CommandsQueue.hpp b/modules/demux/adaptive/plumbing/CommandsQueue.hpp
similarity index 99%
rename from modules/demux/adaptative/plumbing/CommandsQueue.hpp
rename to modules/demux/adaptive/plumbing/CommandsQueue.hpp
index d28592e613e0..e4e9eee30775 100644
--- a/modules/demux/adaptative/plumbing/CommandsQueue.hpp
+++ b/modules/demux/adaptive/plumbing/CommandsQueue.hpp
@@ -30,7 +30,7 @@
#include <list>
-namespace adaptative
+namespace adaptive
{
class FakeESOut;
class FakeESOutID;
diff --git a/modules/demux/adaptative/plumbing/Demuxer.cpp b/modules/demux/adaptive/plumbing/Demuxer.cpp
similarity index 99%
rename from modules/demux/adaptative/plumbing/Demuxer.cpp
rename to modules/demux/adaptive/plumbing/Demuxer.cpp
index 9d9807512514..d60f726555f0 100644
--- a/modules/demux/adaptative/plumbing/Demuxer.cpp
+++ b/modules/demux/adaptive/plumbing/Demuxer.cpp
@@ -25,7 +25,7 @@
#include "CommandsQueue.hpp"
#include "../ChunksSource.hpp"
-using namespace adaptative;
+using namespace adaptive;
AbstractDemuxer::AbstractDemuxer()
{
diff --git a/modules/demux/adaptative/plumbing/Demuxer.hpp b/modules/demux/adaptive/plumbing/Demuxer.hpp
similarity index 99%
rename from modules/demux/adaptative/plumbing/Demuxer.hpp
rename to modules/demux/adaptive/plumbing/Demuxer.hpp
index e45798773c18..d33bee00444d 100644
--- a/modules/demux/adaptative/plumbing/Demuxer.hpp
+++ b/modules/demux/adaptive/plumbing/Demuxer.hpp
@@ -27,7 +27,7 @@
#include <vlc_common.h>
#include <string>
-namespace adaptative
+namespace adaptive
{
class CommandsQueue;
class AbstractSourceStream;
diff --git a/modules/demux/adaptative/plumbing/FakeESOut.cpp b/modules/demux/adaptive/plumbing/FakeESOut.cpp
similarity index 99%
rename from modules/demux/adaptative/plumbing/FakeESOut.cpp
rename to modules/demux/adaptive/plumbing/FakeESOut.cpp
index bd465071625f..71589800a5b5 100644
--- a/modules/demux/adaptative/plumbing/FakeESOut.cpp
+++ b/modules/demux/adaptive/plumbing/FakeESOut.cpp
@@ -23,7 +23,7 @@
#include <vlc_block.h>
#include <cassert>
-using namespace adaptative;
+using namespace adaptive;
FakeESOut::FakeESOut( es_out_t *es, CommandsFactory *factory )
{
@@ -72,7 +72,7 @@ FakeESOutID * FakeESOut::createNewID( const es_format_t *p_fmt )
es_format_t fmtcopy;
es_format_Init( &fmtcopy, 0, 0 );
es_format_Copy( &fmtcopy, p_fmt );
- fmtcopy.i_group = 0; /* Always ignore group for adaptative */
+ fmtcopy.i_group = 0; /* Always ignore group for adaptive */
if( extrainfo )
extrainfo->fillExtraFMTInfo( &fmtcopy );
diff --git a/modules/demux/adaptative/plumbing/FakeESOut.hpp b/modules/demux/adaptive/plumbing/FakeESOut.hpp
similarity index 99%
rename from modules/demux/adaptative/plumbing/FakeESOut.hpp
rename to modules/demux/adaptive/plumbing/FakeESOut.hpp
index 9e0c259c30d8..d352cdee7b7f 100644
--- a/modules/demux/adaptative/plumbing/FakeESOut.hpp
+++ b/modules/demux/adaptive/plumbing/FakeESOut.hpp
@@ -27,7 +27,7 @@
#include "CommandsQueue.hpp"
#include <vlc_atomic.h>
-namespace adaptative
+namespace adaptive
{
class ExtraFMTInfoInterface
{
diff --git a/modules/demux/adaptative/plumbing/FakeESOutID.cpp b/modules/demux/adaptive/plumbing/FakeESOutID.cpp
similarity index 98%
rename from modules/demux/adaptative/plumbing/FakeESOutID.cpp
rename to modules/demux/adaptive/plumbing/FakeESOutID.cpp
index ec2313ec2e97..2088eafed14a 100644
--- a/modules/demux/adaptative/plumbing/FakeESOutID.cpp
+++ b/modules/demux/adaptive/plumbing/FakeESOutID.cpp
@@ -20,7 +20,7 @@
#include "FakeESOutID.hpp"
#include "FakeESOut.hpp"
-using namespace adaptative;
+using namespace adaptive;
FakeESOutID::FakeESOutID( FakeESOut *fakeesout_, const es_format_t *p_fmt )
{
diff --git a/modules/demux/adaptative/plumbing/FakeESOutID.hpp b/modules/demux/adaptive/plumbing/FakeESOutID.hpp
similarity index 98%
rename from modules/demux/adaptative/plumbing/FakeESOutID.hpp
rename to modules/demux/adaptive/plumbing/FakeESOutID.hpp
index b8f4b9e9e5c2..dc1477b25dd8 100644
--- a/modules/demux/adaptative/plumbing/FakeESOutID.hpp
+++ b/modules/demux/adaptive/plumbing/FakeESOutID.hpp
@@ -27,7 +27,7 @@
#include <vlc_common.h>
#include <vlc_es.h>
-namespace adaptative
+namespace adaptive
{
class FakeESOut;
diff --git a/modules/demux/adaptative/plumbing/SourceStream.cpp b/modules/demux/adaptive/plumbing/SourceStream.cpp
similarity index 99%
rename from modules/demux/adaptative/plumbing/SourceStream.cpp
rename to modules/demux/adaptive/plumbing/SourceStream.cpp
index 70e32374de13..8bc1f9e8212e 100644
--- a/modules/demux/adaptative/plumbing/SourceStream.cpp
+++ b/modules/demux/adaptive/plumbing/SourceStream.cpp
@@ -24,7 +24,7 @@
#include <vlc_stream.h>
#include <vlc_demux.h>
-using namespace adaptative;
+using namespace adaptive;
ChunksSourceStream::ChunksSourceStream(vlc_object_t *p_obj, ChunksSource *source_)
{
diff --git a/modules/demux/adaptative/plumbing/SourceStream.hpp b/modules/demux/adaptive/plumbing/SourceStream.hpp
similarity index 99%
rename from modules/demux/adaptative/plumbing/SourceStream.hpp
rename to modules/demux/adaptive/plumbing/SourceStream.hpp
index 275c605c8ee3..beeb95abaa6c 100644
--- a/modules/demux/adaptative/plumbing/SourceStream.hpp
+++ b/modules/demux/adaptive/plumbing/SourceStream.hpp
@@ -27,7 +27,7 @@
#include <vlc_common.h>
#include <vlc_block.h>
-namespace adaptative
+namespace adaptive
{
class ChunksSource;
diff --git a/modules/demux/adaptative/tools/Conversions.cpp b/modules/demux/adaptive/tools/Conversions.cpp
similarity index 100%
rename from modules/demux/adaptative/tools/Conversions.cpp
rename to modules/demux/adaptive/tools/Conversions.cpp
diff --git a/modules/demux/adaptative/tools/Conversions.hpp b/modules/demux/adaptive/tools/Conversions.hpp
similarity index 100%
rename from modules/demux/adaptative/tools/Conversions.hpp
rename to modules/demux/adaptive/tools/Conversions.hpp
diff --git a/modules/demux/adaptative/tools/Debug.hpp b/modules/demux/adaptive/tools/Debug.hpp
similarity index 100%
rename from modules/demux/adaptative/tools/Debug.hpp
rename to modules/demux/adaptive/tools/Debug.hpp
diff --git a/modules/demux/adaptative/tools/Helper.cpp b/modules/demux/adaptive/tools/Helper.cpp
similarity index 98%
rename from modules/demux/adaptative/tools/Helper.cpp
rename to modules/demux/adaptive/tools/Helper.cpp
index 435df4cf46d5..be5e1227f75b 100644
--- a/modules/demux/adaptative/tools/Helper.cpp
+++ b/modules/demux/adaptive/tools/Helper.cpp
@@ -27,7 +27,7 @@
#include "Helper.h"
#include <algorithm>
-using namespace adaptative;
+using namespace adaptive;
std::string Helper::combinePaths (const std::string &path1, const std::string &path2)
{
diff --git a/modules/demux/adaptative/tools/Helper.h b/modules/demux/adaptive/tools/Helper.h
similarity index 98%
rename from modules/demux/adaptative/tools/Helper.h
rename to modules/demux/adaptive/tools/Helper.h
index 24a6e927d5f6..8272887ee8c3 100644
--- a/modules/demux/adaptative/tools/Helper.h
+++ b/modules/demux/adaptive/tools/Helper.h
@@ -28,7 +28,7 @@
#include <string>
#include <list>
-namespace adaptative
+namespace adaptive
{
class Helper
{
diff --git a/modules/demux/adaptative/tools/Properties.hpp b/modules/demux/adaptive/tools/Properties.hpp
similarity index 100%
rename from modules/demux/adaptative/tools/Properties.hpp
rename to modules/demux/adaptive/tools/Properties.hpp
diff --git a/modules/demux/adaptative/tools/Retrieve.cpp b/modules/demux/adaptive/tools/Retrieve.cpp
similarity index 95%
rename from modules/demux/adaptative/tools/Retrieve.cpp
rename to modules/demux/adaptive/tools/Retrieve.cpp
index d1cb7bf41bd3..6556948d45da 100644
--- a/modules/demux/adaptative/tools/Retrieve.cpp
+++ b/modules/demux/adaptive/tools/Retrieve.cpp
@@ -23,8 +23,8 @@
#include "../http/HTTPConnection.hpp"
#include "../http/Chunk.h"
-using namespace adaptative;
-using namespace adaptative::http;
+using namespace adaptive;
+using namespace adaptive::http;
block_t * Retrieve::HTTP(vlc_object_t *obj, const std::string &uri)
{
diff --git a/modules/demux/adaptative/tools/Retrieve.hpp b/modules/demux/adaptive/tools/Retrieve.hpp
similarity index 98%
rename from modules/demux/adaptative/tools/Retrieve.hpp
rename to modules/demux/adaptive/tools/Retrieve.hpp
index 26d3e7fa1f8f..b67827d5e87d 100644
--- a/modules/demux/adaptative/tools/Retrieve.hpp
+++ b/modules/demux/adaptive/tools/Retrieve.hpp
@@ -27,7 +27,7 @@
#include <vlc_common.h>
#include <string>
-namespace adaptative
+namespace adaptive
{
class Retrieve
{
diff --git a/modules/demux/adaptative/xml/DOMHelper.cpp b/modules/demux/adaptive/xml/DOMHelper.cpp
similarity index 98%
rename from modules/demux/adaptative/xml/DOMHelper.cpp
rename to modules/demux/adaptive/xml/DOMHelper.cpp
index f993f0790ea5..7b9209930891 100644
--- a/modules/demux/adaptative/xml/DOMHelper.cpp
+++ b/modules/demux/adaptive/xml/DOMHelper.cpp
@@ -27,7 +27,7 @@
#include "DOMHelper.h"
-using namespace adaptative::xml;
+using namespace adaptive::xml;
std::vector<Node *> DOMHelper::getElementByTagName (Node *root, const std::string& name, bool selfContain)
{
diff --git a/modules/demux/adaptative/xml/DOMHelper.h b/modules/demux/adaptive/xml/DOMHelper.h
similarity index 98%
rename from modules/demux/adaptative/xml/DOMHelper.h
rename to modules/demux/adaptive/xml/DOMHelper.h
index 3f2901d48b7c..9c71ded9b7f4 100644
--- a/modules/demux/adaptative/xml/DOMHelper.h
+++ b/modules/demux/adaptive/xml/DOMHelper.h
@@ -30,7 +30,7 @@
#include "Node.h"
-namespace adaptative
+namespace adaptive
{
namespace xml
{
diff --git a/modules/demux/adaptative/xml/DOMParser.cpp b/modules/demux/adaptive/xml/DOMParser.cpp
similarity index 99%
rename from modules/demux/adaptative/xml/DOMParser.cpp
rename to modules/demux/adaptive/xml/DOMParser.cpp
index 51a45e49becf..9534c6774acf 100644
--- a/modules/demux/adaptative/xml/DOMParser.cpp
+++ b/modules/demux/adaptive/xml/DOMParser.cpp
@@ -31,7 +31,7 @@
#include <stack>
#include <vlc_xml.h>
-using namespace adaptative::xml;
+using namespace adaptive::xml;
DOMParser::DOMParser() :
root( NULL ),
diff --git a/modules/demux/adaptative/xml/DOMParser.h b/modules/demux/adaptive/xml/DOMParser.h
similarity index 99%
rename from modules/demux/adaptative/xml/DOMParser.h
rename to modules/demux/adaptive/xml/DOMParser.h
index 49d96dafff38..31e3a3f5f22b 100644
--- a/modules/demux/adaptative/xml/DOMParser.h
+++ b/modules/demux/adaptive/xml/DOMParser.h
@@ -34,7 +34,7 @@
#include "Node.h"
-namespace adaptative
+namespace adaptive
{
namespace xml
{
diff --git a/modules/demux/adaptative/xml/Node.cpp b/modules/demux/adaptive/xml/Node.cpp
similarity index 99%
rename from modules/demux/adaptative/xml/Node.cpp
rename to modules/demux/adaptive/xml/Node.cpp
index 12b8c2823a19..1d9cf0e58577 100644
--- a/modules/demux/adaptative/xml/Node.cpp
+++ b/modules/demux/adaptive/xml/Node.cpp
@@ -31,7 +31,7 @@
#include <vlc_common.h>
#include <vlc_xml.h>
-using namespace adaptative::xml;
+using namespace adaptive::xml;
const std::string Node::EmptyString = "";
diff --git a/modules/demux/adaptative/xml/Node.h b/modules/demux/adaptive/xml/Node.h
similarity index 99%
rename from modules/demux/adaptative/xml/Node.h
rename to modules/demux/adaptive/xml/Node.h
index b938850c7f3f..d40b8875d8a1 100644
--- a/modules/demux/adaptative/xml/Node.h
+++ b/modules/demux/adaptive/xml/Node.h
@@ -29,7 +29,7 @@
#include <string>
#include <map>
-namespace adaptative
+namespace adaptive
{
namespace xml
{
diff --git a/modules/demux/dash/DASHManager.cpp b/modules/demux/dash/DASHManager.cpp
index d9ea3bfa7703..4c1a7e453b69 100644
--- a/modules/demux/dash/DASHManager.cpp
+++ b/modules/demux/dash/DASHManager.cpp
@@ -33,20 +33,20 @@
#include "mpd/IsoffMainParser.h"
#include "xml/DOMParser.h"
#include "xml/Node.h"
-#include "../adaptative/tools/Helper.h"
-#include "../adaptative/http/HTTPConnectionManager.h"
+#include "../adaptive/tools/Helper.h"
+#include "../adaptive/http/HTTPConnectionManager.h"
#include <vlc_stream.h>
#include <vlc_demux.h>
#include <vlc_meta.h>
#include <vlc_block.h>
-#include "../adaptative/tools/Retrieve.hpp"
+#include "../adaptive/tools/Retrieve.hpp"
#include <algorithm>
#include <ctime>
using namespace dash;
using namespace dash::mpd;
-using namespace adaptative::logic;
+using namespace adaptive::logic;
DASHManager::DASHManager(demux_t *demux_, MPD *mpd,
AbstractStreamFactory *factory,
@@ -200,7 +200,7 @@ bool DASHManager::isDASH(xml::Node *root)
std::string ns = root->getAttributeValue("xmlns");
for( size_t i=0; i<ARRAY_SIZE(namespaces); i++ )
{
- if ( adaptative::Helper::ifind(ns, namespaces[i]) )
+ if ( adaptive::Helper::ifind(ns, namespaces[i]) )
return true;
}
return false;
diff --git a/modules/demux/dash/DASHManager.h b/modules/demux/dash/DASHManager.h
index fbed43810e57..8aa5bf5e82bf 100644
--- a/modules/demux/dash/DASHManager.h
+++ b/modules/demux/dash/DASHManager.h
@@ -25,11 +25,11 @@
#ifndef DASHMANAGER_H_
#define DASHMANAGER_H_
-#include "../adaptative/PlaylistManager.h"
-#include "../adaptative/logic/AbstractAdaptationLogic.h"
+#include "../adaptive/PlaylistManager.h"
+#include "../adaptive/logic/AbstractAdaptationLogic.h"
#include "mpd/MPD.h"
-namespace adaptative
+namespace adaptive
{
namespace xml
{
@@ -39,7 +39,7 @@ namespace adaptative
namespace dash
{
- using namespace adaptative;
+ using namespace adaptive;
class DASHManager : public PlaylistManager
{
diff --git a/modules/demux/dash/DASHStream.hpp b/modules/demux/dash/DASHStream.hpp
index 16c7d203883d..876c83e840d3 100644
--- a/modules/demux/dash/DASHStream.hpp
+++ b/modules/demux/dash/DASHStream.hpp
@@ -24,11 +24,11 @@
# include "config.h"
#endif
-#include "../adaptative/Streams.hpp"
+#include "../adaptive/Streams.hpp"
namespace dash
{
- using namespace adaptative;
+ using namespace adaptive;
class DASHStream : public AbstractStream
{
diff --git a/modules/demux/dash/mp4/IndexReader.cpp b/modules/demux/dash/mp4/IndexReader.cpp
index e691d9ccca3f..7d8c62b1725c 100644
--- a/modules/demux/dash/mp4/IndexReader.cpp
+++ b/modules/demux/dash/mp4/IndexReader.cpp
@@ -21,7 +21,7 @@
#include "../mpd/Representation.h"
#include "../mpd/MPD.h"
-using namespace adaptative::mp4;
+using namespace adaptive::mp4;
using namespace dash::mp4;
using namespace dash::mpd;
diff --git a/modules/demux/dash/mp4/IndexReader.hpp b/modules/demux/dash/mp4/IndexReader.hpp
index 217805743ef7..dcaf12a1f0b0 100644
--- a/modules/demux/dash/mp4/IndexReader.hpp
+++ b/modules/demux/dash/mp4/IndexReader.hpp
@@ -20,9 +20,9 @@
#ifndef INDEXREADER_HPP
#define INDEXREADER_HPP
-#include "../adaptative/mp4/AtomsReader.hpp"
+#include "../adaptive/mp4/AtomsReader.hpp"
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
@@ -34,8 +34,8 @@ namespace dash
{
namespace mp4
{
- using namespace adaptative::mp4;
- using namespace adaptative::playlist;
+ using namespace adaptive::mp4;
+ using namespace adaptive::playlist;
class IndexReader : public AtomsReader
{
diff --git a/modules/demux/dash/mpd/AdaptationSet.cpp b/modules/demux/dash/mpd/AdaptationSet.cpp
index 1417d747519f..9e6f8276f8e1 100644
--- a/modules/demux/dash/mpd/AdaptationSet.cpp
+++ b/modules/demux/dash/mpd/AdaptationSet.cpp
@@ -30,7 +30,7 @@
using namespace dash::mpd;
AdaptationSet::AdaptationSet(Period *period) :
- adaptative::playlist::BaseAdaptationSet( period ),
+ adaptive::playlist::BaseAdaptationSet( period ),
DASHCommonAttributesElements(),
subsegmentAlignmentFlag( false )
{
diff --git a/modules/demux/dash/mpd/AdaptationSet.h b/modules/demux/dash/mpd/AdaptationSet.h
index abf056369b30..e48d6f1f0c8e 100644
--- a/modules/demux/dash/mpd/AdaptationSet.h
+++ b/modules/demux/dash/mpd/AdaptationSet.h
@@ -29,7 +29,7 @@
#include <string>
#include <map>
-#include "../adaptative/playlist/BaseAdaptationSet.h"
+#include "../adaptive/playlist/BaseAdaptationSet.h"
#include "DASHCommonAttributesElements.h"
namespace dash
@@ -39,9 +39,9 @@ namespace dash
class Period;
class Representation;
- using namespace adaptative;
+ using namespace adaptive;
- class AdaptationSet : public adaptative::playlist::BaseAdaptationSet,
+ class AdaptationSet : public adaptive::playlist::BaseAdaptationSet,
public DASHCommonAttributesElements
{
public:
diff --git a/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp b/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp
index 0973f049fcf1..62feae01bdc1 100644
--- a/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp
+++ b/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp
@@ -28,13 +28,13 @@
#include "DASHCommonAttributesElements.h"
#include "ContentDescription.h"
-#include "../adaptative/StreamFormat.hpp"
+#include "../adaptive/StreamFormat.hpp"
#include <vlc_common.h>
#include <vlc_arrays.h>
using namespace dash::mpd;
-using namespace adaptative;
+using namespace adaptive;
DASHCommonAttributesElements::DASHCommonAttributesElements() :
parX( 1 ),
diff --git a/modules/demux/dash/mpd/DASHSegment.cpp b/modules/demux/dash/mpd/DASHSegment.cpp
index f96428c10d44..3bdeaf2fb3ec 100644
--- a/modules/demux/dash/mpd/DASHSegment.cpp
+++ b/modules/demux/dash/mpd/DASHSegment.cpp
@@ -27,12 +27,12 @@
#endif
#include "DASHSegment.h"
-#include "../adaptative/playlist/BaseRepresentation.h"
+#include "../adaptive/playlist/BaseRepresentation.h"
#include "../mp4/IndexReader.hpp"
-#include "../adaptative/playlist/AbstractPlaylist.hpp"
-#include "../adaptative/playlist/SegmentChunk.hpp"
+#include "../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../adaptive/playlist/SegmentChunk.hpp"
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
using namespace dash::mpd;
using namespace dash::mp4;
diff --git a/modules/demux/dash/mpd/DASHSegment.h b/modules/demux/dash/mpd/DASHSegment.h
index d5affb0630e6..70a2d21aed78 100644
--- a/modules/demux/dash/mpd/DASHSegment.h
+++ b/modules/demux/dash/mpd/DASHSegment.h
@@ -25,14 +25,14 @@
#ifndef DASHSEGMENT_H_
#define DASHSEGMENT_H_
-#include "../adaptative/playlist/Segment.h"
+#include "../adaptive/playlist/Segment.h"
namespace dash
{
namespace mpd
{
- using namespace adaptative::playlist;
- using namespace adaptative::http;
+ using namespace adaptive::playlist;
+ using namespace adaptive::http;
class DashIndexSegment : public IndexSegment
{
diff --git a/modules/demux/dash/mpd/IsoffMainParser.cpp b/modules/demux/dash/mpd/IsoffMainParser.cpp
index a95fe627aa8d..b8ce90799af0 100644
--- a/modules/demux/dash/mpd/IsoffMainParser.cpp
+++ b/modules/demux/dash/mpd/IsoffMainParser.cpp
@@ -27,28 +27,28 @@
#endif
#include "IsoffMainParser.h"
-#include "../adaptative/playlist/SegmentTemplate.h"
-#include "../adaptative/playlist/Segment.h"
-#include "../adaptative/playlist/SegmentBase.h"
-#include "../adaptative/playlist/SegmentList.h"
-#include "../adaptative/playlist/SegmentTimeline.h"
-#include "../adaptative/playlist/SegmentInformation.hpp"
+#include "../adaptive/playlist/SegmentTemplate.h"
+#include "../adaptive/playlist/Segment.h"
+#include "../adaptive/playlist/SegmentBase.h"
+#include "../adaptive/playlist/SegmentList.h"
+#include "../adaptive/playlist/SegmentTimeline.h"
+#include "../adaptive/playlist/SegmentInformation.hpp"
#include "MPD.h"
#include "Representation.h"
#include "Period.h"
#include "AdaptationSet.h"
#include "ProgramInformation.h"
#include "DASHSegment.h"
-#include "../adaptative/xml/DOMHelper.h"
-#include "../adaptative/tools/Helper.h"
-#include "../adaptative/tools/Debug.hpp"
-#include "../adaptative/tools/Conversions.hpp"
+#include "../adaptive/xml/DOMHelper.h"
+#include "../adaptive/tools/Helper.h"
+#include "../adaptive/tools/Debug.hpp"
+#include "../adaptive/tools/Conversions.hpp"
#include <vlc_stream.h>
#include <cstdio>
using namespace dash::mpd;
-using namespace adaptative::xml;
-using namespace adaptative::playlist;
+using namespace adaptive::xml;
+using namespace adaptive::playlist;
IsoffMainParser::IsoffMainParser (Node *root_, stream_t *stream, const std::string & streambaseurl_)
{
diff --git a/modules/demux/dash/mpd/IsoffMainParser.h b/modules/demux/dash/mpd/IsoffMainParser.h
index 2c3d1c0ff0d5..0cbb1edda5c9 100644
--- a/modules/demux/dash/mpd/IsoffMainParser.h
+++ b/modules/demux/dash/mpd/IsoffMainParser.h
@@ -29,14 +29,14 @@
# include "config.h"
#endif
-#include "../adaptative/playlist/SegmentInfoCommon.h"
+#include "../adaptive/playlist/SegmentInfoCommon.h"
#include "Profile.hpp"
#include <cstdlib>
#include <vlc_common.h>
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
@@ -57,8 +57,8 @@ namespace dash
class AdaptationSet;
class MPD;
- using namespace adaptative::playlist;
- using namespace adaptative;
+ using namespace adaptive::playlist;
+ using namespace adaptive;
class IsoffMainParser
{
diff --git a/modules/demux/dash/mpd/MPD.h b/modules/demux/dash/mpd/MPD.h
index 2d305e4fe821..348101e55c00 100644
--- a/modules/demux/dash/mpd/MPD.h
+++ b/modules/demux/dash/mpd/MPD.h
@@ -25,16 +25,16 @@
#ifndef MPD_H_
#define MPD_H_
-#include "../adaptative/playlist/AbstractPlaylist.hpp"
-#include "../adaptative/StreamFormat.hpp"
+#include "../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../adaptive/StreamFormat.hpp"
#include "Profile.hpp"
namespace dash
{
namespace mpd
{
- using namespace adaptative::playlist;
- using namespace adaptative;
+ using namespace adaptive::playlist;
+ using namespace adaptive;
class ProgramInformation;
diff --git a/modules/demux/dash/mpd/Period.h b/modules/demux/dash/mpd/Period.h
index 27ae34e685d9..585cd2b4ce51 100644
--- a/modules/demux/dash/mpd/Period.h
+++ b/modules/demux/dash/mpd/Period.h
@@ -24,16 +24,16 @@
#ifndef PERIOD_H_
#define PERIOD_H_
-#include "../adaptative/playlist/BasePeriod.h"
-#include "../adaptative/playlist/SegmentInformation.hpp"
+#include "../adaptive/playlist/BasePeriod.h"
+#include "../adaptive/playlist/SegmentInformation.hpp"
namespace dash
{
namespace mpd
{
class MPD;
- using namespace adaptative;
- using namespace adaptative::playlist;
+ using namespace adaptive;
+ using namespace adaptive::playlist;
class Period : public BasePeriod
{
diff --git a/modules/demux/dash/mpd/Representation.cpp b/modules/demux/dash/mpd/Representation.cpp
index ff5f5e5d7947..cffcf0d7f114 100644
--- a/modules/demux/dash/mpd/Representation.cpp
+++ b/modules/demux/dash/mpd/Representation.cpp
@@ -31,8 +31,8 @@
#include "AdaptationSet.h"
#include "MPD.h"
#include "TrickModeType.h"
-#include "../adaptative/playlist/SegmentTemplate.h"
-#include "../adaptative/playlist/SegmentTimeline.h"
+#include "../adaptive/playlist/SegmentTemplate.h"
+#include "../adaptive/playlist/SegmentTimeline.h"
using namespace dash::mpd;
diff --git a/modules/demux/dash/mpd/Representation.h b/modules/demux/dash/mpd/Representation.h
index 43febb83f033..f02cc2cbe0cc 100644
--- a/modules/demux/dash/mpd/Representation.h
+++ b/modules/demux/dash/mpd/Representation.h
@@ -26,8 +26,8 @@
#define DASHREPRESENTATION_H_
#include "DASHCommonAttributesElements.h"
-#include "../adaptative/playlist/SegmentInfoCommon.h"
-#include "../adaptative/playlist/BaseRepresentation.h"
+#include "../adaptive/playlist/SegmentInfoCommon.h"
+#include "../adaptive/playlist/BaseRepresentation.h"
namespace dash
{
@@ -37,8 +37,8 @@ namespace dash
class TrickModeType;
class MPD;
- using namespace adaptative;
- using namespace adaptative::playlist;
+ using namespace adaptive;
+ using namespace adaptive::playlist;
class Representation : public BaseRepresentation,
public DASHCommonAttributesElements
diff --git a/modules/demux/hls/HLSManager.cpp b/modules/demux/hls/HLSManager.cpp
index 3802b46d6d6f..75ffbd9b1e4e 100644
--- a/modules/demux/hls/HLSManager.cpp
+++ b/modules/demux/hls/HLSManager.cpp
@@ -23,15 +23,15 @@
#endif
#include "HLSManager.hpp"
-#include "../adaptative/tools/Retrieve.hpp"
-#include "../adaptative/http/HTTPConnectionManager.h"
+#include "../adaptive/tools/Retrieve.hpp"
+#include "../adaptive/http/HTTPConnectionManager.h"
#include "playlist/Parser.hpp"
#include <vlc_stream.h>
#include <vlc_demux.h>
#include <time.h>
-using namespace adaptative;
-using namespace adaptative::logic;
+using namespace adaptive;
+using namespace adaptive::logic;
using namespace hls;
using namespace hls::playlist;
diff --git a/modules/demux/hls/HLSManager.hpp b/modules/demux/hls/HLSManager.hpp
index cec3dde32c19..43a5c5bd1af7 100644
--- a/modules/demux/hls/HLSManager.hpp
+++ b/modules/demux/hls/HLSManager.hpp
@@ -20,13 +20,13 @@
#ifndef HLSMANAGER_HPP
#define HLSMANAGER_HPP
-#include "../adaptative/PlaylistManager.h"
-#include "../adaptative/logic/AbstractAdaptationLogic.h"
+#include "../adaptive/PlaylistManager.h"
+#include "../adaptive/logic/AbstractAdaptationLogic.h"
#include "playlist/M3U8.hpp"
namespace hls
{
- using namespace adaptative;
+ using namespace adaptive;
class HLSManager : public PlaylistManager
{
diff --git a/modules/demux/hls/HLSStreams.hpp b/modules/demux/hls/HLSStreams.hpp
index 58d94c1259b8..2366d167dca3 100644
--- a/modules/demux/hls/HLSStreams.hpp
+++ b/modules/demux/hls/HLSStreams.hpp
@@ -24,11 +24,11 @@
# include "config.h"
#endif
-#include "../adaptative/Streams.hpp"
+#include "../adaptive/Streams.hpp"
namespace hls
{
- using namespace adaptative;
+ using namespace adaptive;
class HLSStream : public AbstractStream
{
diff --git a/modules/demux/hls/playlist/HLSSegment.cpp b/modules/demux/hls/playlist/HLSSegment.cpp
index a9d4b5dc97f2..c17675c33f6c 100644
--- a/modules/demux/hls/playlist/HLSSegment.cpp
+++ b/modules/demux/hls/playlist/HLSSegment.cpp
@@ -18,8 +18,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "HLSSegment.hpp"
-#include "../adaptative/playlist/SegmentChunk.hpp"
-#include "../adaptative/playlist/BaseRepresentation.h"
+#include "../adaptive/playlist/SegmentChunk.hpp"
+#include "../adaptive/playlist/BaseRepresentation.h"
#include <vlc_common.h>
#include <vlc_block.h>
diff --git a/modules/demux/hls/playlist/HLSSegment.hpp b/modules/demux/hls/playlist/HLSSegment.hpp
index 017b69ce6cf8..a4c62b7673f5 100644
--- a/modules/demux/hls/playlist/HLSSegment.hpp
+++ b/modules/demux/hls/playlist/HLSSegment.hpp
@@ -24,7 +24,7 @@
# include "config.h"
#endif
-#include "../adaptative/playlist/Segment.h"
+#include "../adaptive/playlist/Segment.h"
#include <vector>
#ifdef HAVE_GCRYPT
#include <gcrypt.h>
@@ -34,7 +34,7 @@ namespace hls
{
namespace playlist
{
- using namespace adaptative::playlist;
+ using namespace adaptive::playlist;
class SegmentEncryption
{
diff --git a/modules/demux/hls/playlist/M3U8.cpp b/modules/demux/hls/playlist/M3U8.cpp
index 3fd0755f83de..13910a5eb0d2 100644
--- a/modules/demux/hls/playlist/M3U8.cpp
+++ b/modules/demux/hls/playlist/M3U8.cpp
@@ -23,8 +23,8 @@
#include "M3U8.hpp"
#include "Representation.hpp"
-#include "../adaptative/playlist/BasePeriod.h"
-#include "../adaptative/playlist/BaseAdaptationSet.h"
+#include "../adaptive/playlist/BasePeriod.h"
+#include "../adaptive/playlist/BaseAdaptationSet.h"
#include <vlc_common.h>
#include <vlc_stream.h>
diff --git a/modules/demux/hls/playlist/M3U8.hpp b/modules/demux/hls/playlist/M3U8.hpp
index d3a591eca39c..78661eca469d 100644
--- a/modules/demux/hls/playlist/M3U8.hpp
+++ b/modules/demux/hls/playlist/M3U8.hpp
@@ -21,13 +21,13 @@
#ifndef M3U8_H_
#define M3U8_H_
-#include "../adaptative/playlist/AbstractPlaylist.hpp"
+#include "../adaptive/playlist/AbstractPlaylist.hpp"
namespace hls
{
namespace playlist
{
- using namespace adaptative::playlist;
+ using namespace adaptive::playlist;
class M3U8 : public AbstractPlaylist
{
diff --git a/modules/demux/hls/playlist/Parser.cpp b/modules/demux/hls/playlist/Parser.cpp
index 0249b82a08d4..97e4228bc232 100644
--- a/modules/demux/hls/playlist/Parser.cpp
+++ b/modules/demux/hls/playlist/Parser.cpp
@@ -24,12 +24,12 @@
#include "Parser.hpp"
#include "HLSSegment.hpp"
#include "Representation.hpp"
-#include "../adaptative/playlist/BasePeriod.h"
-#include "../adaptative/playlist/BaseAdaptationSet.h"
-#include "../adaptative/playlist/SegmentList.h"
-#include "../adaptative/tools/Retrieve.hpp"
-#include "../adaptative/tools/Helper.h"
-#include "../adaptative/tools/Conversions.hpp"
+#include "../adaptive/playlist/BasePeriod.h"
+#include "../adaptive/playlist/BaseAdaptationSet.h"
+#include "../adaptive/playlist/SegmentList.h"
+#include "../adaptive/tools/Retrieve.hpp"
+#include "../adaptive/tools/Helper.h"
+#include "../adaptive/tools/Conversions.hpp"
#include "M3U8.hpp"
#include "Tags.hpp"
@@ -41,8 +41,8 @@
#include <cctype>
#include <algorithm>
-using namespace adaptative;
-using namespace adaptative::playlist;
+using namespace adaptive;
+using namespace adaptive::playlist;
using namespace hls::playlist;
M3U8Parser::M3U8Parser()
diff --git a/modules/demux/hls/playlist/Parser.hpp b/modules/demux/hls/playlist/Parser.hpp
index 9b675293a985..e314a04ef7d8 100644
--- a/modules/demux/hls/playlist/Parser.hpp
+++ b/modules/demux/hls/playlist/Parser.hpp
@@ -24,14 +24,14 @@
# include "config.h"
#endif
-#include "../adaptative/playlist/SegmentInfoCommon.h"
+#include "../adaptive/playlist/SegmentInfoCommon.h"
#include <cstdlib>
#include <sstream>
#include <vlc_common.h>
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
@@ -46,7 +46,7 @@ namespace hls
{
namespace playlist
{
- using namespace adaptative::playlist;
+ using namespace adaptive::playlist;
class M3U8;
class AttributesTag;
diff --git a/modules/demux/hls/playlist/Representation.cpp b/modules/demux/hls/playlist/Representation.cpp
index 839e13fae149..1141ec225590 100644
--- a/modules/demux/hls/playlist/Representation.cpp
+++ b/modules/demux/hls/playlist/Representation.cpp
@@ -27,9 +27,9 @@
#include "M3U8.hpp"
#include "Parser.hpp"
#include "HLSSegment.hpp"
-#include "../adaptative/playlist/BasePeriod.h"
-#include "../adaptative/playlist/BaseAdaptationSet.h"
-#include "../adaptative/playlist/SegmentList.h"
+#include "../adaptive/playlist/BasePeriod.h"
+#include "../adaptive/playlist/BaseAdaptationSet.h"
+#include "../adaptive/playlist/SegmentList.h"
#include <ctime>
diff --git a/modules/demux/hls/playlist/Representation.hpp b/modules/demux/hls/playlist/Representation.hpp
index bda9b67286c5..6bdc5f5d65ac 100644
--- a/modules/demux/hls/playlist/Representation.hpp
+++ b/modules/demux/hls/playlist/Representation.hpp
@@ -21,9 +21,9 @@
#ifndef HLSREPRESENTATION_H_
#define HLSREPRESENTATION_H_
-#include "../adaptative/playlist/BaseRepresentation.h"
-#include "../adaptative/tools/Properties.hpp"
-#include "../adaptative/StreamFormat.hpp"
+#include "../adaptive/playlist/BaseRepresentation.h"
+#include "../adaptive/tools/Properties.hpp"
+#include "../adaptive/StreamFormat.hpp"
namespace hls
{
@@ -31,8 +31,8 @@ namespace hls
{
class M3U8;
- using namespace adaptative;
- using namespace adaptative::playlist;
+ using namespace adaptive;
+ using namespace adaptive::playlist;
class Representation : public BaseRepresentation
{
diff --git a/modules/demux/smooth/SmoothManager.cpp b/modules/demux/smooth/SmoothManager.cpp
index 745d2d99565e..c5cada373255 100644
--- a/modules/demux/smooth/SmoothManager.cpp
+++ b/modules/demux/smooth/SmoothManager.cpp
@@ -23,16 +23,16 @@
# include "config.h"
#endif
-#include "../adaptative/tools/Retrieve.hpp"
+#include "../adaptive/tools/Retrieve.hpp"
#include "playlist/Parser.hpp"
-#include "../adaptative/xml/DOMParser.h"
+#include "../adaptive/xml/DOMParser.h"
#include <vlc_stream.h>
#include <vlc_demux.h>
#include <vlc_charset.h>
#include <time.h>
-using namespace adaptative;
-using namespace adaptative::logic;
+using namespace adaptive;
+using namespace adaptive::logic;
using namespace smooth;
using namespace smooth::playlist;
diff --git a/modules/demux/smooth/SmoothManager.hpp b/modules/demux/smooth/SmoothManager.hpp
index 6773ab1b67ce..040df1f717a4 100644
--- a/modules/demux/smooth/SmoothManager.hpp
+++ b/modules/demux/smooth/SmoothManager.hpp
@@ -20,11 +20,11 @@
#ifndef SMOOTHMANAGER_HPP
#define SMOOTHMANAGER_HPP
-#include "../adaptative/PlaylistManager.h"
-#include "../adaptative/logic/AbstractAdaptationLogic.h"
+#include "../adaptive/PlaylistManager.h"
+#include "../adaptive/logic/AbstractAdaptationLogic.h"
#include "playlist/Manifest.hpp"
-namespace adaptative
+namespace adaptive
{
namespace xml
{
@@ -34,7 +34,7 @@ namespace adaptative
namespace smooth
{
- using namespace adaptative;
+ using namespace adaptive;
class SmoothManager : public PlaylistManager
{
diff --git a/modules/demux/smooth/SmoothStream.hpp b/modules/demux/smooth/SmoothStream.hpp
index 93d28144f2e4..5aee3f8c62bb 100644
--- a/modules/demux/smooth/SmoothStream.hpp
+++ b/modules/demux/smooth/SmoothStream.hpp
@@ -24,11 +24,11 @@
# include "config.h"
#endif
-#include "../adaptative/Streams.hpp"
+#include "../adaptive/Streams.hpp"
namespace smooth
{
- using namespace adaptative;
+ using namespace adaptive;
class SmoothStream : public AbstractStream
{
diff --git a/modules/demux/smooth/mp4/IndexReader.cpp b/modules/demux/smooth/mp4/IndexReader.cpp
index e57ab97abec4..7246158c8cf7 100644
--- a/modules/demux/smooth/mp4/IndexReader.cpp
+++ b/modules/demux/smooth/mp4/IndexReader.cpp
@@ -18,13 +18,13 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "IndexReader.hpp"
-#include "../adaptative/playlist/BaseRepresentation.h"
-#include "../adaptative/playlist/BaseAdaptationSet.h"
-#include "../adaptative/playlist/SegmentTemplate.h"
-#include "../adaptative/playlist/SegmentTimeline.h"
-#include "../adaptative/playlist/AbstractPlaylist.hpp"
+#include "../adaptive/playlist/BaseRepresentation.h"
+#include "../adaptive/playlist/BaseAdaptationSet.h"
+#include "../adaptive/playlist/SegmentTemplate.h"
+#include "../adaptive/playlist/SegmentTimeline.h"
+#include "../adaptive/playlist/AbstractPlaylist.hpp"
-using namespace adaptative::mp4;
+using namespace adaptive::mp4;
using namespace smooth::mp4;
IndexReader::IndexReader(vlc_object_t *obj)
diff --git a/modules/demux/smooth/mp4/IndexReader.hpp b/modules/demux/smooth/mp4/IndexReader.hpp
index e7acba298bea..c270ddc9a5df 100644
--- a/modules/demux/smooth/mp4/IndexReader.hpp
+++ b/modules/demux/smooth/mp4/IndexReader.hpp
@@ -20,9 +20,9 @@
#ifndef SMOOTHINDEXREADER_HPP
#define SMOOTHINDEXREADER_HPP
-#include "../adaptative/mp4/AtomsReader.hpp"
+#include "../adaptive/mp4/AtomsReader.hpp"
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
@@ -34,8 +34,8 @@ namespace smooth
{
namespace mp4
{
- using namespace adaptative::mp4;
- using namespace adaptative::playlist;
+ using namespace adaptive::mp4;
+ using namespace adaptive::playlist;
class IndexReader : public AtomsReader
{
diff --git a/modules/demux/smooth/playlist/ForgedInitSegment.cpp b/modules/demux/smooth/playlist/ForgedInitSegment.cpp
index c7de0a42e8c3..34a05a60d281 100644
--- a/modules/demux/smooth/playlist/ForgedInitSegment.cpp
+++ b/modules/demux/smooth/playlist/ForgedInitSegment.cpp
@@ -19,7 +19,7 @@
*****************************************************************************/
#include "ForgedInitSegment.hpp"
#include "MemoryChunk.hpp"
-#include "../adaptative/playlist/SegmentChunk.hpp"
+#include "../adaptive/playlist/SegmentChunk.hpp"
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -35,7 +35,7 @@ extern "C"
#include "../../demux/mp4/libmp4.h" /* majors */
}
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
using namespace smooth::playlist;
using namespace smooth::http;
diff --git a/modules/demux/smooth/playlist/ForgedInitSegment.hpp b/modules/demux/smooth/playlist/ForgedInitSegment.hpp
index 4eb6c51e5cca..933d2a6bd289 100644
--- a/modules/demux/smooth/playlist/ForgedInitSegment.hpp
+++ b/modules/demux/smooth/playlist/ForgedInitSegment.hpp
@@ -20,8 +20,8 @@
#ifndef FORGEDINITSEGMENT_HPP
#define FORGEDINITSEGMENT_HPP
-#include "../adaptative/playlist/Segment.h"
-#include "../adaptative/playlist/Inheritables.hpp"
+#include "../adaptive/playlist/Segment.h"
+#include "../adaptive/playlist/Inheritables.hpp"
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -33,8 +33,8 @@ namespace smooth
{
namespace playlist
{
- using namespace adaptative::playlist;
- using namespace adaptative::http;
+ using namespace adaptive::playlist;
+ using namespace adaptive::http;
class ForgedInitSegment : public InitSegment,
public TimescaleAble
diff --git a/modules/demux/smooth/playlist/Manifest.cpp b/modules/demux/smooth/playlist/Manifest.cpp
index f7e79867afa4..57f4215aeb7c 100644
--- a/modules/demux/smooth/playlist/Manifest.cpp
+++ b/modules/demux/smooth/playlist/Manifest.cpp
@@ -22,7 +22,7 @@
#endif
#include "Manifest.hpp"
-#include "../adaptative/playlist/BasePeriod.h"
+#include "../adaptive/playlist/BasePeriod.h"
#include <vlc_common.h>
#include <vlc_stream.h>
diff --git a/modules/demux/smooth/playlist/Manifest.hpp b/modules/demux/smooth/playlist/Manifest.hpp
index 7af94e71b7b3..fea9e3f619a1 100644
--- a/modules/demux/smooth/playlist/Manifest.hpp
+++ b/modules/demux/smooth/playlist/Manifest.hpp
@@ -20,13 +20,13 @@
#ifndef MANIFEST_HPP
#define MANIFEST_HPP
-#include "../adaptative/playlist/AbstractPlaylist.hpp"
+#include "../adaptive/playlist/AbstractPlaylist.hpp"
namespace smooth
{
namespace playlist
{
- using namespace adaptative::playlist;
+ using namespace adaptive::playlist;
class Manifest : public AbstractPlaylist
{
diff --git a/modules/demux/smooth/playlist/MemoryChunk.hpp b/modules/demux/smooth/playlist/MemoryChunk.hpp
index 2a546110e79a..0bfc9206ba2d 100644
--- a/modules/demux/smooth/playlist/MemoryChunk.hpp
+++ b/modules/demux/smooth/playlist/MemoryChunk.hpp
@@ -20,13 +20,13 @@
#ifndef MEMORYCHUNK_HPP
#define MEMORYCHUNK_HPP
-#include "../adaptative/http/Chunk.h"
+#include "../adaptive/http/Chunk.h"
namespace smooth
{
namespace http
{
- using namespace adaptative::http;
+ using namespace adaptive::http;
class MemoryChunkSource : public AbstractChunkSource
{
diff --git a/modules/demux/smooth/playlist/Parser.cpp b/modules/demux/smooth/playlist/Parser.cpp
index f4881862b77f..fa9988afed0c 100644
--- a/modules/demux/smooth/playlist/Parser.cpp
+++ b/modules/demux/smooth/playlist/Parser.cpp
@@ -23,17 +23,17 @@
#include "Representation.hpp"
#include "ForgedInitSegment.hpp"
#include "SmoothSegment.hpp"
-#include "../adaptative/playlist/BasePeriod.h"
-#include "../adaptative/playlist/BaseAdaptationSet.h"
-#include "../adaptative/playlist/SegmentTimeline.h"
-#include "../adaptative/playlist/SegmentList.h"
-#include "../adaptative/xml/DOMHelper.h"
-#include "../adaptative/xml/Node.h"
-#include "../adaptative/tools/Helper.h"
-#include "../adaptative/tools/Conversions.hpp"
+#include "../adaptive/playlist/BasePeriod.h"
+#include "../adaptive/playlist/BaseAdaptationSet.h"
+#include "../adaptive/playlist/SegmentTimeline.h"
+#include "../adaptive/playlist/SegmentList.h"
+#include "../adaptive/xml/DOMHelper.h"
+#include "../adaptive/xml/Node.h"
+#include "../adaptive/tools/Helper.h"
+#include "../adaptive/tools/Conversions.hpp"
using namespace smooth::playlist;
-using namespace adaptative::xml;
+using namespace adaptive::xml;
ManifestParser::ManifestParser(Node *root_, stream_t *stream, const std::string & streambaseurl_)
{
diff --git a/modules/demux/smooth/playlist/Parser.hpp b/modules/demux/smooth/playlist/Parser.hpp
index 9a48d5b0c828..390a1be1f3b4 100644
--- a/modules/demux/smooth/playlist/Parser.hpp
+++ b/modules/demux/smooth/playlist/Parser.hpp
@@ -24,14 +24,14 @@
# include "config.h"
#endif
-#include "../adaptative/playlist/SegmentInfoCommon.h"
+#include "../adaptive/playlist/SegmentInfoCommon.h"
#include <cstdlib>
#include <sstream>
#include <vlc_common.h>
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
@@ -50,8 +50,8 @@ namespace smooth
{
namespace playlist
{
- using namespace adaptative::playlist;
- using namespace adaptative;
+ using namespace adaptive::playlist;
+ using namespace adaptive;
class Manifest;
diff --git a/modules/demux/smooth/playlist/Representation.cpp b/modules/demux/smooth/playlist/Representation.cpp
index 3d87a2d1b35d..c2645250cea6 100644
--- a/modules/demux/smooth/playlist/Representation.cpp
+++ b/modules/demux/smooth/playlist/Representation.cpp
@@ -19,9 +19,9 @@
*****************************************************************************/
#include "Representation.hpp"
#include "Manifest.hpp"
-#include "../adaptative/playlist/SegmentTemplate.h"
-#include "../adaptative/playlist/SegmentTimeline.h"
-#include "../adaptative/playlist/BaseAdaptationSet.h"
+#include "../adaptive/playlist/SegmentTemplate.h"
+#include "../adaptive/playlist/SegmentTimeline.h"
+#include "../adaptive/playlist/BaseAdaptationSet.h"
using namespace smooth::playlist;
diff --git a/modules/demux/smooth/playlist/Representation.hpp b/modules/demux/smooth/playlist/Representation.hpp
index a5db0c62f1c9..ada12f4d42f7 100644
--- a/modules/demux/smooth/playlist/Representation.hpp
+++ b/modules/demux/smooth/playlist/Representation.hpp
@@ -20,10 +20,10 @@
#ifndef SMOOTHREPRESENTATION_HPP
#define SMOOTHREPRESENTATION_HPP
-#include "../adaptative/playlist/SegmentInfoCommon.h"
-#include "../adaptative/playlist/BaseRepresentation.h"
+#include "../adaptive/playlist/SegmentInfoCommon.h"
+#include "../adaptive/playlist/BaseRepresentation.h"
-namespace adaptative
+namespace adaptive
{
namespace playlist
{
@@ -35,8 +35,8 @@ namespace smooth
{
namespace playlist
{
- using namespace adaptative;
- using namespace adaptative::playlist;
+ using namespace adaptive;
+ using namespace adaptive::playlist;
class Representation : public BaseRepresentation
{
diff --git a/modules/demux/smooth/playlist/SmoothSegment.cpp b/modules/demux/smooth/playlist/SmoothSegment.cpp
index b26dfbb7705f..858ee4247eed 100644
--- a/modules/demux/smooth/playlist/SmoothSegment.cpp
+++ b/modules/demux/smooth/playlist/SmoothSegment.cpp
@@ -20,8 +20,8 @@
#include "SmoothSegment.hpp"
-#include "../adaptative/playlist/BaseRepresentation.h"
-#include "../adaptative/playlist/AbstractPlaylist.hpp"
+#include "../adaptive/playlist/BaseRepresentation.h"
+#include "../adaptive/playlist/AbstractPlaylist.hpp"
#include "../mp4/IndexReader.hpp"
using namespace smooth::playlist;
diff --git a/modules/demux/smooth/playlist/SmoothSegment.hpp b/modules/demux/smooth/playlist/SmoothSegment.hpp
index a4e628c297f0..307d8fdf31b1 100644
--- a/modules/demux/smooth/playlist/SmoothSegment.hpp
+++ b/modules/demux/smooth/playlist/SmoothSegment.hpp
@@ -20,13 +20,13 @@
#ifndef SMOOTHSEGMENT_HPP
#define SMOOTHSEGMENT_HPP
-#include "../adaptative/playlist/SegmentTemplate.h"
+#include "../adaptive/playlist/SegmentTemplate.h"
namespace smooth
{
namespace playlist
{
- using namespace adaptative::playlist;
+ using namespace adaptive::playlist;
class SmoothSegment : public MediaSegmentTemplate
{
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 394b72a8584a..12811e439e10 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -442,7 +442,7 @@ modules/control/ntservice.c
modules/control/oldrc.c
modules/control/unimotion.c
modules/control/unimotion.h
-modules/demux/adaptative/adaptative.cpp
+modules/demux/adaptive/adaptive.cpp
modules/demux/aiff.c
modules/demux/asf/asf.c
modules/demux/asf/libasf.c
--
GitLab