vlc | branch: master | Francois Cartegnie <[email protected]> | Thu Jan 1 17:01:49 2015 +0100| [c3fa608ca1a5df5e00be6ac442eacea5c9bc6fd2] | committer: Francois Cartegnie
demux: dash: remove unused members > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c3fa608ca1a5df5e00be6ac442eacea5c9bc6fd2 --- modules/demux/dash/SegmentTracker.cpp | 4 +--- modules/demux/dash/mpd/Segment.cpp | 9 --------- modules/demux/dash/mpd/Segment.h | 2 -- modules/demux/dash/mpd/SegmentTemplate.cpp | 5 ----- modules/demux/dash/mpd/SegmentTemplate.h | 1 - 5 files changed, 1 insertion(+), 20 deletions(-) diff --git a/modules/demux/dash/SegmentTracker.cpp b/modules/demux/dash/SegmentTracker.cpp index df001a9..347083d 100644 --- a/modules/demux/dash/SegmentTracker.cpp +++ b/modules/demux/dash/SegmentTracker.cpp @@ -91,9 +91,7 @@ Chunk * SegmentTracker::getNextChunk(Streams::Type type) Chunk *chunk = segment->toChunk(count, rep); if(chunk) - { - segment->done(); count++; - } + return chunk; } diff --git a/modules/demux/dash/mpd/Segment.cpp b/modules/demux/dash/mpd/Segment.cpp index c203d6c..067e84e 100644 --- a/modules/demux/dash/mpd/Segment.cpp +++ b/modules/demux/dash/mpd/Segment.cpp @@ -76,15 +76,6 @@ dash::http::Chunk* ISegment::toChunk(size_t index, Representation *ctxrep) return chunk; } -bool ISegment::isSingleShot() const -{ - return true; -} -void ISegment::done() -{ - //Only used for a SegmentTemplate. -} - void ISegment::setByteRange(size_t start, size_t end) { startByte = start; diff --git a/modules/demux/dash/mpd/Segment.h b/modules/demux/dash/mpd/Segment.h index 57d4677..264108b 100644 --- a/modules/demux/dash/mpd/Segment.h +++ b/modules/demux/dash/mpd/Segment.h @@ -51,8 +51,6 @@ namespace dash * That is basically true when using an Url, and false * when using an UrlTemplate */ - virtual bool isSingleShot () const; - virtual void done (); virtual dash::http::Chunk* toChunk (size_t, Representation * = NULL); virtual void setByteRange (size_t start, size_t end); virtual size_t getOffset () const; diff --git a/modules/demux/dash/mpd/SegmentTemplate.cpp b/modules/demux/dash/mpd/SegmentTemplate.cpp index 1943ae7..3043f30 100644 --- a/modules/demux/dash/mpd/SegmentTemplate.cpp +++ b/modules/demux/dash/mpd/SegmentTemplate.cpp @@ -61,11 +61,6 @@ void SegmentTemplate::setStartIndex(size_t i) startIndex = i; } -bool SegmentTemplate::isSingleShot() const -{ - return false; -} - InitSegmentTemplate::InitSegmentTemplate( ICanonicalUrl *parent ) : SegmentTemplate(parent) { diff --git a/modules/demux/dash/mpd/SegmentTemplate.h b/modules/demux/dash/mpd/SegmentTemplate.h index 31dbd3f..8f11c38 100644 --- a/modules/demux/dash/mpd/SegmentTemplate.h +++ b/modules/demux/dash/mpd/SegmentTemplate.h @@ -38,7 +38,6 @@ namespace dash public: SegmentTemplate( ICanonicalUrl * = NULL ); virtual Url getUrlSegment() const; /* reimpl */ - virtual bool isSingleShot() const; size_t getStartIndex() const; void setStartIndex(size_t); Property<mtime_t> duration; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
