From e1e2c8d305d33b7b794ee63abe22c237e17a71bf Mon Sep 17 00:00:00 2001 From: Horst Beham Date: Thu, 27 Aug 2020 12:48:37 +0200 Subject: [PATCH] - LG WebOS 5: added support for lists with analog cable/antenna channels - Philips: added support for analog channel lists (Repair/CM_* format) - GB Freesat reference lists updated - Hiding "Favorite" column when the list doesn't support favorites --- .../GcJsonSerializer.cs | 78 ++++-- .../ChanSort.Loader.PhilipsXml/Serializer.cs | 18 +- source/ChanSort/ChanSort.csproj | 30 +++ source/ChanSort/MainForm.cs | 2 + .../ReferenceLists/gb_astra282E_freesat.txt | 223 ++++++++---------- ..._astra282E_freesat_EastAnglia_StartAt1.txt | 187 +++++++++++++++ source/changelog.md | 9 +- 7 files changed, 393 insertions(+), 154 deletions(-) create mode 100644 source/ChanSort/ReferenceLists/gb_astra282E_freesat_EastAnglia_StartAt1.txt diff --git a/source/ChanSort.Loader.GlobalClone/GcJsonSerializer.cs b/source/ChanSort.Loader.GlobalClone/GcJsonSerializer.cs index bf826773..9c4ef53e 100644 --- a/source/ChanSort.Loader.GlobalClone/GcJsonSerializer.cs +++ b/source/ChanSort.Loader.GlobalClone/GcJsonSerializer.cs @@ -30,8 +30,10 @@ public GcJsonSerializer(string filename, string content) : base(filename) this.Features.CanSkipChannels = true; this.Features.CanLockChannels = true; + this.DataRoot.AddChannelList(new ChannelList(SignalSource.AnalogT | SignalSource.Tv | SignalSource.Data, "Analog Antenna")); this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbT | SignalSource.Tv | SignalSource.Data, "DVB-T TV")); this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbT | SignalSource.Radio, "DVB-T Radio")); + this.DataRoot.AddChannelList(new ChannelList(SignalSource.AnalogC | SignalSource.Tv | SignalSource.Data, "Analog Cable")); this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbC | SignalSource.Tv | SignalSource.Data, "DVB-C TV")); this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbC | SignalSource.Radio, "DVB-C Radio")); this.DataRoot.AddChannelList(new ChannelList(SignalSource.DvbS | SignalSource.Tv | SignalSource.Data, "DVB-S TV")); @@ -122,47 +124,71 @@ private void LoadChannels() foreach (var node in this.doc["channelList"]) { var ch = new GcChannel(0, i, node); - ch.PcrPid = (int) node["pcrPid"]; - ch.IsDisabled = (bool) node["disabled"]; - ch.FreqInMhz = (int) node["frequency"]; - if (ch.FreqInMhz >= 100000 && ch.FreqInMhz < 1000000) // DVBS is given in MHz, DVBC/T in kHz - ch.FreqInMhz /= 1000; - ch.AudioPid = (int) node["audioPid"]; - - ch.Source = (string) node["sourceIndex"]; + + ch.Source = (string)node["sourceIndex"]; if (ch.Source == "SATELLITE DIGITAL") ch.SignalSource |= SignalSource.DvbS; else if (ch.Source == "CABLE DIGITAL") ch.SignalSource |= SignalSource.DvbC; - else if (ch.Source.Contains("DIGITAL")) // not seen yet. maybe DIGITAL ANTENNA? + else if (ch.Source.Contains("ANTENNA DIGITAL")) ch.SignalSource |= SignalSource.DvbT; + else if (ch.Source.Contains("ANTENNA ANALOG")) + ch.SignalSource |= SignalSource.AnalogT; + else if (ch.Source.Contains("CABLE ANALOG")) + ch.SignalSource |= SignalSource.AnalogC; + else + { + // TODO: add some log for skipped channels + continue; + } + ch.IsDisabled = (bool) node["disabled"]; ch.Skip = (bool) node["skipped"]; + ch.Lock = (bool)node["locked"]; ch.Hidden = (bool) node["Invisible"]; - ch.IsDeleted = (bool) node["deleted"]; - //if (int.TryParse((string) node["satelliteId"], out var satId)) - ch.Satellite = (string) node["satelliteId"]; //this.DataRoot.Satellites.TryGet(satId); - ch.Encrypted = (bool) node["scrambled"]; var nameBytes = Convert.FromBase64String((string) node["chNameBase64"]); dec.GetChannelNames(nameBytes, 0, nameBytes.Length, out var name, out var shortName); ch.Name = name; ch.ShortName = shortName; - ch.VideoPid = (int) node["videoPid"]; - var transSystem = (string) node["transSystem"]; - var tpId = (string) node["tpId"]; - if (tpId != null && tpId.Length == 10) - ch.Transponder = this.DataRoot.Transponder.TryGet((int.Parse(tpId.Substring(0, 4)) << 16) + int.Parse(tpId.Substring(4))); // satId + freq, e.g. 0192126041 - ch.TransportStreamId = (int) node["TSID"]; + ch.OldProgramNr = ch.IsDeleted ? -1 : (int) node["majorNumber"]; - ch.ServiceType = (int) node["serviceType"]; - ch.Lock = (bool) node["locked"]; if (string.IsNullOrWhiteSpace(ch.Name)) ch.Name = (string)node["channelName"]; - ch.ServiceId = (int) node["SVCID"]; - if (ch.ServiceId == 0) - ch.ServiceId = (int) node["programNum"]; - ch.OriginalNetworkId = (int) node["ONID"]; - ch.SignalSource |= LookupData.Instance.IsRadioTvOrData(ch.ServiceType); + + ch.TransportStreamId = (int)node["TSID"]; + + if ((ch.SignalSource & SignalSource.Digital) != 0) + { + var transSystem = (string) node["transSystem"]; + + //if (int.TryParse((string) node["satelliteId"], out var satId)) + ch.Satellite = (string) node["satelliteId"]; //this.DataRoot.Satellites.TryGet(satId); + ch.Encrypted = (bool) node["scrambled"]; + ch.FreqInMhz = (int) node["frequency"]; + if (ch.FreqInMhz >= 100000 && ch.FreqInMhz < 1000000) // DVBS is given in MHz, DVBC/T in kHz + ch.FreqInMhz /= 1000; + + var tpId = (string) node["tpId"]; + if (tpId != null && tpId.Length == 10) + ch.Transponder = this.DataRoot.Transponder.TryGet((int.Parse(tpId.Substring(0, 4)) << 16) + int.Parse(tpId.Substring(4))); // satId + freq, e.g. 0192126041 + + ch.IsDeleted = (bool) node["deleted"]; + ch.PcrPid = (int) node["pcrPid"]; + ch.AudioPid = (int) node["audioPid"]; + ch.VideoPid = (int) node["videoPid"]; + ch.ServiceId = (int) node["SVCID"]; + if (ch.ServiceId == 0) + ch.ServiceId = (int) node["programNum"]; + ch.ServiceType = (int) node["serviceType"]; + ch.OriginalNetworkId = (int) node["ONID"]; + ch.SignalSource |= LookupData.Instance.IsRadioTvOrData(ch.ServiceType); + } + else + { + ch.ChannelOrTransponder = (string) node["TSID"]; + ch.SignalSource |= SignalSource.Tv; + } + if ((ch.OldProgramNr & 0x4000) != 0) { diff --git a/source/ChanSort.Loader.PhilipsXml/Serializer.cs b/source/ChanSort.Loader.PhilipsXml/Serializer.cs index 608c1c0b..76c622a2 100644 --- a/source/ChanSort.Loader.PhilipsXml/Serializer.cs +++ b/source/ChanSort.Loader.PhilipsXml/Serializer.cs @@ -49,6 +49,7 @@ This loader supports 2 different kinds of XML files from Philips. */ class Serializer : SerializerBase { + private readonly ChannelList analogChannels = new ChannelList(SignalSource.DvbCT, "Analog C/T"); private readonly ChannelList dvbctChannels = new ChannelList(SignalSource.DvbCT, "DVB-C/T"); private readonly ChannelList satChannels = new ChannelList(SignalSource.DvbS, "DVB-S"); private readonly ChannelList allSatChannels = new ChannelList(SignalSource.DvbS, "DVB-S all"); @@ -73,6 +74,7 @@ public Serializer(string inputFile) : base(inputFile) this.Features.AllowGapsInFavNumbers = false; this.Features.CanEditFavListNames = true; + this.DataRoot.AddChannelList(this.analogChannels); this.DataRoot.AddChannelList(this.dvbctChannels); this.DataRoot.AddChannelList(this.satChannels); this.DataRoot.AddChannelList(this.allSatChannels); @@ -90,6 +92,15 @@ public Serializer(string inputFile) : base(inputFile) list.VisibleColumnFieldNames.Remove("Provider"); } + this.analogChannels.VisibleColumnFieldNames.Remove(nameof(ChannelInfo.OriginalNetworkId)); + this.analogChannels.VisibleColumnFieldNames.Remove(nameof(ChannelInfo.TransportStreamId)); + this.analogChannels.VisibleColumnFieldNames.Remove(nameof(ChannelInfo.ServiceId)); + this.analogChannels.VisibleColumnFieldNames.Remove(nameof(ChannelInfo.SymbolRate)); + this.analogChannels.VisibleColumnFieldNames.Remove(nameof(ChannelInfo.ChannelOrTransponder)); + this.analogChannels.VisibleColumnFieldNames.Remove(nameof(ChannelInfo.NetworkName)); + this.analogChannels.VisibleColumnFieldNames.Remove(nameof(ChannelInfo.NetworkOperator)); + + this.favChannels.IsMixedSourceFavoritesList = true; } #endregion @@ -266,6 +277,9 @@ private ChannelList DetectFormatAndFeatures(FileData file, XmlNode node) ChannelList chList = null; switch (medium) { + case "analog": + chList = this.analogChannels; + break; case "dvbc": case "dvbt": chList = this.dvbctChannels; @@ -361,7 +375,9 @@ private void ParseChannelFormat2(Dictionary data, Channel chan) chan.Name = data.TryGet("name"); chan.RawName = chan.Name; chan.FreqInMhz = ParseInt(data.TryGet("frequency")); - if (chan.FreqInMhz > 2000) + //if ((chan.SignalSource & SignalSource.Analog) != 0) + // chan.FreqInMhz /= 16; + if (chan.FreqInMhz > 1200) chan.FreqInMhz /= 1000; chan.ServiceId = ParseInt(data.TryGet("serviceID")); chan.OriginalNetworkId = ParseInt(data.TryGet("ONID")); diff --git a/source/ChanSort/ChanSort.csproj b/source/ChanSort/ChanSort.csproj index 19d49c63..786e7ef6 100644 --- a/source/ChanSort/ChanSort.csproj +++ b/source/ChanSort/ChanSort.csproj @@ -550,6 +550,36 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + diff --git a/source/ChanSort/MainForm.cs b/source/ChanSort/MainForm.cs index 96fc0a48..af6250e8 100644 --- a/source/ChanSort/MainForm.cs +++ b/source/ChanSort/MainForm.cs @@ -1489,6 +1489,8 @@ private bool GetGridColumnVisibility(GridColumn col) return false; var source = list.SignalSource; + if (col == this.colFavorites) return this.DataRoot.SupportedFavorites != 0; + if (col == this.colOutFav) return this.DataRoot.SupportedFavorites != 0; if (col == this.colPrNr) return this.subListIndex > 0; if (col == this.colChannelOrTransponder) return (source & SignalSource.Sat) == 0; if (col == this.colShortName) return (source & SignalSource.Digital) != 0; diff --git a/source/ChanSort/ReferenceLists/gb_astra282E_freesat.txt b/source/ChanSort/ReferenceLists/gb_astra282E_freesat.txt index a5be6d77..672d137e 100644 --- a/source/ChanSort/ReferenceLists/gb_astra282E_freesat.txt +++ b/source/ChanSort/ReferenceLists/gb_astra282E_freesat.txt @@ -1,125 +1,113 @@ -101;BBC One N West;2-2047-6441 +101;BBC One East W;2-2045-6351 102;BBC Two HD;2-2050-6940 -103;ITV;2-2044-10080 -104;Channel 4;2-2041-9214 +103;ITV;2-2059-12110 +104;Channel 4;2-2041-9212 105;Channel 5 HD;2-2057-7750 106;BBC One HD;2-2050-6941 107;BBC Four HD;2-2061-8931 -108;BBC Two Eng;2-2045-6302 +108;BBC ScotlandHD;2-2061-8924 109;BBC ALBA;2-2047-6423 -110;BBC Four;2-2045-6316 -112;ITV +1;2-2054-10255 +110;BBC Two;2-2045-6302 +111;ITV HD;2-2064-20840 +112;ITV +1;2-2044-10091 113;ITV2;2-2044-10070 114;ITV2+1;2-2053-10165 115;ITV3;2-2054-10260 116;ITV3+1;2-2054-10261 117;ITV4;2-2044-10072 118;ITVBe;2-2044-10075 -119;ITV HD;2-2063-20740 -120;S4C Digidol;2-2112-55295 -121;Channel 4 + 1;2-2042-8314 -122;E4;2-2042-8305 -123;E4 + 1;2-2042-8300 -124;More4;2-2042-8340 +119;ITVBe+1;2-2053-10139 +120;S4C HD;2-2116-52565 +121;Channel 4 + 1;2-2056-8312 +122;E4;2-2041-9241 +123;E4 + 1;2-2056-8300 +124;More4;2-2056-8340 125;More4 + 1;2-2041-9230 -126;Channel 4 HD;2-2068-21200 127;4seven;2-2068-21250 128;Channel 5 +1;2-2057-7720 129;5 USA;2-2057-7710 130;5 USA +1;2-2057-7711 131;5STAR;2-2057-7715 -132;5STAR+1;2-2057-7717 -133;Channel 5+24;2-2057-7716 +132;Paramount;2-2057-7760 +133;5SELECT;2-2057-7716 134;CBS Drama;2-2112-50903 135;CBS Reality;2-2112-55214 136;CBS Reality +1;2-2112-55217 -137;CBS Action;2-2112-55209 -137;CBS Action;2-2112-55209 +137;CBS Justice;2-2112-55209 138;horror channel;2-2112-55202 139;horror ch+1;2-2112-55218 140;BET;2-2069-51081 -141;Spike;2-2057-7730 -142;True Ent;2-2110-53375 -143;True Crime;2-2113-53700 +141;5Star+1;2-2057-7717 +142;Sony Channel;2-2110-53375 144;Pick;2-2026-4751 -145;Challenge;2-2007-6031 -146;Challenge +1;2-2007-6026 -149;Food Network;2-2116-52500 -150;Travel Channel;2-2096-54102 -151;Food Network+1;2-2116-52510 -152;Travel Ch +1;2-2107-52100 -153;True Drama;2-2110-53380 -154;truTV;2-2096-54101 -155;ITV4+1;2-2044-10073 -156;True Crime +1;2-2110-53305 -158;ITVBe+1;2-2053-10139 -159;Pick +1;2-2026-5107 -160;PBS America;2-2116-52505 -161;YourTV;2-2116-52540 -162;Drama;2-2022-6522 -163;Yesterday;2-2022-6505 -164;Really;2-2022-6523 +145;Pick +1;2-2026-5107 +146;Challenge;2-2007-6031 +147;Challenge +1;2-2007-6026 +148;Food Network;2-2035-2910 +149;Food Network+1;2-2035-2912 +150;DMAX;2-2035-2916 +151;DMAX+1;2-2035-2905 +152;Sony Channel+1;2-2110-53380 +154;ITV4+1;2-2044-10073 +155;PBS America;2-2111-53270 +157;Dave;2-2022-6506 +158;Drama;2-2022-6522 +159;Yesterday;2-2022-6505 +160;Really;2-2111-53225 +161;SHOWCASE;2-2065-50305 +162;BLAZE;2-2065-50350 +164;Together TV;2-2026-4753 +165;Forces TV;2-2007-6033 +166;Home;2-2111-53221 +167;QUEST HD;2-2116-52580 +168;QUEST +1;2-2035-6215 +169;QUEST RED;2-2035-6214 +170;QUEST RED +1;2-2035-6211 +171;YANGA!;2-2095-55105 +172;QUEST;2-2035-6213 +173;BBC Four;2-2045-6316 +174;BBC Scotland;2-2047-6420 +175;SMITHSONIAN HD;2-2071-51110 200;BBC NEWS HD;2-2061-8921 201;BBC Parliament;2-2046-10307 202;Sky News;2-2026-4704 203;Al Jazeera Eng;2-2065-50395 -204;euronews;2-2089-54224 -205;France 24;2-2116-52570 +205;FRANCE 24(ENG);2-2116-52570 206;RT HD;2-2106-53148 -207;CNN;2-2067-50220 -208;Bloomberg TV;2-2116-52550 -209;NHK WORLD HD;2-2106-53147 +207;CNN;2-2065-50316 +208;Bloomberg TV;2-2104-55392 +209;NHKWORLD-JAPAN;2-2106-53147 210;CNBC;2-2090-50882 -211;CCTV-NEWS;2-2089-54216 +211;CGTN;2-2106-53151 212;BBC NEWS;2-2048-10358 -213;CHANNELS24;2-2107-52102 -250;Frontrunner;2-2105-52006 +214;Arirang TV;2-2106-53150 +215;TRT World;2-2092-55273 +250;Front Runner;2-2097-52111 +252;FreeSports HD;2-2116-52575 300;Film4;2-2041-9220 -301;Film4 + 1;2-2041-9225 -302;True Movies 1;2-2110-53320 -303;True Movies 2;2-2110-53325 -304;Movies4Men;2-2071-51116 -305;Movies4Men+1;2-2071-51118 +301;Film4 + 1;2-2056-8341 +302;Sony Movies;2-2110-53315 +303;Sony Classic;2-2110-53320 +304;Sony Classic+1;2-2110-53325 +305;Sony Action;2-2110-53310 306;TalkingPics TV;2-2094-22606 -400;IRISH TV;2-2105-52060 -411;Fashion One;2-2104-55395 -500;Chart Show TV;2-2110-53365 -501;The Vault;2-2110-53355 -502;ChartShowDance;2-2110-53315 -503;B4U Music;2-2108-52135 -504;Starz TV;2-2110-53335 -505;Vintage TV;2-2107-52180 -506;heart tv;2-2095-55111 -507;CAPITAL TV;2-2095-55112 -508;Kiss;2-2031-12010 -509;The Box;2-2031-12005 -510;Magic;2-2113-53720 -511;VIVA;2-2010-7009 -512;CHILLED;2-2095-55114 -513;NOW Music;2-2105-52010 -514;CLUBLAND TV;2-2095-55113 -515;CHANNEL AKA;2-2107-52107 -516;KeepItCountry;2-2105-52065 +307;Retro Movies;2-2090-50891 +501;STARZ;2-2112-55213 +516;Spotlight TV;2-2065-50331 600;CBBC HD;2-2050-6952 601;CBeebies HD;2-2061-8932 602;CITV;2-2044-10071 603;POP;2-2110-53340 -604;Kix;2-2110-53350 +604;POP Max;2-2110-53350 605;Tiny Pop;2-2110-53330 -606;Kix +1;2-2110-53360 +606;POP+1;2-2110-53370 607;CBBC;2-2048-10352 608;CBeebies;2-2045-6318 -609;Tiny Pop +1;2-2110-53345 -651;COMMUNITY;2-2026-4753 -652;Forces TV;2-2007-6033 -661;Rishtey;2-2107-52103 -662;Colors;2-2105-52050 690;Inspiration TV;2-2065-50390 -691;DAYSTAR HD;2-2099-55410 +691;DAYSTAR HD;2-2104-55305 692;Revelation;2-2108-52127 -693;ISLAM CHANNEL;2-2316-53515 -694;GOD Channel;2-2108-52126 -695;Sonlife TV;2-2316-53560 +694;GOD Channel;2-2096-54113 +695;Sonlife TV;2-2098-53560 700;BBC Radio 1;2-2047-6450 701;BBC Radio 1X;2-2047-6466 702;BBC Radio 2;2-2047-6452 @@ -138,48 +126,38 @@ 715;BBC R Cymru;2-2046-10389 716;BBC R Ulster;2-2046-10390 717;BBCRadioFoyle;2-2046-10391 -719;Capital FM;2-2095-9560 +719;Capital;2-2095-9560 720;Capital XTRA;2-2095-9549 721;Classic FM;2-2095-9570 722;Gold;2-2095-9561 723;Radio X;2-2095-9559 -724;Absolute;2-2105-52032 -726;Absolute 80s;2-2105-52033 -729;JazzFM;2-2104-55377 +724;Absolute;2-2097-52196 +726;Absolute 80s;2-2097-52197 730;PlanetRock;2-2095-9575 731;talkSPORT;2-2054-10238 732;Smooth RadioUK;2-2095-55132 -733;Heart;2-2105-52030 -734;LBC;2-2105-52029 -750;RTE Radio 1;2-2029-2811 -751;RTE 2fm;2-2029-2812 -752;RTE Lyric fm;2-2029-2814 -753;RTE RnaG;2-2029-2813 -786;BFBS Radio;2-2105-52028 -790;TWR;2-2104-55365 -800;QVC;2-2013-6600 -801;QVC Beauty;2-2013-6603 -802;QVC Extra;2-2013-6601 -803;QVC Style;2-2013-6602 -804;GR SHOP;2-2095-9531 -805;Gems TV;2-2116-52520 +733;Heart;2-2097-52192 +734;LBC;2-2097-52191 +735;BBC R Cymru 2;2-2047-6454 +736;Virgin Radio;2-2095-55135 +750;RTE Radio 1;2-2011-5544 +751;RTE 2fm;2-2011-5545 +752;RTE Lyric fm;2-2011-5546 +753;RTE RnaG;2-2011-5547 +786;BFBS Radio;2-2097-52190 +790;TWR;2-2095-55136 +800;QVC;2-2091-22304 +801;QVC Beauty;2-2091-22303 +802;QVC Extra;2-2091-22301 +803;QVC Style;2-2091-22302 +805;Gems TV;2-2067-50411 806;JML Direct;2-2096-54150 -807;JewelleryMaker;2-2113-53705 -808;TJC Choice;2-2105-52070 -809;TJC;2-2316-53520 -810;IDEAL EXTRA;2-2109-52233 -811;Craft Extra;2-2109-52235 -812;Ideal World;2-2109-52232 -813;Create & Craft;2-2109-52234 -814;Rocks and Co1;2-2095-9533 -815;Thane;2-2316-53530 -816;HIGH STREET TV;2-2095-55102 +807;JewelleryMaker;2-2065-50310 +809;TJC;2-2098-53520 +812;IDEAL WORLD;2-2103-50240 +813;CREATE&CRAFT;2-2103-50245 817;Hochanda;2-2095-9537 -818;Craft Channel;2-2105-52096 -870;BABESTATION;2-2112-55207 -900;On Demand;59-2315-10529 -901;BBC iPlayer;59-2315-10527 -903;ITV Hub;59-2315-10525 +949;BBC Two HD;2-2050-6940 950;BBC One Lon;2-2045-6301 951;BBC One CI;2-2045-6361 952;BBC One E Mid;2-2046-10305 @@ -198,24 +176,19 @@ 965;BBC One West;2-2045-6341 966;BBC One Yorks;2-2047-6451 967;BBC One Yk&Li;2-2046-10303 -968;BBC Two Eng;2-2045-6302 +968;BBC Two;2-2045-6302 969;BBC Two NI;2-2048-10362 -970;BBC Two Scot;2-2047-6422 -971;BBC Two Wales;2-2046-10312 +971;BBC Two Wal HD;2-2050-6912 972;BBC One HD;2-2050-6941 973;BBC One ScotHD;2-2061-8901 974;Channel 4;2-2041-9211 -975;Channel 4 + 1;2-2042-8311 +975;Channel 4 + 1;2-2056-8311 976;BBC One Wal HD;2-2061-8911 977;ITV;2-2044-10060 978;BBC One NI HD;2-2050-6943 +979;BBC Two Wales;2-2046-10312 981;BBC RB 1;2-2045-6390 -998;Freesat 4K;2-2038-7400 -999;freesat info;59-2315-10530 -1977;ITV Hub;59-2315-10522 -1979;Freesat4;59-2315-10528 +998;Freesat UHD;2-2038-7400 +999;Freesat Info;59-2315-10528 1997;BBC ALBA 2AUD;2-2047-6424 -4096;BBC One Lon;2-2045-6301 -4097;Channel 4;2-2041-9211 -4098;Channel 4 + 1;2-2042-8311 -4099;ITV;2-2044-10100 +1998;BBC ONE 2ndAUD;2-2045-6391 \ No newline at end of file diff --git a/source/ChanSort/ReferenceLists/gb_astra282E_freesat_EastAnglia_StartAt1.txt b/source/ChanSort/ReferenceLists/gb_astra282E_freesat_EastAnglia_StartAt1.txt new file mode 100644 index 00000000..d6d05293 --- /dev/null +++ b/source/ChanSort/ReferenceLists/gb_astra282E_freesat_EastAnglia_StartAt1.txt @@ -0,0 +1,187 @@ +1;BBC One East W;2-2045-6351 +2;BBC Two HD;2-2050-6960 +3;ITV;2-2059-12110 +4;Channel 4 HD;2-2068-21200 +5;Channel 5 HD;2-2057-7750 +6;BBC One HD;2-2050-6961 +7;BBC Four HD;2-2061-8931 +8;BBCScotlandHD;2-2061-8924 +9;BBC ALBA;2-2047-6423 +10;BBC Two;2-2045-6322 +11;ITV HD;2-2064-20840 +12;ITV+1;2-2044-10091 +13;ITV2;2-2044-10070 +14;ITV2+1;2-2053-10165 +15;ITV3;2-2054-10260 +16;ITV3+1;2-2054-10261 +17;ITV4;2-2044-10072 +18;ITVBe;2-2044-10075 +19;ITVBe+1;2-2053-10139 +20;S4C HD;2-2116-52565 +21;Channel 4+1;2-2056-8312 +22;E4;2-2041-9241 +23;E4+1;2-2056-8300 +24;More4;2-2056-8340 +25;More4+1;2-2041-9230 +26;4seven;2-2068-21250 +27;Channel 5+1;2-2057-7720 +28;5 USA;2-2057-7710 +29;5USA+1;2-2057-7711 +30;5STAR;2-2057-7715 +31;Paramount;2-2057-7760 +32;5SELECT;2-2057-7716 +33;CBS Drama;2-2112-50903 +34;CBS Reality;2-2112-55214 +35;CBS Reality+1;2-2112-55217 +36;CBS Justice;2-2112-55209 +37;horror channel;2-2112-55202 +38;horror ch+1;2-2112-55218 +39;BET:BlackEntTv;2-2069-51081 +40;5STAR+1;2-2057-7717 +41;Sony Channel;2-2110-53375 +42;Pick;2-2019-5832 +43;Pick+1;2-2019-5836 +44;Challenge;2-2007-6031 +45;Food Network;2-2035-2910 +46;Food Netwrk+1;2-2035-2912 +47;DMAX;2-2035-2916 +48;DMAX+1;2-2035-2905 +49;Sony Channel+1;2-2110-53380 +50;ITV4+1;2-2044-10073 +51;PBS America;2-2111-53270 +52;Dave;2-2022-6506 +53;Drama;2-2022-6522 +54;YESTERDAY;2-2022-6505 +55;Really;2-2111-53225 +56;Showcase;2-2094-22614 +57;BLAZE;2-2065-50350 +58;Together;2-2007-5872 +59;Forces TV;2-2007-6033 +60;HGTV;2-2111-53221 +61;QUEST HD;2-2116-52580 +62;QUEST+1;2-2035-6215 +63;Quest Red;2-2035-6214 +64;Quest Red+1;2-2035-6211 +65;YANGA!;2-2095-55105 +66;QUEST;2-2035-6213 +67;BBC Four;2-2045-6316 +68;BBC Scotland;2-2047-6420 +69;Smithsonian HD;2-2092-55271 +70;BBC NEWS HD;2-2061-8921 +71;BBC Parliament;2-2046-10307 +72;Sky News;2-2019-6404 +73;Al Jazeera Eng;2-2065-50395 +74;FRANCE 24 HD;2-2116-52570 +75;RT HD;2-2106-53148 +76;CNN;2-2065-50316 +77;Bloomberg HD;2-2104-55392 +78;NHK World HD;2-2106-53147 +79;CNBC;2-2090-50882 +80;CGTN HD;2-2106-53151 +81;BBC NEWS;2-2048-10358 +82;Arirang TV HD;2-2106-53150 +83;TRT World HD;2-2092-55273 +84;FrontRunner;2-2097-52111 +85;FreeSports HD;2-2116-52575 +86;Film4;2-2041-9220 +87;Film4+1;2-2056-8341 +88;Sony Movies;2-2110-53315 +89;Sony Classic;2-2110-53320 +90;Sony Classic+1;2-2110-53325 +91;Sony Action;2-2110-53310 +92;TalkingPictures;2-2094-22606 +93;Starz TV;2-2112-55213 +94;Spotlight TV;2-2065-50331 +95;CBBC HD;2-2050-6952 +96;CBeebies HD;2-2061-8932 +97;CITV;2-2044-10071 +98;POP;2-2110-53340 +99;POP Max;2-2110-53350 +100;Tiny Pop;2-2110-53330 +101;POP+1;2-2110-53370 +102;CBBC;2-2048-10352 +103;CBeebies;2-2045-6318 +104;Inspiration TV;2-2065-50390 +105;DAYSTAR HD;2-2104-55305 +106;revelation;2-2108-52127 +107;GOD Channel;2-2096-54113 +108;SonLife;2-2098-53560 +109;BBC R1;2-2047-6450 +110;BBC R1X;2-2047-6466 +111;BBC R2;2-2047-6452 +112;BBC R3;2-2046-10380 +113;BBC R4 FM;2-2046-10381 +114;BBC R5L;2-2047-6401 +115;BBC R5SX;2-2047-6464 +116;BBC 6 Music;2-2046-10383 +117;BBC R4 Ex;2-2046-10384 +118;BBC Asian;2-2047-6460 +119;BBC R4 LW;2-2046-10382 +120;BBC WS;2-2046-10385 +121;BBC R Scot.;2-2046-10386 +122;BBC R n Gael;2-2046-10387 +123;BBC R Wales;2-2046-10388 +124;BBC R Cymru;2-2046-10389 +125;BBC R Ulster;2-2046-10390 +126;BBC R Foyle;2-2046-10391 +127;Capital;2-2095-9560 +128;Capital XTRA;2-2095-9549 +129;Classic FM;2-2095-9570 +130;Gold;2-2095-9561 +131;Radio X;2-2095-9559 +132;Absolute;2-2097-52196 +133;Absolute 80s;2-2097-52197 +134;Planet Rock;2-2095-9575 +135;talkSPORT;2-2054-10238 +136;Smooth;2-2095-55132 +137;Heart;2-2097-52192 +138;LBC;2-2097-52191 +139;BBC Cymru 2;2-2047-6454 +140;Virgin Radio;2-2095-55135 +141;RTÉ Radio 1;2-2011-5544 +142;RTÉ 2FM;2-2011-5545 +143;RTÉ Lyric fm;2-2011-5546 +144;RTÉ R na G;2-2011-5547 +145;BFBS Radio;2-2097-52190 +146;TWR;2-2095-55136 +147;QVC;2-2091-22304 +148;QVC Beauty;2-2091-22303 +149;QVC Extra;2-2091-22301 +150;QVC Style;2-2091-22302 +151;Gems TV;2-2067-50411 +152;JML Direct;2-2096-54150 +153;JewelleryMaker;2-2065-50310 +154;TJC;2-2098-53520 +155;Ideal World HD;2-2103-50240 +156;Create&CraftHD;2-2103-50245 +157;Hochanda;2-2095-9537 +158;BBC Two HD;2-2050-6940 +159;BBC One Lon;2-2045-6301 +160;BBC One CI;2-2045-6361 +161;BBC One E Mid;2-2046-10305 +162;BBC One East E;2-2046-10306 +163;BBC One N West;2-2047-6441 +164;BBC One NE&C;2-2047-6471 +165;BBC One NI;2-2048-10361 +166;BBC One Oxford;2-2048-10356 +167;BBC One S East;2-2047-6461 +168;BBC One Scot;2-2047-6421 +169;BBC One South;2-2048-10353 +170;BBC One S West;2-2048-10354 +171;BBC One W Mid;2-2046-10301 +172;BBC One Wales;2-2046-10311 +173;BBC One West;2-2045-6341 +174;BBC One Yorks;2-2047-6451 +175;BBC One Yk&Li;2-2046-10303 +176;BBC Two;2-2045-6302 +177;BBC Two NI;2-2048-10362 +178;BBC Two Wal HD;2-2050-6912 +179;BBC One HD;2-2050-6941 +180;BBC One ScotHD;2-2061-8901 +181;Channel 4;2-2041-9211 +182;Channel 4+1;2-2056-8311 +183;BBC One Wal HD;2-2061-8911 +184;ITV;2-2044-10060 +185;BBC One NI HD;2-2050-6943 +186;BBC Two Wales;2-2046-10312 +187;BBC RB 1;2-2045-6390 \ No newline at end of file diff --git a/source/changelog.md b/source/changelog.md index 4e1f1716..ec31904c 100644 --- a/source/changelog.md +++ b/source/changelog.md @@ -1,9 +1,14 @@ ChanSort Change Log =================== +2020-08-27 +- LG WebOS 5: added support for lists with analog cable/antenna channels +- Philips: added support for analog channel lists (Repair/CM_* format) +- GB Freesat reference lists updated + 2020-08-10 -- Philips: added support for models that export a Repair/ChannelList/channellib/*Table and s2channelLib/*.dat - folder structure, e.g. PFL4317K, PFL5507K, PFL5806K, PFL7656K +- Philips: added support for models that export a Repair/ChannelList/channellib/*Table and s2channelLib/*.dat folder + structure, e.g. PFL4317K, PFL5507K, PFL5806K, PFL7656K 2020-08-03 - Philips: older models which export a Repair/*.BIN file can now be loaded, when there is an invisible .xml file in the same