vlc | branch: master | Steve Lhomme <[email protected]> | Wed Oct 5 17:23:53 2016 +0200| [9d554d23308a2f3c94ab54bf9ed492fac0914672] | committer: Francois Cartegnie
adaptive: fix ID namespace Signed-off-by: Francois Cartegnie <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9d554d23308a2f3c94ab54bf9ed492fac0914672 --- modules/demux/adaptive/http/Chunk.cpp | 6 +++--- modules/demux/adaptive/http/HTTPConnectionManager.cpp | 2 +- modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp | 2 +- modules/demux/adaptive/playlist/BasePeriod.cpp | 2 +- modules/demux/adaptive/playlist/SegmentInformation.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/demux/adaptive/http/Chunk.cpp b/modules/demux/adaptive/http/Chunk.cpp index 2d3b95e..270c0e2 100644 --- a/modules/demux/adaptive/http/Chunk.cpp +++ b/modules/demux/adaptive/http/Chunk.cpp @@ -117,7 +117,7 @@ block_t * AbstractChunk::read(size_t size) } HTTPChunkSource::HTTPChunkSource(const std::string& url, AbstractConnectionManager *manager, - const ID &id) : + const adaptive::ID &id) : AbstractChunkSource(), connection (NULL), connManager (manager), @@ -234,7 +234,7 @@ block_t * HTTPChunkSource::readBlock() } HTTPChunkBufferedSource::HTTPChunkBufferedSource(const std::string& url, AbstractConnectionManager *manager, - const ID &sourceid) : + const adaptive::ID &sourceid) : HTTPChunkSource(url, manager, sourceid), p_head (NULL), pp_tail (&p_head), @@ -447,7 +447,7 @@ block_t * HTTPChunkBufferedSource::read(size_t readsize) } HTTPChunk::HTTPChunk(const std::string &url, AbstractConnectionManager *manager, - const ID &id): + const adaptive::ID &id): AbstractChunk(new HTTPChunkSource(url, manager, id)) { diff --git a/modules/demux/adaptive/http/HTTPConnectionManager.cpp b/modules/demux/adaptive/http/HTTPConnectionManager.cpp index 7c10aa7..c6d3e45 100644 --- a/modules/demux/adaptive/http/HTTPConnectionManager.cpp +++ b/modules/demux/adaptive/http/HTTPConnectionManager.cpp @@ -46,7 +46,7 @@ AbstractConnectionManager::~AbstractConnectionManager() } -void AbstractConnectionManager::updateDownloadRate(const ID &sourceid, size_t size, mtime_t time) +void AbstractConnectionManager::updateDownloadRate(const adaptive::ID &sourceid, size_t size, mtime_t time) { if(rateObserver) rateObserver->updateDownloadRate(sourceid, size, time); diff --git a/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp b/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp index 617ddbd..887a290 100644 --- a/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp +++ b/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp @@ -37,6 +37,6 @@ AbstractAdaptationLogic::~AbstractAdaptationLogic () { } -void AbstractAdaptationLogic::updateDownloadRate (const ID &, size_t, mtime_t) +void AbstractAdaptationLogic::updateDownloadRate (const adaptive::ID &, size_t, mtime_t) { } diff --git a/modules/demux/adaptive/playlist/BasePeriod.cpp b/modules/demux/adaptive/playlist/BasePeriod.cpp index 5d2e986..4f520d5 100644 --- a/modules/demux/adaptive/playlist/BasePeriod.cpp +++ b/modules/demux/adaptive/playlist/BasePeriod.cpp @@ -68,7 +68,7 @@ void BasePeriod::addAdaptationSet(BaseAdaptationSet *adaptationSet) } } -BaseAdaptationSet *BasePeriod::getAdaptationSetByID(const ID &id) +BaseAdaptationSet *BasePeriod::getAdaptationSetByID(const adaptive::ID &id) { std::vector<BaseAdaptationSet*>::const_iterator it; for(it = adaptationSets.begin(); it!= adaptationSets.end(); ++it) diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp b/modules/demux/adaptive/playlist/SegmentInformation.cpp index b8608ac..5d31f20 100644 --- a/modules/demux/adaptive/playlist/SegmentInformation.cpp +++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp @@ -410,7 +410,7 @@ bool SegmentInformation::getPlaybackTimeDurationBySegmentNumber(uint64_t number, return false; } -SegmentInformation * SegmentInformation::getChildByID(const ID &id) +SegmentInformation * SegmentInformation::getChildByID(const adaptive::ID &id) { std::vector<SegmentInformation *>::const_iterator it; for(it=childs.begin(); it!=childs.end(); ++it) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
