[vlc-commits] demux: adaptative: rename type less getSegments

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat Jun  6 14:52:16 2015 +0200| [425d321aab19d4c5cb09ed7e70c89c33c503d1ba] | committer: Francois Cartegnie

demux: adaptative: rename type less getSegments

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

 modules/demux/adaptative/playlist/BaseRepresentation.cpp |    2 +-
 modules/demux/adaptative/playlist/SegmentInformation.cpp |    2 +-
 modules/demux/adaptative/playlist/SegmentInformation.hpp |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/adaptative/playlist/BaseRepresentation.cpp b/modules/demux/adaptative/playlist/BaseRepresentation.cpp
index 44fc51c..27cc05c 100644
--- a/modules/demux/adaptative/playlist/BaseRepresentation.cpp
+++ b/modules/demux/adaptative/playlist/BaseRepresentation.cpp
@@ -70,7 +70,7 @@ void BaseRepresentation::debug(vlc_object_t *obj, int indent) const
     text.append("Representation");
     msg_Dbg(obj, "%s", text.c_str());
     std::vector<ISegment *> list;
-    getSegments(list);
+    getAllSegments(list);
     std::vector<ISegment *>::const_iterator l;
     for(l = list.begin(); l != list.end(); ++l)
         (*l)->debug(obj, indent + 1);
diff --git a/modules/demux/adaptative/playlist/SegmentInformation.cpp b/modules/demux/adaptative/playlist/SegmentInformation.cpp
index e63b6fc..ac4c578 100644
--- a/modules/demux/adaptative/playlist/SegmentInformation.cpp
+++ b/modules/demux/adaptative/playlist/SegmentInformation.cpp
@@ -139,7 +139,7 @@ std::size_t SegmentInformation::getSegments(SegmentInfoType type, vector<ISegmen
         return retSegments.size();
 }
 
-std::size_t SegmentInformation::getSegments(vector<ISegment *> &retSegments) const
+std::size_t SegmentInformation::getAllSegments(vector<ISegment *> &retSegments) const
 {
     for(int i=0; i<InfoTypeCount; i++)
     {
diff --git a/modules/demux/adaptative/playlist/SegmentInformation.hpp b/modules/demux/adaptative/playlist/SegmentInformation.hpp
index 8dcf7cc..503ac67 100644
--- a/modules/demux/adaptative/playlist/SegmentInformation.hpp
+++ b/modules/demux/adaptative/playlist/SegmentInformation.hpp
@@ -82,7 +82,7 @@ namespace adaptative
                 virtual void mergeWith(SegmentInformation *, mtime_t);
 
             protected:
-                std::size_t getSegments(std::vector<ISegment *> &) const;
+                std::size_t getAllSegments(std::vector<ISegment *> &) const;
                 std::size_t getSegments(SegmentInfoType, std::vector<ISegment *>&) const;
                 std::vector<SegmentInformation *> childs;
                 SegmentInformation *parent;