Ticket #4529: myth_eit_ignoreencrypted_r15496.diff

libs/libmythtv/dtvsignalmonitor.cpp

@@ -46 +46 @@
       detectedNetworkID(0), detectedTransportID(0),
       programNumber(-1),
       last_pat_crc(-1),
-      error("")
+      error(""),
+      ignore_encrypted(false)
 {
 }
 
@@ -352 +353 @@
     if ((hasVideo >= GetStreamData()->GetVideoStreamsRequired()) &&
         (hasAudio >= GetStreamData()->GetAudioStreamsRequired()))
     {
-        if (pmt->IsEncrypted())
+        if (pmt->IsEncrypted() && !ignore_encrypted)
             AddFlags(kDTVSigMon_WaitForCrypt);
 
         AddFlags(kDTVSigMon_PMTMatch);

libs/libmythtv/dtvsignalmonitor.h

@@ -106 +106 @@
     void HandleNIT(const NetworkInformationTable*);
     void HandleSDT(uint, const ServiceDescriptionTable*);
 
+    void IgnoreEncrypted(bool ignore) { ignore_encrypted = ignore; }
+
   protected:
     DTVChannel *GetDTVChannel(void);
     void UpdateMonitorValues(void);
@@ -144 +146 @@
     int64_t           last_pat_crc;
 
     QString            error;
+
+    bool ignore_encrypted;
 };
 
 #endif // DTVSIGNALMONITOR_H

libs/libmythtv/tv_rec.cpp

@@ -3742 +3742 @@
             {
                 GetDTVSignalMonitor()->GetStreamData()->
                     SetVideoStreamsRequired(0);
+                GetDTVSignalMonitor()->IgnoreEncrypted(true);
             }
 
             SetFlags(kFlagSignalMonitorRunning);