mirror of
https://github.com/PredatH0r/ChanSort.git
synced 2026-05-06 20:26:07 +02:00
Various changes and refactorings to integrate the suggested changes from pull-request https://github.com/PredatH0r/ChanSort/pull/358 to handle the distinction between IP-antenna, IP-cable, IP-sat and DVB-T, DVB-C, DVB-S for Panasonic TVs.
- SignalSource.IP is now treated as a broadcast system (distinguishing Analog/Dvb/Ip) and no longer a broadcast medium (like antenna/cable/sat). - SignalSource.Digital was renamed to DVB
This commit is contained in:
@@ -428,7 +428,7 @@ namespace ChanSort.Loader.Philips
|
||||
|
||||
if (!data.ContainsKey("UniqueID") || !int.TryParse(data["UniqueID"], out var uniqueId)) // UniqueId only exists in ChannelMap_105 and later
|
||||
uniqueId = rowId;
|
||||
var chan = new Channel(curList.SignalSource & SignalSource.MaskAdInput, rowId, uniqueId, setupNode);
|
||||
var chan = new Channel(curList.SignalSource & SignalSource.MaskBcast, rowId, uniqueId, setupNode);
|
||||
chan.OldProgramNr = -1;
|
||||
chan.IsDeleted = false;
|
||||
if (file.formatVersion == FormatVersion.RepairXml)
|
||||
@@ -436,9 +436,9 @@ namespace ChanSort.Loader.Philips
|
||||
else if (file.formatVersion == FormatVersion.ChannelMapXml)
|
||||
this.ParseChannelMapXml(data, chan);
|
||||
|
||||
if ((chan.SignalSource & SignalSource.MaskAdInput) == SignalSource.DvbT)
|
||||
if ((chan.SignalSource & SignalSource.MaskBcast) == SignalSource.DvbT)
|
||||
chan.ChannelOrTransponder = LookupData.Instance.GetDvbtTransponder(chan.FreqInMhz).ToString();
|
||||
else if ((chan.SignalSource & SignalSource.MaskAdInput) == SignalSource.DvbC)
|
||||
else if ((chan.SignalSource & SignalSource.MaskBcast) == SignalSource.DvbC)
|
||||
chan.ChannelOrTransponder = LookupData.Instance.GetDvbcChannelName(chan.FreqInMhz);
|
||||
|
||||
DataRoot.AddChannel(curList, chan);
|
||||
|
||||
Reference in New Issue
Block a user