Browse Source

demux: adaptive: remove getDuration()

pull/91/head
Francois Cartegnie 7 years ago
parent
commit
167b3d148b
  1. 14
      modules/demux/adaptive/PlaylistManager.cpp
  2. 1
      modules/demux/adaptive/PlaylistManager.h

14
modules/demux/adaptive/PlaylistManager.cpp

@ -340,14 +340,6 @@ vlc_tick_t PlaylistManager::getFirstDTS() const
return mindts;
}
vlc_tick_t PlaylistManager::getDuration() const
{
if (playlist->isLive())
return 0;
else
return playlist->duration.Get();
}
bool PlaylistManager::setPosition(vlc_tick_t time)
{
bool ret = true;
@ -576,8 +568,8 @@ int PlaylistManager::doControl(int i_query, va_list args)
{
setBufferingRunState(false); /* stop downloader first */
const vlc_tick_t i_duration = getDuration();
if(i_duration == 0) /* == playlist->isLive() */
const vlc_tick_t i_duration = playlist->duration.Get();
if(i_duration == 0 || playlist->isLive())
{
setBufferingRunState(true);
return VLC_EGENERIC;
@ -730,7 +722,7 @@ void PlaylistManager::updateControlsContentType()
else
{
cached.b_live = false;
cached.i_length = getDuration();
cached.i_length = playlist->duration.Get();
}
}

1
modules/demux/adaptive/PlaylistManager.h

@ -75,7 +75,6 @@ namespace adaptive
virtual int doDemux(vlc_tick_t);
virtual bool setPosition(vlc_tick_t);
virtual vlc_tick_t getDuration() const;
vlc_tick_t getResumeTime() const;
vlc_tick_t getFirstDTS() const;

Loading…
Cancel
Save