summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchriszero <zerov83@gmail.com>2015-03-15 12:17:26 +0100
committerchriszero <zerov83@gmail.com>2015-03-15 12:17:26 +0100
commit2788b2cbe68b4b481f3a080658cc433d2927b4fb (patch)
tree988cfa0e026d9f687e959e851989ea76b5c5c4ad
parent5989d80e8022f5b5796ce168919e49f9400475b2 (diff)
downloadvdr-plugin-plex-2788b2cbe68b4b481f3a080658cc433d2927b4fb.tar.gz
vdr-plugin-plex-2788b2cbe68b4b481f3a080658cc433d2927b4fb.tar.bz2
Fixes display of total time for webvideos (Vimeo, Youtube, ...)
-rw-r--r--hlsPlayer.cpp2
-rw-r--r--hlsPlayerControl.cpp4
2 files changed, 1 insertions, 5 deletions
diff --git a/hlsPlayer.cpp b/hlsPlayer.cpp
index 1c1f4a3..ca1d91f 100644
--- a/hlsPlayer.cpp
+++ b/hlsPlayer.cpp
@@ -608,7 +608,7 @@ void cHlsPlayer::Stop(void)
double cHlsPlayer::FramesPerSecond(void)
{
- return m_Video.m_Media.m_VideoFrameRate ? m_Video.m_Media.m_VideoFrameRate : DEFAULTFRAMESPERSECOND;
+ return m_Video.m_Media.m_VideoFrameRate > 0 ? m_Video.m_Media.m_VideoFrameRate : DEFAULTFRAMESPERSECOND;
}
void cHlsPlayer::JumpRelative(int seconds)
diff --git a/hlsPlayerControl.cpp b/hlsPlayerControl.cpp
index 309c257..360e3ec 100644
--- a/hlsPlayerControl.cpp
+++ b/hlsPlayerControl.cpp
@@ -262,14 +262,10 @@ bool cHlsPlayerControl::ShowProgress(bool Initial)
int Index = Total;
if (Setup.ShowRemainingTime)
Index = Current - Index;
- if(Total == 0) // Webstreams
- Index = Current;
displayReplay->SetTotal(IndexToHMSF(Index, false, FramesPerSecond()));
if (!Initial)
displayReplay->Flush();
}
- if(Total == 0) // Webstreams
- Total = Current;
displayReplay->SetProgress(Current, Total);
if (!Initial)
displayReplay->Flush();