vlc | branch: master | Francois Cartegnie <[email protected]> | Tue Nov 24 16:23:36 2020 +0100| [14fa7b3e76ec2e25d2c671b586726a28834a8b2f] | committer: Francois Cartegnie
demux: adaptive: move unique mixin > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=14fa7b3e76ec2e25d2c671b586726a28834a8b2f --- modules/demux/adaptive/ID.cpp | 9 +++++++++ modules/demux/adaptive/ID.hpp | 10 ++++++++++ modules/demux/adaptive/playlist/Inheritables.cpp | 10 ---------- modules/demux/adaptive/playlist/Inheritables.hpp | 14 ++------------ 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/modules/demux/adaptive/ID.cpp b/modules/demux/adaptive/ID.cpp index e7505c1373..8be3858927 100644 --- a/modules/demux/adaptive/ID.cpp +++ b/modules/demux/adaptive/ID.cpp @@ -54,3 +54,12 @@ std::string ID::str() const return id; } +const ID & Unique::getID() const +{ + return id; +} + +void Unique::setID(const ID &id_) +{ + id = id_; +} diff --git a/modules/demux/adaptive/ID.hpp b/modules/demux/adaptive/ID.hpp index d15720fa46..bd73a5923d 100644 --- a/modules/demux/adaptive/ID.hpp +++ b/modules/demux/adaptive/ID.hpp @@ -37,6 +37,16 @@ namespace adaptive private: std::string id; }; + + class Unique + { + public: + const ID & getID() const; + void setID(const ID &); + + protected: + ID id; + }; } #endif // ID_HPP diff --git a/modules/demux/adaptive/playlist/Inheritables.cpp b/modules/demux/adaptive/playlist/Inheritables.cpp index 218160e84f..4e938cbfe5 100644 --- a/modules/demux/adaptive/playlist/Inheritables.cpp +++ b/modules/demux/adaptive/playlist/Inheritables.cpp @@ -65,13 +65,3 @@ const Timescale & TimescaleAble::getTimescale() const { return timescale; } - -const ID & Unique::getID() const -{ - return id; -} - -void Unique::setID(const ID &id_) -{ - id = id_; -} diff --git a/modules/demux/adaptive/playlist/Inheritables.hpp b/modules/demux/adaptive/playlist/Inheritables.hpp index 833c7478ae..593391e056 100644 --- a/modules/demux/adaptive/playlist/Inheritables.hpp +++ b/modules/demux/adaptive/playlist/Inheritables.hpp @@ -21,9 +21,9 @@ #define INHERITABLES_H #include "../tools/Properties.hpp" -#include <string> +#include <list> +#include <limits> #include <stdint.h> -#include "../ID.hpp" #include "../Time.hpp" namespace adaptive @@ -47,16 +47,6 @@ namespace adaptive private: Timescale timescale; }; - - class Unique - { - public: - const ID & getID() const; - void setID(const ID &); - - protected: - ID id; - }; } } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
