Ticket #1485: head_signalmonitor-support-current-tsid-n-netid.diff

libs/libmythtv/dtvsignalmonitor.cpp

@@ -36 +36 @@
       matchingNIT(tr("Matching")+" NIT", "matching_nit", 1, true, 0, 1, 0),
       matchingSDT(tr("Matching")+" SDT", "matching_sdt", 1, true, 0, 1, 0),
       majorChannel(-1), minorChannel(-1), programNumber(-1),
+      currentNetworkID(0), currentTransportID(0),
       ignoreEncrypted(true),
       error("")
 {
@@ -353 +354 @@
     DBG_SM("SetSDT()", QString("tsid = %1 orig_net_id = %2")
            .arg(sdt->TSID()).arg(sdt->OriginalNetworkID()));
     AddFlags(kDTVSigMon_SDTSeen);
+    currentNetworkID = sdt->OriginalNetworkID();
+    currentTransportID = sdt->TSID();
     if (!GetDVBStreamData())
         return;
 }

libs/libmythtv/dtvsignalmonitor.h

@@ -34 +34 @@
     void SetProgramNumber(int progNum);
     int  GetProgramNumber() const { return programNumber; }
 
+    uint GetCurrentNetworkID(void)   const  { return currentNetworkID; }
+    uint GetCurrentTransportID(void) const  { return currentTransportID; }
+
     void SetFTAOnly(bool fta)    { ignoreEncrypted = fta;  }
     bool GetFTAOnly() const      { return ignoreEncrypted; }
 
@@ -106 +109 @@
     int                majorChannel;
     int                minorChannel;
     int                programNumber;
+    uint               currentNetworkID;
+    uint               currentTransportID;
     bool               ignoreEncrypted;
     QString            error;
 };