[vlc-commits] demux: adaptive: change ID namespace
Francois Cartegnie
git at videolan.org
Wed Sep 21 18:52:30 CEST 2016
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Sep 16 17:25:45 2016 +0200| [3fc55ff79e802cb9ba8f908b251b7ab77c47c2c1] | committer: Francois Cartegnie
demux: adaptive: change ID namespace
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3fc55ff79e802cb9ba8f908b251b7ab77c47c2c1
---
modules/demux/Makefile.am | 4 ++--
modules/demux/adaptive/{playlist => }/ID.cpp | 2 +-
modules/demux/adaptive/{playlist => }/ID.hpp | 23 +++++++++-------------
.../demux/adaptive/playlist/BaseAdaptationSet.h | 3 ++-
.../demux/adaptive/playlist/BaseRepresentation.cpp | 2 +-
modules/demux/adaptive/playlist/Inheritables.cpp | 1 +
modules/demux/adaptive/playlist/Inheritables.hpp | 2 +-
7 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index 718ddba..2afe779 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -283,8 +283,6 @@ libadaptive_plugin_la_SOURCES = \
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 \
@@ -344,6 +342,8 @@ libadaptive_plugin_la_SOURCES = \
demux/adaptive/plumbing/SourceStream.cpp \
demux/adaptive/plumbing/SourceStream.hpp \
demux/adaptive/ChunksSource.hpp \
+ demux/adaptive/ID.hpp \
+ demux/adaptive/ID.cpp \
demux/adaptive/PlaylistManager.cpp \
demux/adaptive/PlaylistManager.h \
demux/adaptive/SegmentTracker.cpp \
diff --git a/modules/demux/adaptive/playlist/ID.cpp b/modules/demux/adaptive/ID.cpp
similarity index 97%
rename from modules/demux/adaptive/playlist/ID.cpp
rename to modules/demux/adaptive/ID.cpp
index a5b3d5d..b13156b 100644
--- a/modules/demux/adaptive/playlist/ID.cpp
+++ b/modules/demux/adaptive/ID.cpp
@@ -24,7 +24,7 @@
#include "ID.hpp"
#include <sstream>
-using namespace adaptive::playlist;
+using namespace adaptive;
ID::ID(const std::string &id_)
{
diff --git a/modules/demux/adaptive/playlist/ID.hpp b/modules/demux/adaptive/ID.hpp
similarity index 77%
rename from modules/demux/adaptive/playlist/ID.hpp
rename to modules/demux/adaptive/ID.hpp
index a672956..08b847b 100644
--- a/modules/demux/adaptive/playlist/ID.hpp
+++ b/modules/demux/adaptive/ID.hpp
@@ -25,22 +25,17 @@
namespace adaptive
{
- namespace playlist
+ class ID
{
+ public:
+ ID(const std::string &);
+ ID(uint64_t = 0);
+ bool operator==(const ID &) const;
+ std::string str() const;
- class ID
- {
- public:
- ID(const std::string &);
- ID(uint64_t = 0);
- bool operator==(const ID &) const;
- std::string str() const;
-
- private:
- std::string id;
- };
-
- }
+ private:
+ std::string id;
+ };
}
#endif // ID_HPP
diff --git a/modules/demux/adaptive/playlist/BaseAdaptationSet.h b/modules/demux/adaptive/playlist/BaseAdaptationSet.h
index fac1bdc..c7c7ddf 100644
--- a/modules/demux/adaptive/playlist/BaseAdaptationSet.h
+++ b/modules/demux/adaptive/playlist/BaseAdaptationSet.h
@@ -34,11 +34,12 @@
namespace adaptive
{
+ class ID;
+
namespace playlist
{
class BaseRepresentation;
class BasePeriod;
- class ID;
class BaseAdaptationSet : public CommonAttributesElements,
public SegmentInformation
diff --git a/modules/demux/adaptive/playlist/BaseRepresentation.cpp b/modules/demux/adaptive/playlist/BaseRepresentation.cpp
index a67e6074..c77d9db 100644
--- a/modules/demux/adaptive/playlist/BaseRepresentation.cpp
+++ b/modules/demux/adaptive/playlist/BaseRepresentation.cpp
@@ -31,7 +31,7 @@
#include "BaseAdaptationSet.h"
#include "SegmentTemplate.h"
#include "SegmentTimeline.h"
-#include "ID.hpp"
+#include "../ID.hpp"
using namespace adaptive;
using namespace adaptive::playlist;
diff --git a/modules/demux/adaptive/playlist/Inheritables.cpp b/modules/demux/adaptive/playlist/Inheritables.cpp
index af2fffb..825d11d 100644
--- a/modules/demux/adaptive/playlist/Inheritables.cpp
+++ b/modules/demux/adaptive/playlist/Inheritables.cpp
@@ -26,6 +26,7 @@
#include "SegmentTimeline.h"
using namespace adaptive::playlist;
+using namespace adaptive;
Timelineable::Timelineable()
{
diff --git a/modules/demux/adaptive/playlist/Inheritables.hpp b/modules/demux/adaptive/playlist/Inheritables.hpp
index 413abf2c..d0b83cd 100644
--- a/modules/demux/adaptive/playlist/Inheritables.hpp
+++ b/modules/demux/adaptive/playlist/Inheritables.hpp
@@ -23,7 +23,7 @@
#include "../tools/Properties.hpp"
#include <string>
#include <stdint.h>
-#include "ID.hpp"
+#include "../ID.hpp"
#include "../Time.hpp"
namespace adaptive
More information about the vlc-commits
mailing list