Use transport id as service id in MPTS channels

In mythtv-setup, it is possible to create MPTS channels that
can record the complete transport stream without any pid filtering.
In the channel list, the service ID is used as channel number when
there is no logical channel number information present.
For the MPTS channels, who do not have a service id,  this means
that the channel number must always be entered manually, both on
an initial scan and on a rescan.
This fix uses the transport stream ID as the service ID; the default
channel number of the MPTS channels is then the transport stream ID.

N.B. It is possible that the transport stream id does conflict
with either a logical channel number or a service id but when that
happens the channel number conflict resultion dialogs are still there.

mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp

@@ -1523,6 +1523,10 @@ ScanDTVTransportList ChannelScanSM::GetChannelList(bool addFullTS) const
                 dbchan_it = pnum_to_dbchan.begin();
                 ChannelInsertInfo info = *dbchan_it;
 
+                // Use transport stream ID as (fake) service ID
+                // to use in callsign and as channel number
+                info.m_service_id = info.m_pat_tsid;
+
                 if (tuner_type == DTVTunerType::kTunerTypeASI)
                     info.m_callsign = QString("MPTS_%1")
                                     .arg(CardUtil::GetDisplayName(cardid));
@@ -1533,8 +1537,6 @@ ScanDTVTransportList ChannelScanSM::GetChannelList(bool addFullTS) const
                 else if (info.m_atsc_major_channel > 0)
                     info.m_callsign =
                         QString("MPTS_%1").arg(info.m_atsc_major_channel);
-                else if (info.m_pat_tsid > 0)
-                    info.m_callsign = QString("MPTS_%1").arg(info.m_pat_tsid);
                 else if (info.m_service_id > 0)
                     info.m_callsign = QString("MPTS_%1").arg(info.m_service_id);
                 else if (!info.m_chan_num.isEmpty())
@@ -1543,9 +1545,9 @@ ScanDTVTransportList ChannelScanSM::GetChannelList(bool addFullTS) const
                     info.m_callsign = "MPTS_UNKNOWN";
 
                 info.m_service_name = info.m_callsign;
-                info.m_service_id = 0;
                 info.m_atsc_minor_channel = 0;
                 info.m_format = "MPTS";
+                info.m_use_on_air_guide = false;
                 item.m_channels.push_back(info);
             }