vlc | branch: master | Francois Cartegnie <[email protected]> | Fri Nov 20 10:11:26 2020 +0100| [ff4b81dd12f1692cc460380dbcd43273e9e0b37a] | committer: Francois Cartegnie
demux: adaptive: remove unused getMediaSegments > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ff4b81dd12f1692cc460380dbcd43273e9e0b37a --- .../demux/adaptive/playlist/SegmentInformation.cpp | 23 ---------------------- .../demux/adaptive/playlist/SegmentInformation.hpp | 1 - 2 files changed, 24 deletions(-) diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp b/modules/demux/adaptive/playlist/SegmentInformation.cpp index e046d60f57..faae1a7639 100644 --- a/modules/demux/adaptive/playlist/SegmentInformation.cpp +++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp @@ -77,29 +77,6 @@ AbstractPlaylist * SegmentInformation::getPlaylist() const return NULL; } -std::size_t SegmentInformation::getMediaSegments(std::vector<Segment *> &retSegments) const -{ - if( mediaSegmentTemplate ) - { - retSegments.push_back( mediaSegmentTemplate->getMediaSegment(0) ); - } - else if ( segmentList && !segmentList->getSegments().empty() ) - { - std::vector<Segment *> list = segmentList->getSegments(); - retSegments.insert( retSegments.end(), list.begin(), list.end() ); - } - else if( segmentBase ) - { - const std::vector<Segment *> &list = segmentBase->subSegments(); - retSegments.insert( retSegments.end(), list.begin(), list.end() ); - } - else if( parent ) - { - return parent->getMediaSegments(retSegments); - } - return retSegments.size(); -} - const AbstractSegmentBaseType * SegmentInformation::inheritSegmentProfile() const { const AbstractSegmentBaseType *profile = inheritSegmentTemplate(); diff --git a/modules/demux/adaptive/playlist/SegmentInformation.hpp b/modules/demux/adaptive/playlist/SegmentInformation.hpp index 465999852f..6704c3cca6 100644 --- a/modules/demux/adaptive/playlist/SegmentInformation.hpp +++ b/modules/demux/adaptive/playlist/SegmentInformation.hpp @@ -79,7 +79,6 @@ namespace adaptive const CommonEncryption & intheritEncryption() const; protected: - std::size_t getMediaSegments(std::vector<Segment *>&) const; std::vector<SegmentInformation *> childs; SegmentInformation * getChildByID( const ID & ); SegmentInformation *parent; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
