[vlc-commits] adaptive: remove unused member

Rémi Denis-Courmont git at videolan.org
Tue Feb 27 19:23:23 CET 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Feb 27 20:21:10 2018 +0200| [4b7f53f8404d5d44c0585abafd4827f17ad5d0d2] | committer: Rémi Denis-Courmont

adaptive: remove unused member

This fixes a Clang warning.

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

 modules/demux/adaptive/PlaylistManager.cpp                  | 2 +-
 modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp | 3 +--
 modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/demux/adaptive/PlaylistManager.cpp b/modules/demux/adaptive/PlaylistManager.cpp
index 4aadbe896e..81000a6cb3 100644
--- a/modules/demux/adaptive/PlaylistManager.cpp
+++ b/modules/demux/adaptive/PlaylistManager.cpp
@@ -762,7 +762,7 @@ AbstractAdaptationLogic *PlaylistManager::createLogic(AbstractAdaptationLogic::L
         case AbstractAdaptationLogic::NearOptimal:
         {
             NearOptimalAdaptationLogic *noplogic =
-                    new (std::nothrow) NearOptimalAdaptationLogic(VLC_OBJECT(p_demux));
+                    new (std::nothrow) NearOptimalAdaptationLogic();
             if(noplogic)
                 conn->setDownloadRateObserver(noplogic);
             logic = noplogic;
diff --git a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp
index ed54d15f0d..a8f9143991 100644
--- a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp
@@ -50,11 +50,10 @@ NearOptimalContext::NearOptimalContext()
     , last_download_rate( 0 )
 { }
 
-NearOptimalAdaptationLogic::NearOptimalAdaptationLogic( vlc_object_t *p_obj )
+NearOptimalAdaptationLogic::NearOptimalAdaptationLogic()
     : AbstractAdaptationLogic()
     , currentBps( 0 )
     , usedBps( 0 )
-    , p_obj( p_obj )
 {
     vlc_mutex_init(&lock);
 }
diff --git a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp
index 19f2109533..cd16618cb0 100644
--- a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp
+++ b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp
@@ -47,7 +47,7 @@ namespace adaptive
         class NearOptimalAdaptationLogic : public AbstractAdaptationLogic
         {
             public:
-                NearOptimalAdaptationLogic(vlc_object_t *);
+                NearOptimalAdaptationLogic();
                 virtual ~NearOptimalAdaptationLogic();
 
                 virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *);
@@ -65,7 +65,6 @@ namespace adaptive
                 std::map<uint64_t, float>   utilities;
                 unsigned                    currentBps;
                 unsigned                    usedBps;
-                vlc_object_t *              p_obj;
                 vlc_mutex_t                 lock;
         };
     }



More information about the vlc-commits mailing list