[Omega] Fix TV channels stuttering after wake from suspend - take 2

ksooo · Nov 14, 2023 · fe1ab42 · fe1ab42
1 parent 842826f
commit fe1ab42
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/pvr.hts/addon.xml.in b/pvr.hts/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.hts"
-  version="21.1.1"
+  version="21.1.2"
   name="Tvheadend HTSP Client"
   provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.hts/changelog.txt b/pvr.hts/changelog.txt
@@ -1,3 +1,6 @@
+v21.1.2
+- Fix TV channels stuttering after wake from suspend - take 2
+
 v21.1.1
 - Fix TV channels stuttering after wake from suspend
 

diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
@@ -1881,10 +1881,6 @@ void CTvheadend::SyncInitCompleted()
     return;
 
   /* Rebuild state */
-  for (auto* dmx : m_dmx)
-    dmx->RebuildState();
-
-  m_vfs->RebuildState();
   m_timeRecordings.RebuildState();
   m_autoRecordings.RebuildState();
 
@@ -2021,6 +2017,11 @@ void CTvheadend::SyncEpgCompleted()
 
 void CTvheadend::SyncCompleted()
 {
+  for (auto* dmx : m_dmx)
+    dmx->RebuildState();
+
+  m_vfs->RebuildState();
+
   SyncEpgCompleted();
 
   m_asyncState.SetState(ASYNC_DONE);

diff --git a/src/tvheadend/HTSPDemuxer.cpp b/src/tvheadend/HTSPDemuxer.cpp
@@ -62,6 +62,8 @@ void HTSPDemuxer::RebuildState()
     Logger::Log(LogLevel::LEVEL_DEBUG, "demux re-starting stream");
 
     std::unique_lock<std::recursive_mutex> lock(m_conn.Mutex());
+
+    m_subscription.SendUnsubscribe(lock);
     m_subscription.SendSubscribe(lock, 0, 0, true);
     m_subscription.SendSpeed(lock, 0, true);