[vlc-commits] demux: adaptative: add dedicated reactivate stream method

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Nov 10 10:54:52 2015 +0100| [2f4dcee5f3ccc0505faf57db42e35652e813cc30] | committer: Francois Cartegnie

demux: adaptative: add dedicated reactivate stream method

We'll need such overridable method if reselecting a stream
requires global playlist action/refresh.

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

 modules/demux/adaptative/PlaylistManager.cpp |    7 ++++++-
 modules/demux/adaptative/PlaylistManager.h   |    1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/demux/adaptative/PlaylistManager.cpp b/modules/demux/adaptative/PlaylistManager.cpp
index 2091920..befe17e 100644
--- a/modules/demux/adaptative/PlaylistManager.cpp
+++ b/modules/demux/adaptative/PlaylistManager.cpp
@@ -152,7 +152,7 @@ AbstractStream::status PlaylistManager::demux(mtime_t nzdeadline, bool send)
         if (st->isDisabled())
         {
             if(st->isSelected() && !st->isEOF())
-                st->reactivate(getPCR());
+                reactivateStream(st);
             else
                 continue;
         }
@@ -271,6 +271,11 @@ bool PlaylistManager::updatePlaylist()
     return true;
 }
 
+bool PlaylistManager::reactivateStream(AbstractStream *stream)
+{
+    return stream->reactivate(getPCR());
+}
+
 #define DEMUX_INCREMENT (CLOCK_FREQ / 20)
 int PlaylistManager::demux_callback(demux_t *p_demux)
 {
diff --git a/modules/demux/adaptative/PlaylistManager.h b/modules/demux/adaptative/PlaylistManager.h
index a9eec08..4315c9f 100644
--- a/modules/demux/adaptative/PlaylistManager.h
+++ b/modules/demux/adaptative/PlaylistManager.h
@@ -71,6 +71,7 @@ namespace adaptative
             virtual int doControl(int, va_list);
             virtual int doDemux(int64_t);
 
+            virtual bool reactivateStream(AbstractStream *);
             bool setupPeriod();
             void unsetPeriod();
             /* local factories */