Skip to content

V
vlc
Commit f7b1888a authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

demux: adaptative: remove unused member

parent 7e853c6f
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
modules/demux/adaptative/plumbing/StreamOutput.cpp
View file @ f7b1888a
...@@ -53,7 +53,6 @@ BaseStreamOutput::BaseStreamOutput(demux_t *demux, const StreamFormat &format, c ...@@ -53,7 +53,6 @@ BaseStreamOutput::BaseStreamOutput(demux_t *demux, const StreamFormat &format, c
AbstractStreamOutput(demux, format) AbstractStreamOutput(demux, format)
{ {
this->name = name; this->name = name;
seekable = true;
demuxer = NULL; demuxer = NULL;
CommandsFactory *factory = new CommandsFactory(); CommandsFactory *factory = new CommandsFactory();
...@@ -112,8 +111,7 @@ void BaseStreamOutput::pushBlock(block_t *block, bool b) ...@@ -112,8 +111,7 @@ void BaseStreamOutput::pushBlock(block_t *block, bool b)
bool BaseStreamOutput::seekAble() const bool BaseStreamOutput::seekAble() const
{ {
bool b_canswitch = switchAllowed(); return (demuxer && switchAllowed());
return (demuxer && seekable && b_canswitch);
} }
void BaseStreamOutput::setPosition(mtime_t nztime) void BaseStreamOutput::setPosition(mtime_t nztime)
......
modules/demux/adaptative/plumbing/StreamOutput.hpp
View file @ f7b1888a
...@@ -99,7 +99,6 @@ namespace adaptative ...@@ -99,7 +99,6 @@ namespace adaptative
protected: protected:
FakeESOut *fakeesout; /* to intercept/proxy what is sent from demuxstream */ FakeESOut *fakeesout; /* to intercept/proxy what is sent from demuxstream */
AbstractDemuxer *demuxer; AbstractDemuxer *demuxer;
bool seekable;
std::string name; std::string name;
private: private:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment