[vlc-commits] demux: adaptive: unexpose internal callback method

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Apr 18 15:48:08 2019 +0200| [2f2374cc25d6a99ff052d31a7c938f4d554b5afe] | committer: Francois Cartegnie

demux: adaptive: unexpose internal callback method

(cherry picked from commit f114d08a13beea26ea9f95b1ff1486e99979acb3)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=2f2374cc25d6a99ff052d31a7c938f4d554b5afe
---

 modules/demux/adaptive/http/Chunk.h              | 3 ++-
 modules/demux/adaptive/playlist/SegmentChunk.hpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/demux/adaptive/http/Chunk.h b/modules/demux/adaptive/http/Chunk.h
index a3773862da..fe2107b9d1 100644
--- a/modules/demux/adaptive/http/Chunk.h
+++ b/modules/demux/adaptive/http/Chunk.h
@@ -71,11 +71,11 @@ namespace adaptive
 
                 virtual block_t *   readBlock       ();
                 virtual block_t *   read            (size_t);
-                virtual void        onDownload      (block_t **) = 0;
 
             protected:
                 AbstractChunk(AbstractChunkSource *);
                 AbstractChunkSource *source;
+                virtual void        onDownload      (block_t **) = 0;
 
             private:
                 size_t              bytesRead;
@@ -149,6 +149,7 @@ namespace adaptive
                           const ID &, bool = false);
                 virtual ~HTTPChunk();
 
+            protected:
                 virtual void        onDownload      (block_t **) {} /* impl */
         };
     }
diff --git a/modules/demux/adaptive/playlist/SegmentChunk.hpp b/modules/demux/adaptive/playlist/SegmentChunk.hpp
index 0d8906e59d..5673301c83 100644
--- a/modules/demux/adaptive/playlist/SegmentChunk.hpp
+++ b/modules/demux/adaptive/playlist/SegmentChunk.hpp
@@ -40,11 +40,11 @@ namespace adaptive
         public:
             SegmentChunk(ISegment *segment, AbstractChunkSource *, BaseRepresentation *);
             virtual ~SegmentChunk();
-            virtual void onDownload(block_t **); // reimpl
             StreamFormat getStreamFormat() const;
             bool discontinuity;
 
         protected:
+            virtual void onDownload(block_t **); // reimpl
             ISegment *segment;
             BaseRepresentation *rep;
         };