summaryrefslogtreecommitdiff
path: root/hlsPlayerControl.cpp
diff options
context:
space:
mode:
authorchriszero <zerov83@gmail.com>2015-02-10 21:13:51 +0100
committerchriszero <zerov83@gmail.com>2015-02-10 21:13:51 +0100
commit158d1055599205ccca462f97c190994fa28af8f0 (patch)
tree02c5645bf48595d182eeb2dee81884173d634a03 /hlsPlayerControl.cpp
parent9b62917c4da85e5ec403792fd9a198b1cb005013 (diff)
downloadvdr-plugin-plex-158d1055599205ccca462f97c190994fa28af8f0.tar.gz
vdr-plugin-plex-158d1055599205ccca462f97c190994fa28af8f0.tar.bz2
Support for Plex Channels (Youtube, Vimeo, ZDF Mediathek, etc...)
Diffstat (limited to 'hlsPlayerControl.cpp')
-rw-r--r--hlsPlayerControl.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/hlsPlayerControl.cpp b/hlsPlayerControl.cpp
index b76fb63..dff1a30 100644
--- a/hlsPlayerControl.cpp
+++ b/hlsPlayerControl.cpp
@@ -12,9 +12,9 @@ cControl* cHlsPlayerControl::Create(plexclient::Video* Video)
{
if(!Video->m_pServer)
return NULL;
-
+
// Stop already playing stream
- cHlsPlayerControl* c = dynamic_cast<cHlsPlayerControl*>(cControl::Control(true));
+ cHlsPlayerControl* c = dynamic_cast<cHlsPlayerControl*>(cControl::Control(true));
if(c) {
c->Stop();
}
@@ -207,13 +207,13 @@ void cHlsPlayerControl::SeekTo(int offset)
void cHlsPlayerControl::JumpRelative(int offset)
{
- if (player)
+ if (player)
player->JumpRelative(offset);
}
void cHlsPlayerControl::ShowMode(void)
{
- //dsyslog("[plex]: '%s'\n", __FUNCTION__);
+ dsyslog("[plex]: '%s'\n", __FUNCTION__);
if (visible || Setup.ShowReplayMode && !cOsd::IsOpen()) {
bool Play, Forward;
int Speed;
@@ -241,7 +241,7 @@ bool cHlsPlayerControl::ShowProgress(bool Initial)
{
int Current, Total;
- if (GetIndex(Current, Total) && Total > 0) {
+ if (GetIndex(Current, Total)) {
if (!visible) {
displayReplay = Skins.Current()->DisplayReplay(modeOnly);
//displayReplay->SetMarks(player->Marks());
@@ -256,10 +256,14 @@ 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();