Ticket #1485: add-tsid-n-nid-to-createmultiplexes-v3.diff

libs/libmythtv/siscan.cpp

@@ -1338 +1338 @@
 #ifdef USING_DVB
     if (GetDVBChannel())
     {
+        DVBSignalMonitor *sm = GetDVBSignalMonitor();
         // Try to read the actual values back from the card
         DVBTuning tuning;
         if (!GetDVBChannel()->GetTuningParams(tuning))
@@ -1348 +1349 @@
             mplexid = ChannelUtil::CreateMultiplex(
                 (*transport).SourceID,      (*transport).standard,
                 tuning.Frequency(),         tuning.ModulationDB(),
-                -1 /* transport id */,      -1 /* network id */,
+                sm->GetCurrentTransportID(),
+                sm->GetCurrentNetworkID(),
                 -1 /* symbol rate */,       tuning.BandwidthChar(),
                 -1 /* polarity */,          tuning.InversionChar(),
                 tuning.TransmissionModeChar(),
@@ -1359 +1361 @@
             mplexid = ChannelUtil::CreateMultiplex(
                 (*transport).SourceID,      (*transport).standard,
                 tuning.Frequency(),         (*transport).ModulationDB(),
-                -1 /* transport id */,      -1 /* network id */);
+                sm->GetCurrentTransportID(),
+                sm->GetCurrentNetworkID());
     }
 #endif // USING_DVB