From cefbd1fc3121eb6e3ed4148a74ee500dc23a6c87 Mon Sep 17 00:00:00 2001 From: Francois Cartegnie Date: Wed, 23 Jan 2019 12:01:54 +0100 Subject: [PATCH] demux: dash: decl parser as friend class --- modules/demux/adaptive/playlist/AbstractPlaylist.cpp | 6 ++++++ modules/demux/adaptive/playlist/AbstractPlaylist.hpp | 2 ++ modules/demux/dash/mpd/MPD.h | 2 ++ 3 files changed, 10 insertions(+) diff --git a/modules/demux/adaptive/playlist/AbstractPlaylist.cpp b/modules/demux/adaptive/playlist/AbstractPlaylist.cpp index 7945928f20..a124d68fef 100644 --- a/modules/demux/adaptive/playlist/AbstractPlaylist.cpp +++ b/modules/demux/adaptive/playlist/AbstractPlaylist.cpp @@ -46,6 +46,7 @@ AbstractPlaylist::AbstractPlaylist (vlc_object_t *p_object_) : minBufferTime = 0; timeShiftBufferDepth.Set( 0 ); suggestedPresentationDelay.Set( 0 ); + b_needsUpdates = false; } AbstractPlaylist::~AbstractPlaylist() @@ -136,6 +137,11 @@ BasePeriod* AbstractPlaylist::getNextPeriod(BasePeriod *period) return NULL; } +bool AbstractPlaylist::needsUpdates() const +{ + return b_needsUpdates; +} + void AbstractPlaylist::mergeWith(AbstractPlaylist *updatedAbstractPlaylist, vlc_tick_t prunebarrier) { availabilityEndTime.Set(updatedAbstractPlaylist->availabilityEndTime.Get()); diff --git a/modules/demux/adaptive/playlist/AbstractPlaylist.hpp b/modules/demux/adaptive/playlist/AbstractPlaylist.hpp index 61fbc3c134..a4bd8d29f1 100644 --- a/modules/demux/adaptive/playlist/AbstractPlaylist.hpp +++ b/modules/demux/adaptive/playlist/AbstractPlaylist.hpp @@ -58,6 +58,7 @@ namespace adaptive virtual BasePeriod* getFirstPeriod(); virtual BasePeriod* getNextPeriod(BasePeriod *period); + bool needsUpdates() const; void mergeWith(AbstractPlaylist *, vlc_tick_t = 0); void pruneByPlaybackTime(vlc_tick_t); @@ -77,6 +78,7 @@ namespace adaptive std::string playlistUrl; std::string type; vlc_tick_t minBufferTime; + bool b_needsUpdates; }; } } diff --git a/modules/demux/dash/mpd/MPD.h b/modules/demux/dash/mpd/MPD.h index a515798d0e..06d627e456 100644 --- a/modules/demux/dash/mpd/MPD.h +++ b/modules/demux/dash/mpd/MPD.h @@ -40,6 +40,8 @@ namespace dash class MPD : public AbstractPlaylist { + friend class IsoffMainParser; + public: MPD(vlc_object_t *, Profile); virtual ~MPD(); -- 2.11.4.GIT