From 31e3ce3d0e9866a62b2d381f2ede9319840c9dea Mon Sep 17 00:00:00 2001 From: chriszero Date: Thu, 19 Feb 2015 20:52:27 +0100 Subject: typo --- Config.h | 2 +- SubscriptionManager.cpp | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Config.h b/Config.h index a32bbcf..d6412e7 100644 --- a/Config.h +++ b/Config.h @@ -28,7 +28,7 @@ public: std::string s_password; bool HideMainMenuEntry; - bool UseCustomTranscodeProfile = false; + bool UseCustomTranscodeProfile; std::string GetUUID(); void SetUUID(const char* uuid); diff --git a/SubscriptionManager.cpp b/SubscriptionManager.cpp index 47bd6f2..033776a 100644 --- a/SubscriptionManager.cpp +++ b/SubscriptionManager.cpp @@ -155,21 +155,21 @@ std::string SubscriptionManager::GetTimelineXml() else msg << "playing"; msg << "\" time=\"" << current << "\" type=\"video\""; - - msg << " duration=\"" << total << "\""; - msg << " seekRange=\"0-" << total << "\""; - msg << " controllable=\"true\""; - msg << " machineIdentifier=\"" << (pVid ? pVid->m_Server.GetUuid() : "") << "\""; - msg << " protocol=\"http\""; - msg << " address=\"" << (pVid ? pVid->m_Server.GetIpAdress() : "") << "\""; - msg << " port=\"" << (pVid ? pVid->m_Server.GetPort() : 0) << "\""; - msg << " guid=\"" << Config::GetInstance().GetUUID() << "\""; - msg << " containerKey=\"" << (pVid ? pVid->m_sKey : "/library/metadata/900000") << "\""; - msg << " key=\"" << (pVid ? pVid->m_sKey : "/library/metadata/900000") << "\""; - msg << " ratingKey=\"" << (pVid ? pVid->m_iRatingKey : 900000) << "\""; - msg << " volume=\"" << m_pStatus->Volume << "\""; - msg << " shuffle=\"false\""; - + if (!m_pStatus->PlayerStopped) { + msg << " duration=\"" << total << "\""; + msg << " seekRange=\"0-" << total << "\""; + msg << " controllable=\"true\""; + msg << " machineIdentifier=\"" << (pVid ? pVid->m_Server.GetUuid() : "") << "\""; + msg << " protocol=\"http\""; + msg << " address=\"" << (pVid ? pVid->m_Server.GetIpAdress() : "") << "\""; + msg << " port=\"" << (pVid ? pVid->m_Server.GetPort() : 0) << "\""; + msg << " guid=\"" << Config::GetInstance().GetUUID() << "\""; + msg << " containerKey=\"" << (pVid ? pVid->m_sKey : "/library/metadata/900000") << "\""; + msg << " key=\"" << (pVid ? pVid->m_sKey : "/library/metadata/900000") << "\""; + msg << " ratingKey=\"" << (pVid ? pVid->m_iRatingKey : 900000) << "\""; + msg << " volume=\"" << m_pStatus->Volume << "\""; + msg << " shuffle=\"false\""; + } msg << "/>"; return msg.str(); } @@ -255,6 +255,7 @@ void cSubscriberStatus::Replaying(const cControl* DvbPlayerControl, const char* pVideo = &hlsControl->m_Video; } else { pVideo = NULL; + pControl = NULL; } SubscriptionManager::GetInstance().Notify(); -- cgit v1.2.3