[vlc-commits] demux: adaptive: remove timescaleable

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Nov 19 10:29:09 2020 +0100| [c336bf114e081f320da91ef26ef6f069d7880bb7] | committer: Francois Cartegnie

demux: adaptive: remove timescaleable

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

 modules/demux/adaptive/playlist/Inheritables.cpp | 39 ------------------------
 modules/demux/adaptive/playlist/Inheritables.hpp | 18 -----------
 2 files changed, 57 deletions(-)

diff --git a/modules/demux/adaptive/playlist/Inheritables.cpp b/modules/demux/adaptive/playlist/Inheritables.cpp
index dfdf56c4c1..c61b3f0c45 100644
--- a/modules/demux/adaptive/playlist/Inheritables.cpp
+++ b/modules/demux/adaptive/playlist/Inheritables.cpp
@@ -252,42 +252,3 @@ AbstractAttr * AttrsNode::getAttribute(AbstractAttr::Type type,
     }
     return NULL;
 }
-
-TimescaleAble::TimescaleAble(TimescaleAble *parent)
-{
-    parentTimescaleAble = parent;
-}
-
-TimescaleAble::~TimescaleAble()
-{
-}
-
-void TimescaleAble::setParentTimescaleAble(TimescaleAble *parent)
-{
-    parentTimescaleAble = parent;
-}
-
-Timescale TimescaleAble::inheritTimescale() const
-{
-    if(timescale.isValid())
-        return timescale;
-    else if(parentTimescaleAble)
-        return parentTimescaleAble->inheritTimescale();
-    else
-        return Timescale(1);
-}
-
-void TimescaleAble::setTimescale(const Timescale & t)
-{
-    timescale = t;
-}
-
-void TimescaleAble::setTimescale(uint64_t t)
-{
-    timescale = Timescale(t);
-}
-
-const Timescale & TimescaleAble::getTimescale() const
-{
-    return timescale;
-}
diff --git a/modules/demux/adaptive/playlist/Inheritables.hpp b/modules/demux/adaptive/playlist/Inheritables.hpp
index 8fa04f5ad8..dc00e5e0b5 100644
--- a/modules/demux/adaptive/playlist/Inheritables.hpp
+++ b/modules/demux/adaptive/playlist/Inheritables.hpp
@@ -129,24 +129,6 @@ namespace adaptive
                     AttrWrapper<AbstractAttr::Type::DURATION, stime_t>( v ) {}
                 virtual bool isValid() const { return value > 0; }
         };
-
-        class TimescaleAble
-        {
-            public:
-                TimescaleAble( TimescaleAble * = NULL );
-                virtual ~TimescaleAble();
-                void setParentTimescaleAble( TimescaleAble * );
-                virtual Timescale inheritTimescale() const;
-                void setTimescale( const Timescale & );
-                void setTimescale( uint64_t );
-                const Timescale & getTimescale() const;
-
-            protected:
-                TimescaleAble *parentTimescaleAble;
-
-            private:
-                Timescale timescale;
-        };
     }
 }