clear streams when closing the demuxer, not on each channel switch

Jalle19 · Jan 4, 2014 · d764198 · d764198
1 parent 2e82c09
commit d764198
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/addons/pvr.hts/src/HTSPDemux.cpp b/addons/pvr.hts/src/HTSPDemux.cpp
@@ -68,6 +68,7 @@ void CHTSPDemux::Close()
   if (m_session->IsConnected() && m_subs > 0)
     SendUnsubscribe(m_subs);
   m_subs = 0;
+  m_streams.Clear();
 }
 
 void CHTSPDemux::SetSpeed(int speed)
@@ -400,8 +401,6 @@ void CHTSPDemux::ParseSubscriptionStart(htsmsg_t *m)
 void CHTSPDemux::ParseSubscriptionStop(htsmsg_t *m)
 {
   XBMC->Log(LOG_INFO, "%s - subscription ended on adapter %s", __FUNCTION__, m_SourceInfo.si_adapter.c_str());
-  CLockObject lock(m_mutex);
-  m_streams.Clear();
 
   /* reset the signal status */
   m_Quality.fe_status = "";

diff --git a/addons/pvr.vdr.vnsi/src/VNSIDemux.cpp b/addons/pvr.vdr.vnsi/src/VNSIDemux.cpp
@@ -60,6 +60,12 @@ void cVNSIDemux::Abort()
   m_streams.Clear();
 }
 
+void cVNSIDemux::Close()
+{
+  m_streams.Clear();
+  cVNSISession::Close();
+}
+
 DemuxPacket* cVNSIDemux::Read()
 {
   if(ConnectionLost())
@@ -219,7 +225,6 @@ bool cVNSIDemux::SwitchChannel(const PVR_CHANNEL &channelinfo)
   }
 
   m_channelinfo = channelinfo;
-  m_streams.Clear();
   m_MuxPacketSerial = 0;
   m_ReferenceTime = 0;
   m_BufferTimeStart = 0;

diff --git a/addons/pvr.vdr.vnsi/src/VNSIDemux.h b/addons/pvr.vdr.vnsi/src/VNSIDemux.h
@@ -47,6 +47,7 @@ class cVNSIDemux : public cVNSISession
 
   bool OpenChannel(const PVR_CHANNEL &channelinfo);
   void Abort();
+  void Close();
   bool GetStreamProperties(PVR_STREAM_PROPERTIES* props);
   DemuxPacket* Read();
   bool SwitchChannel(const PVR_CHANNEL &channelinfo);