[vlc-commits] demux: adaptive: add namespace on time

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Jan  5 22:38:58 2021 +0100| [04f2b9562a0af67a47046faf6ef45c10f5373f1d] | committer: Francois Cartegnie

demux: adaptive: add namespace on time

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=04f2b9562a0af67a47046faf6ef45c10f5373f1d
---

 modules/demux/adaptive/Time.hpp                        | 5 +++++
 modules/demux/adaptive/playlist/SegmentInformation.cpp | 1 +
 modules/demux/adaptive/playlist/SegmentList.cpp        | 1 +
 modules/demux/adaptive/playlist/SegmentTimeline.cpp    | 1 +
 modules/demux/smooth/playlist/Manifest.cpp             | 1 +
 5 files changed, 9 insertions(+)

diff --git a/modules/demux/adaptive/Time.hpp b/modules/demux/adaptive/Time.hpp
index 4a0e60f88a..8adbbb0302 100644
--- a/modules/demux/adaptive/Time.hpp
+++ b/modules/demux/adaptive/Time.hpp
@@ -22,6 +22,9 @@
 
 #include <vlc_common.h>
 
+namespace adaptive
+{
+
 /* Scaled time */
 using stime_t = int64_t;
 
@@ -52,5 +55,7 @@ class Timescale
         uint64_t scale;
 };
 
+}
+
 #endif // TIME_HPP
 
diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp b/modules/demux/adaptive/playlist/SegmentInformation.cpp
index fbbd5c4a04..4f241d775f 100644
--- a/modules/demux/adaptive/playlist/SegmentInformation.cpp
+++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp
@@ -36,6 +36,7 @@
 #include <cassert>
 #include <limits>
 
+using namespace adaptive;
 using namespace adaptive::playlist;
 
 SegmentInformation::SegmentInformation(SegmentInformation *parent_) :
diff --git a/modules/demux/adaptive/playlist/SegmentList.cpp b/modules/demux/adaptive/playlist/SegmentList.cpp
index a27bd16f11..6a5f959720 100644
--- a/modules/demux/adaptive/playlist/SegmentList.cpp
+++ b/modules/demux/adaptive/playlist/SegmentList.cpp
@@ -32,6 +32,7 @@
 
 #include <limits>
 
+using namespace adaptive;
 using namespace adaptive::playlist;
 
 SegmentList::SegmentList( SegmentInformation *parent_ ):
diff --git a/modules/demux/adaptive/playlist/SegmentTimeline.cpp b/modules/demux/adaptive/playlist/SegmentTimeline.cpp
index cbb31aa198..5de959e23e 100644
--- a/modules/demux/adaptive/playlist/SegmentTimeline.cpp
+++ b/modules/demux/adaptive/playlist/SegmentTimeline.cpp
@@ -31,6 +31,7 @@
 #include <sstream>
 #include <limits>
 
+using namespace adaptive;
 using namespace adaptive::playlist;
 
 SegmentTimeline::SegmentTimeline(AbstractMultipleSegmentBaseType *parent_)
diff --git a/modules/demux/smooth/playlist/Manifest.cpp b/modules/demux/smooth/playlist/Manifest.cpp
index 1ed6655184..e33a4d00b0 100644
--- a/modules/demux/smooth/playlist/Manifest.cpp
+++ b/modules/demux/smooth/playlist/Manifest.cpp
@@ -26,6 +26,7 @@
 
 #include <vlc_common.h>
 
+using namespace adaptive;
 using namespace smooth::playlist;
 
 Manifest::Manifest (vlc_object_t *p_object) :