[vlc-commits] demux: adaptative: remove self used method

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Sep 23 21:04:27 2015 +0200| [1cb319a1d7fa2c816b859c925fc3117cbd576b5e] | committer: Francois Cartegnie

demux: adaptative: remove self used method

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

 modules/demux/adaptative/plumbing/StreamOutput.cpp |    7 +------
 modules/demux/adaptative/plumbing/StreamOutput.hpp |    3 ---
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/demux/adaptative/plumbing/StreamOutput.cpp b/modules/demux/adaptative/plumbing/StreamOutput.cpp
index a8f31f2..e34f0d3 100644
--- a/modules/demux/adaptative/plumbing/StreamOutput.cpp
+++ b/modules/demux/adaptative/plumbing/StreamOutput.cpp
@@ -118,7 +118,7 @@ void BaseStreamOutput::setPosition(mtime_t nztime)
 {
     if(reinitsOnSeek())
     {
-        restart();
+        demuxer->restart();
         fakeesout->commandsqueue.Abort( true );
         fakeesout->recycleAll();
         /* Check if we need to set an offset as the demuxer
@@ -131,11 +131,6 @@ void BaseStreamOutput::setPosition(mtime_t nztime)
                    VLC_TS_0 + nztime);
 }
 
-bool BaseStreamOutput::restart()
-{
-    return demuxer->restart();
-}
-
 bool BaseStreamOutput::reinitsOnSeek() const
 {
     return demuxer->reinitsOnSeek();
diff --git a/modules/demux/adaptative/plumbing/StreamOutput.hpp b/modules/demux/adaptative/plumbing/StreamOutput.hpp
index 6392a92..65565bf 100644
--- a/modules/demux/adaptative/plumbing/StreamOutput.hpp
+++ b/modules/demux/adaptative/plumbing/StreamOutput.hpp
@@ -100,9 +100,6 @@ namespace adaptative
         FakeESOut *fakeesout; /* to intercept/proxy what is sent from demuxstream */
         AbstractDemuxer *demuxer;
         std::string name;
-
-    private:
-        bool restart();
     };
 
 }