Commit 3fc55ff7 authored by François Cartegnie's avatar François Cartegnie 🤞

demux: adaptive: change ID namespace

parent 14eadb95
......@@ -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 \
......
......@@ -24,7 +24,7 @@
#include "ID.hpp"
#include <sstream>
using namespace adaptive::playlist;
using namespace adaptive;
ID::ID(const std::string &id_)
{
......
......@@ -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
......@@ -34,11 +34,12 @@
namespace adaptive
{
class ID;
namespace playlist
{
class BaseRepresentation;
class BasePeriod;
class ID;
class BaseAdaptationSet : public CommonAttributesElements,
public SegmentInformation
......
......@@ -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;
......
......@@ -26,6 +26,7 @@
#include "SegmentTimeline.h"
using namespace adaptive::playlist;
using namespace adaptive;
Timelineable::Timelineable()
{
......
......@@ -23,7 +23,7 @@
#include "../tools/Properties.hpp"
#include <string>
#include <stdint.h>
#include "ID.hpp"
#include "../ID.hpp"
#include "../Time.hpp"
namespace adaptive
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment