Add livestream conflict support

kodi-pvr · Sep 10, 2015 · 81e1456 · 81e1456
1 parent daee3fc
commit 81e1456
Show file tree

Hide file tree

Showing 8 changed files with 354 additions and 88 deletions.
diff --git a/pvr.hts/addon.xml.in b/pvr.hts/addon.xml.in
@@ -8,6 +8,7 @@
     <c-pluff version="0.1"/>
     <import addon="xbmc.pvr" version="3.0.0"/>
     <import addon="xbmc.codec" version="1.0.1"/>
+    <import addon="kodi.guilib" version="5.8.0"/>
   </requires>
   <extension
     point="xbmc.pvrclient"

diff --git a/pvr.hts/resources/language/resource.language.en_gb/strings.po b/pvr.hts/resources/language/resource.language.en_gb/strings.po
@@ -163,3 +163,57 @@ msgstr ""
 msgctxt "#30402"
 msgid "Unused subscription close delay"
 msgstr ""
+
+#empty strings from id 30403 to 30449
+
+#. Subscription states representation
+
+msgctxt "#30450"
+msgid "No free adapter available"
+msgstr ""
+
+msgctxt "#30451"
+msgid "Livestream aborted, adapter stolen by other subscription"
+msgstr ""
+
+msgctxt "#30452"
+msgid "Scrambled channel"
+msgstr ""
+
+msgctxt "#30453"
+msgid "No signal"
+msgstr ""
+
+msgctxt "#30454"
+msgid "Subscription error"
+msgstr ""
+
+msgctxt "#30455"
+msgid "Failed to hijack an adapter"
+msgstr ""
+
+msgctxt "#30456"
+msgid "User limit reached"
+msgstr ""
+
+#. Subscription conflict dialog
+
+msgctxt "#30457"
+msgid "Do you want to increase the priority to hijack an adapter?"
+msgstr ""
+
+msgctxt "#30458"
+msgid "WARNING: this can abort an active recording or livestream"
+msgstr ""
+
+msgctxt "#30459"
+msgid "Ignore"
+msgstr ""
+
+msgctxt "#30460"
+msgid "Increase priority"
+msgstr ""
+
+msgctxt "#30461"
+msgid "Subscription conflict"
+msgstr ""
diff --git a/src/HTSPDemuxer.cpp b/src/HTSPDemuxer.cpp
@@ -90,7 +90,7 @@ void CHTSPDemuxer::Abort0 ( void )
 }
 
 
-bool CHTSPDemuxer::Open ( uint32_t channelId, enum eSubscriptionWeight weight )
+bool CHTSPDemuxer::Open ( uint32_t channelId, uint32_t weight )
 {
   CLockObject lock(m_conn.Mutex());
   tvhdebug("demux open");
@@ -165,10 +165,6 @@ void CHTSPDemuxer::Abort ( void )
 bool CHTSPDemuxer::Seek 
   ( int time, bool _unused(backwards), double *startpts )
 {
-  CLockObject lock(m_conn.Mutex());
-  if (!m_subscription.IsActive())
-    return false;
-
   if (!m_subscription.SendSeek(time))
     return false;
 
@@ -191,18 +187,12 @@ bool CHTSPDemuxer::Seek
 
 void CHTSPDemuxer::Speed ( int speed )
 {
-  CLockObject lock(m_conn.Mutex());
-  if (!m_subscription.IsActive())
-    return;
   m_subscription.SendSpeed((uint32_t)speed);
 }
 
-void CHTSPDemuxer::Weight ( enum eSubscriptionWeight weight )
+void CHTSPDemuxer::Weight ( uint32_t weight )
 {
-  CLockObject lock(m_conn.Mutex());
-  if (!m_subscription.IsActive() || m_subscription.GetWeight() == (uint32_t)weight)
-    return;
-  m_subscription.SendWeight((uint32_t)weight);
+  m_subscription.SendWeight(weight);
 }
 
 PVR_ERROR CHTSPDemuxer::CurrentStreams ( PVR_STREAM_PROPERTIES *streams )