Ticket #743: mpegstreamdata-cleanup.diff

libs/libmythtv/mpeg/mpegstreamdata.cpp

@@ -370 +370 @@
         case TableID::PAT:
         { 
             SetVersionPAT(psip.Version());
+            ProgramAssociationTable *pat =
+                new ProgramAssociationTable(psip);
             if (_cache_tables)
-            {
-                ProgramAssociationTable *pat =
-                    new ProgramAssociationTable(psip);
                 CachePAT(pat);
-                emit UpdatePAT(pat);
-                if ((_desired_program >= 0) && CreatePATSingleProgram(*pat))
-                    emit UpdatePATSingleProgram(PATSingleProgram());
-            }
-            else
-            {
-                ProgramAssociationTable pat(psip);
-                emit UpdatePAT(&pat);
-                if ((_desired_program >= 0) && CreatePATSingleProgram(pat))
-                    emit UpdatePATSingleProgram(PATSingleProgram());
-            }
+            emit UpdatePAT(pat);
+            if ((_desired_program >= 0) && CreatePATSingleProgram(*pat))
+                emit UpdatePATSingleProgram(PATSingleProgram());
+            if (!_cache_tables)
+                delete pat;
             return true;
         }
         case TableID::PMT:
         {
             SetVersionPMT(psip.TableIDExtension(), psip.Version());
+            ProgramMapTable *pmt = new ProgramMapTable(psip);
             if (_cache_tables)
-            {
-                ProgramMapTable *pmt = new ProgramMapTable(psip);
                 CachePMT(pmt->ProgramNumber(), pmt);
-                emit UpdatePMT(pmt->ProgramNumber(), pmt);
-                if (pid == _pid_pmt_single_program)
-                {
-                    if (CreatePMTSingleProgram(*pmt))
-                        emit UpdatePMTSingleProgram(PMTSingleProgram());
-                }
-            }
-            else
+            emit UpdatePMT(pmt->ProgramNumber(), pmt);
+            if (pid == _pid_pmt_single_program)
             {
-                ProgramMapTable pmt(psip);
-                emit UpdatePMT(pmt.ProgramNumber(), &pmt);
-                if (pid == _pid_pmt_single_program)
-                {
-                    if (CreatePMTSingleProgram(pmt))
-                        emit UpdatePMTSingleProgram(PMTSingleProgram());
-                }
+                if (CreatePMTSingleProgram(*pmt))
+                    emit UpdatePMTSingleProgram(PMTSingleProgram());
             }
+            if (!_cache_tables)
+                delete pmt;
             return true;
         }
     }