Ticket #1783: streamdata_leak_fix.2.diff

libs/libmythtv/dtvsignalmonitor.cpp

@@ -222 +222 @@
 
 void DTVSignalMonitor::SetStreamData(MPEGStreamData *data)
 {
-    if (stream_data)
-        stream_data->RemoveMPEGListener(this);
-
     ATSCStreamData *atsc = GetATSCStreamData();
     DVBStreamData  *dvb  = GetDVBStreamData();
     if (atsc)
@@ -235 +232 @@
     if (dvb)
         dvb->RemoveDVBMainListener(this);
 
+    if (stream_data)
+    {
+        stream_data->RemoveMPEGListener(this);
+        if (!stream_data->HasMPEGListener())
+            delete stream_data;
+    }
+
     stream_data = data;
     if (!data)
         return;

libs/libmythtv/mpeg/mpegstreamdata.cpp

@@ -1131 +1131 @@
     }
 }
 
+bool MPEGStreamData::HasMPEGListener()
+{
+    QMutexLocker locker(&_listener_lock);
+
+    if (_mpeg_listeners.size())
+        return true;
+    return false;
+}
+
 void MPEGStreamData::AddMPEGSPListener(MPEGSingleProgramStreamListener *val)
 {
     QMutexLocker locker(&_listener_lock);

libs/libmythtv/mpeg/mpegstreamdata.h

@@ -157 +157 @@
     // "signals"
     void AddMPEGListener(MPEGStreamListener*);
     void RemoveMPEGListener(MPEGStreamListener*);
+    bool HasMPEGListener();
     void UpdatePAT(const ProgramAssociationTable*);
     void UpdateCAT(const ConditionalAccessTable*);
     void UpdatePMT(uint program_num, const ProgramMapTable*);