[vlc-commits] demux: dash: remove unused buffer observer impl

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Dec 23 14:12:41 2014 +0100| [6ee46f4ba68a366b4c46de6b79902b246bd86543] | committer: Francois Cartegnie

demux: dash: remove unused buffer observer impl

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

 .../dash/adaptationlogic/AbstractAdaptationLogic.cpp    |   15 +--------------
 .../dash/adaptationlogic/AbstractAdaptationLogic.h      |    7 -------
 .../dash/adaptationlogic/IAdaptationLogic.h             |    2 +-
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.cpp b/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.cpp
index 3fcabf1..fc62828 100644
--- a/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.cpp
+++ b/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.cpp
@@ -35,9 +35,7 @@ AbstractAdaptationLogic::AbstractAdaptationLogic    (MPD *mpd_) :
                          mpd                        (mpd_),
                          currentPeriod              (mpd->getFirstPeriod()),
                          count                      (0),
-                         prevRepresentation         (NULL),
-                         bufferedMicroSec           (0),
-                         bufferedPercent            (0)
+                         prevRepresentation         (NULL)
 {
 }
 
@@ -99,17 +97,6 @@ Chunk*  AbstractAdaptationLogic::getNextChunk(Streams::Type type)
     return NULL;
 }
 
-void AbstractAdaptationLogic::bufferLevelChanged     (mtime_t bufferedMicroSec, int bufferedPercent)
-{
-    this->bufferedMicroSec = bufferedMicroSec;
-    this->bufferedPercent  = bufferedPercent;
-}
-
 void AbstractAdaptationLogic::updateDownloadRate    (size_t, mtime_t)
 {
 }
-
-int AbstractAdaptationLogic::getBufferPercent        () const
-{
-    return this->bufferedPercent;
-}
diff --git a/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.h b/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.h
index 8bb311d..90e3799 100644
--- a/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.h
+++ b/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.h
@@ -47,18 +47,11 @@ namespace dash
 
                 virtual void                updateDownloadRate     (size_t, mtime_t);
 
-                virtual void                bufferLevelChanged      (mtime_t bufferedMicroSec, int bufferedPercent);
-                int                         getBufferPercent        () const;
-
             protected:
                 dash::mpd::MPD         *mpd;
                 dash::mpd::Period      *currentPeriod;
                 size_t                  count;
                 mpd::Representation    *prevRepresentation;
-
-            private:
-                mtime_t                 bufferedMicroSec;
-                int                     bufferedPercent;
         };
     }
 }
diff --git a/modules/stream_filter/dash/adaptationlogic/IAdaptationLogic.h b/modules/stream_filter/dash/adaptationlogic/IAdaptationLogic.h
index a08e784..e9abecca 100644
--- a/modules/stream_filter/dash/adaptationlogic/IAdaptationLogic.h
+++ b/modules/stream_filter/dash/adaptationlogic/IAdaptationLogic.h
@@ -35,7 +35,7 @@ namespace dash
 {
     namespace logic
     {
-        class IAdaptationLogic : public IDownloadRateObserver, public dash::buffer::IBufferObserver
+        class IAdaptationLogic : public IDownloadRateObserver
         {
             public: