diff --git a/modules/demux/adaptive/http/HTTPConnection.hpp b/modules/demux/adaptive/http/HTTPConnection.hpp index 7ea76db180e4fd63cc52996a07f175e3e3f2d86c..7af6871fb9793092466897c4a35ef63af159d716 100644 --- a/modules/demux/adaptive/http/HTTPConnection.hpp +++ b/modules/demux/adaptive/http/HTTPConnection.hpp @@ -71,12 +71,12 @@ namespace adaptive const ConnectionParams &, bool = false); virtual ~HTTPConnection(); - virtual bool canReuse (const ConnectionParams &) const; + virtual bool canReuse (const ConnectionParams &) const override; virtual RequestStatus request(const std::string& path, - const BytesRange & = BytesRange()); - virtual ssize_t read (void *p_buffer, size_t len); + const BytesRange & = BytesRange()) override; + virtual ssize_t read (void *p_buffer, size_t len) override; - void setUsed( bool ); + void setUsed( bool ) override; const ConnectionParams &getRedirection() const; static const unsigned MAX_REDIRECTS = 3; @@ -119,13 +119,13 @@ namespace adaptive StreamUrlConnection(vlc_object_t *); virtual ~StreamUrlConnection(); - virtual bool canReuse (const ConnectionParams &) const; + virtual bool canReuse (const ConnectionParams &) const override; virtual RequestStatus request(const std::string& path, - const BytesRange & = BytesRange()); - virtual ssize_t read (void *p_buffer, size_t len); + const BytesRange & = BytesRange()) override; + virtual ssize_t read (void *p_buffer, size_t len) override; - virtual void setUsed( bool ); + virtual void setUsed( bool ) override; protected: void reset(); @@ -145,7 +145,7 @@ namespace adaptive public: NativeConnectionFactory( AuthStorage * ); virtual ~NativeConnectionFactory(); - virtual AbstractConnection * createConnection(vlc_object_t *, const ConnectionParams &); + virtual AbstractConnection * createConnection(vlc_object_t *, const ConnectionParams &) override; private: AuthStorage *authStorage; }; @@ -155,7 +155,7 @@ namespace adaptive public: StreamUrlConnectionFactory(); virtual ~StreamUrlConnectionFactory() {} - virtual AbstractConnection * createConnection(vlc_object_t *, const ConnectionParams &); + virtual AbstractConnection * createConnection(vlc_object_t *, const ConnectionParams &) override; }; } } diff --git a/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h index a841936fce2c78c961b004e10cc350859c6d5bed..4934913fa3c8189e77635424627fb290fd3a8d4b 100644 --- a/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h +++ b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h @@ -36,7 +36,8 @@ namespace adaptive public: AlwaysBestAdaptationLogic (vlc_object_t *); - virtual BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *); + virtual BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, + BaseRepresentation *) override; }; } } diff --git a/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp index 435cb03b9aa5456315a1a4cabb32a714b867f9c6..c0ffcf9085798238e7c23c04abfa4c539c43191a 100644 --- a/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp +++ b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp @@ -31,7 +31,8 @@ namespace adaptive public: AlwaysLowestAdaptationLogic(vlc_object_t *); - virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *); + virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, + BaseRepresentation *) override; }; } } diff --git a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp index 327ca696cf276bdaf97546dde7efb036091cef71..022b42badf4145a00a9e781a9f347a981f08fa8c 100644 --- a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp +++ b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.hpp @@ -50,7 +50,8 @@ namespace adaptive NearOptimalAdaptationLogic(vlc_object_t *); virtual ~NearOptimalAdaptationLogic(); - virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *); + virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, + BaseRepresentation *) override; virtual void updateDownloadRate (const ID &, size_t, vlc_tick_t) override; virtual void trackerEvent (const SegmentTrackerEvent &) override; diff --git a/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp b/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp index db7ff0f94da5c0e5a8fa5758231e1e87807dd68f..c69e47fa166f180b09fcf11f7795038d778eff04 100644 --- a/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp +++ b/modules/demux/adaptive/logic/PredictiveAdaptationLogic.hpp @@ -51,7 +51,8 @@ namespace adaptive PredictiveAdaptationLogic(vlc_object_t *); virtual ~PredictiveAdaptationLogic(); - virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *); + virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, + BaseRepresentation *) override; virtual void updateDownloadRate (const ID &, size_t, vlc_tick_t) override; virtual void trackerEvent (const SegmentTrackerEvent &) override; diff --git a/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h index b21b29e727e23ffe0860c4604e444832b66acba2..33b9a2b6801f467610cc60b04fbf82cfff3e4ea5 100644 --- a/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h +++ b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h @@ -39,7 +39,8 @@ namespace adaptive RateBasedAdaptationLogic (vlc_object_t *); virtual ~RateBasedAdaptationLogic (); - BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *); + BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, + BaseRepresentation *) override; virtual void updateDownloadRate(const ID &, size_t, vlc_tick_t) override; virtual void trackerEvent(const SegmentTrackerEvent &) override; @@ -61,7 +62,8 @@ namespace adaptive public: FixedRateAdaptationLogic(vlc_object_t *, size_t); - BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *); + BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, + BaseRepresentation *) override; private: size_t currentBps; diff --git a/modules/demux/adaptive/logic/RoundRobinLogic.hpp b/modules/demux/adaptive/logic/RoundRobinLogic.hpp index ccd890b19f0db32513f1f167f78ad06a6e8b313a..bbc96d86749f4b5c290ecebe2d251a91efdd9a76 100644 --- a/modules/demux/adaptive/logic/RoundRobinLogic.hpp +++ b/modules/demux/adaptive/logic/RoundRobinLogic.hpp @@ -16,7 +16,7 @@ namespace adaptive RoundRobinLogic(vlc_object_t *); virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, - BaseRepresentation *); + BaseRepresentation *) override; static const unsigned QUANTUM = 2; private: size_t index; diff --git a/modules/demux/adaptive/playlist/BaseRepresentation.h b/modules/demux/adaptive/playlist/BaseRepresentation.h index b84a0d502c28b9181959741f7ac5a9ae3a0b92ea..e6b639fe623c453e51c3d4a142eb7f9dd6fd9f16 100644 --- a/modules/demux/adaptive/playlist/BaseRepresentation.h +++ b/modules/demux/adaptive/playlist/BaseRepresentation.h @@ -62,7 +62,7 @@ namespace adaptive const std::list<std::string> & getCodecs () const; void addCodecs (const std::string &); bool consistentSegmentNumber () const; - virtual void pruneByPlaybackTime (vlc_tick_t); + virtual void pruneByPlaybackTime (vlc_tick_t) override; virtual vlc_tick_t getMinAheadTime (uint64_t) const; virtual bool needsUpdate (uint64_t) const; diff --git a/modules/demux/dash/DASHStream.hpp b/modules/demux/dash/DASHStream.hpp index 6b26bea37029b3830013edd9c92ab7f5c48cf75c..9a0bd7e2439e17e8d3e8511ba4bf35a78886d7d9 100644 --- a/modules/demux/dash/DASHStream.hpp +++ b/modules/demux/dash/DASHStream.hpp @@ -41,7 +41,7 @@ namespace dash { public: virtual AbstractStream *create(demux_t*, const StreamFormat &, - SegmentTracker *, AbstractConnectionManager *) const; + SegmentTracker *, AbstractConnectionManager *) const override; }; } diff --git a/modules/demux/dash/mpd/MPD.h b/modules/demux/dash/mpd/MPD.h index fa6e98c79aea6d13111f9ba7acdb5ad2883f4a73..f0f677cc16998e93c44047b65ef4aad7c7e58dad 100644 --- a/modules/demux/dash/mpd/MPD.h +++ b/modules/demux/dash/mpd/MPD.h @@ -47,8 +47,8 @@ namespace dash virtual ~MPD(); Profile getProfile() const; - virtual bool isLive() const; - virtual bool isLowLatency() const; + virtual bool isLive() const override; + virtual bool isLowLatency() const override; void setLowLatency(bool); virtual void debug(); diff --git a/modules/demux/dash/mpd/Representation.h b/modules/demux/dash/mpd/Representation.h index 58a86d77a6a7786413e70ed53e36eb9147baf138..ddaf160d8fcfcb49c78dc85cc0e6abb7062379aa 100644 --- a/modules/demux/dash/mpd/Representation.h +++ b/modules/demux/dash/mpd/Representation.h @@ -50,7 +50,7 @@ namespace dash /* for segment templates */ virtual std::string contextualize(size_t, const std::string &, - const SegmentTemplate *) const; // reimpl + const SegmentTemplate *) const override; private: diff --git a/modules/demux/hls/HLSStreams.hpp b/modules/demux/hls/HLSStreams.hpp index ca21048b1f951b493ebae578020ea1fc5b159c32..d1edb5a1d4640d9e93542060efb8748addcc359c 100644 --- a/modules/demux/hls/HLSStreams.hpp +++ b/modules/demux/hls/HLSStreams.hpp @@ -36,7 +36,7 @@ namespace hls virtual block_t *checkBlock(block_t *, bool) override; virtual AbstractDemuxer * newDemux(vlc_object_t *, const StreamFormat &, es_out_t *, AbstractSourceStream *) const override; - virtual bool setPosition(vlc_tick_t, bool); + virtual bool setPosition(vlc_tick_t, bool) override; private: static int ID3TAG_Parse_Handler(uint32_t, const uint8_t *, size_t, void *); @@ -52,7 +52,7 @@ namespace hls { public: virtual AbstractStream *create(demux_t *, const StreamFormat &, - SegmentTracker *, AbstractConnectionManager *) const; + SegmentTracker *, AbstractConnectionManager *) const override; }; } diff --git a/modules/demux/hls/playlist/M3U8.hpp b/modules/demux/hls/playlist/M3U8.hpp index 5194fd41904c6b06420c2a667399bd7d07777042..3f6d1b17ecedeb676d2556961a5bf183e146b58b 100644 --- a/modules/demux/hls/playlist/M3U8.hpp +++ b/modules/demux/hls/playlist/M3U8.hpp @@ -35,7 +35,7 @@ namespace hls M3U8(vlc_object_t *); virtual ~M3U8(); - virtual bool isLive() const; + virtual bool isLive() const override; }; } } diff --git a/modules/demux/hls/playlist/Tags.hpp b/modules/demux/hls/playlist/Tags.hpp index 7cdbcb20b60870a1e7afd1a5dfd0b9e4dec6f6bd..57658c559c70a2824c37d0c979b432d345c04dae 100644 --- a/modules/demux/hls/playlist/Tags.hpp +++ b/modules/demux/hls/playlist/Tags.hpp @@ -121,7 +121,7 @@ namespace hls virtual ~ValuesListTag(); protected: - virtual void parseAttributes(const std::string &); + virtual void parseAttributes(const std::string &) override; }; class TagFactory diff --git a/modules/demux/smooth/SmoothStream.hpp b/modules/demux/smooth/SmoothStream.hpp index 3a0c187eeecd4fc85a305c027d7d6d94eefc45da..d80268782be6b92a1ed7804269e5d4b50a2f60ac 100644 --- a/modules/demux/smooth/SmoothStream.hpp +++ b/modules/demux/smooth/SmoothStream.hpp @@ -41,7 +41,7 @@ namespace smooth { public: virtual AbstractStream *create(demux_t*, const StreamFormat &, - SegmentTracker *, AbstractConnectionManager *) const; + SegmentTracker *, AbstractConnectionManager *) const override; }; } diff --git a/modules/demux/smooth/playlist/Manifest.hpp b/modules/demux/smooth/playlist/Manifest.hpp index a6d1701db5e707602b953d93021fca82b9673638..9f299ab1f421219bf04c9552323200d713053d21 100644 --- a/modules/demux/smooth/playlist/Manifest.hpp +++ b/modules/demux/smooth/playlist/Manifest.hpp @@ -36,7 +36,7 @@ namespace smooth Manifest(vlc_object_t *); virtual ~Manifest(); - virtual bool isLive() const; + virtual bool isLive() const override; private: bool b_live; diff --git a/modules/demux/smooth/playlist/Representation.hpp b/modules/demux/smooth/playlist/Representation.hpp index db66cbdc47aee05243e1ff863f45118c847d4e23..c39eaf3a72d566ba2b644d6e9b1134b23688bb70 100644 --- a/modules/demux/smooth/playlist/Representation.hpp +++ b/modules/demux/smooth/playlist/Representation.hpp @@ -50,7 +50,7 @@ namespace smooth /* for segment templates */ virtual std::string contextualize(size_t, const std::string &, - const SegmentTemplate *) const; // reimpl + const SegmentTemplate *) const override; }; } }