Version 1.1.16vdr-1.1.16

- Fixed saving the polarization parameter of channels that have a number in the
  'source' parameter (thanks to Peter Seyringer for reporting this one).
- Updated 'channels.conf.terr' (thanks to Andy Carter).
- Updated 'channels.conf.cable' (thanks to Achim Lange).
- First step towards a "unique channel ID". The channel ID is a human readable
  string, made up from several parameters of the channel's definition in the file
  'channels.conf' (see man vdr(5) for details).
  In order for the "unique channel ID" to work, all channel definitions now must
  be unique with respect to the combination of their Source, Frequency and SID
  parameters. You may have to fix your 'channels.conf' manually if there are error
  messages in the log file when loading it. BE SURE TO MAKE A BACKUP COPY OF YOUR
  'channels.conf' AND 'timers.conf' FILE BEFORE SWITCHING TO THIS VERSION, AND CHECK
  VERY CAREFULLY WHETHER YOUR TIMERS ARE STILL SET TO THE RIGHT CHANNELS!
  When reading an existing 'timers.conf', the channels will be identified as before
  by their numbers. As soon as this file is written back, the channel numbers will
  be replaced by the channel IDs. After that it is possible to manually edit the
  'channels.conf' file and rearrange the channels without breaking the timers.
  Note that you can still define new timers manually by using the channel number.
  VDR will correctly identify the 'channel' parameter in a timer definition and
  use it as a channel number or a channel ID, respectively. Also, the SVDRP commands
  that return timer definitions will list them with channel numbers in order to
  stay compatible with existing applications.
  The channel ID is also used in the 'epg.data' file to allow EPG information from
  different sources to be stored, which would previously have been mixed up in case
  they were using the same 'service ID'. Note that the contents of an existing
  'epg.data' file from a previous version will be silently ignored, since it doesn't
  contain the new channel IDs. When inserting EPG data into VDR via SVDRP you now also
  need to use the channel IDs.
  Currently the EPG data received from the DVB data stream only uses the 'Source'
  and 'Service ID' part of the channel ID. This makes it work for channels with
  the same service IDs on different sources (like satellites, cable or terrestrial).
  However, it doesn't work yet if the service IDs are not unique within a specific
  source. This will be fixed later.
- Added missing SID parameters to 'channels.conf'. Some channels have been removed
  since they are apparently no longer broadcasted.
- Removed dropping EPG events from "other" streams that have a duration of 86400
  seconds or more (was introduced in version 1.1.10). This has become obsolete by
  the modification in version 1.1.13, which fixed fetching the current/next information
  to handle cases where the duration of an event is set wrongly and would last beyond
  the start time of the next event. Besides, the change in 1.1.10 broke handling EPG
  data for NVOD channels.
- Fixed a compiler warning regarding cMenuChannels::Del() and MenuTimers::Del() hiding
  the base class virtual functions.

1 files changed, 25 insertions, 62 deletions

diff --git a/channels.conf b/channels.conf
index da014a8..f440ca7 100644
--- a/channels.conf
+++ b/channels.conf
@@ -17,7 +17,6 @@ KiKa:11954:h:S19.2E:27500:310:320:330:0:28008
 arte:11836:h:S19.2E:27500:401:402:404:0:28109
 ORF1:12692:h:S19.2E:22000:160:161:165:102:13001
 ORF2:12692:h:S19.2E:22000:500:501:505:102:13002
-ORF Sat:11954:h:S19.2E:27500:506:507:0:0:28010
 ZDF.info:11954:h:S19.2E:27500:610:620:0:0:28011
 CNN:12168:v:S19.2E:27500:165:100:0:0:28512
 Super RTL:12188:h:S19.2E:27500:165:120:65:0:12040
@@ -27,13 +26,13 @@ Kabel 1:12480:v:S19.2E:27500:511:512:33:0:899
 Neun Live:12480:v:S19.2E:27500:767:768:35:0:897
 DSF:12480:v:S19.2E:27500:1023:1024:0:0:900
 HOT:12480:v:S19.2E:27500:1279:1280:0:0:40
-Bloomberg TV Germany:12551:v:S19.2E:22000:162:99:0:0:12160
+Bloomberg TV Germany:12552:v:S19.2E:22000:162:99:0:0:12160
 Bloomberg TV France:11817:v:S19.2E:27500:163:92:0:0:8004
 Bloomberg TV Spain:12168:v:S19.2E:27500:167:112:0:0:12721
 Sky News:12552:v:S19.2E:22000:305:306:0:0:3995
 Fox Kids Netherlands:12574:h:S19.2E:22000:163:92:0:0:5020
 Alice:12610:v:S19.2E:22000:162:96:0:0:12200
-n-tv:12669:v:S19.2E:22000:162:96:55:0:12730
+n-tv:12670:v:S19.2E:22000:162:96:55:0:12730
 Grand Tourisme:12670:v:S19.2E:22000:289:290:0:0:17300
 TW1:12692:h:S19.2E:22000:166:167:0:0:13013
 Eurosport:11954:h:S19.2E:27500:410:420:0:0:28009
@@ -45,7 +44,6 @@ ZDF.doku:11954:h:S19.2E:27500:660:670:0:0:28014
 MDR:12110:h:S19.2E:27500:401:402:404:0:28204
 ORB:12110:h:S19.2E:27500:501:502:504:0:28205
 B1:12110:h:S19.2E:27500:601:602:604:0:28206
-ARD Online-Kanal:12722:h:S19.2E:22000:0:701:0:0:0
 :Premiere World
 Premiere Start:11797:h:S19.2E:27500:255:256:0:101:8
 Premiere 1:11797:h:S19.2E:27500:511:512,513;515:0:101:10
@@ -93,7 +91,7 @@ Premiere Sport 2:12031:h:S19.2E:27500:3839:3840:0:101:27
 :#Boxengasse:12070:h:S19.2E:27500:767:768:0:101:213
 :#Verfolgerfeld:12070:h:S19.2E:27500:1023:1024:0:101:214
 :#Infokanal:12070:h:S19.2E:27500:1279:1280:0:101:215
-Multikanal:11720:h:S19.2E:27500:255:256:0:101:17
+:#Multikanal:11720:h:S19.2E:27500:255:256:0:101:17
 :Beta Digital
 N24:12480:v:S19.2E:27500:2047:2048:0:0:47
 CNBC:11954:h:S19.2E:27500:510:520:0:0:28010
@@ -110,77 +108,42 @@ BuLi 7:11719:h:S19.2E:27500:3327:3328,3329:0:101:245
 BuLi 8:12031:h:S19.2E:27500:3071:3072,3073:0:101:208
 BuLi 9:12031:h:S19.2E:27500:3327:3328,3329:0:101:209
 :-
-:#TV Niepokalanow:11876:h:S19.2E:27500:305:321:0:0:20601
 Mosaico:11934:v:S19.2E:27500:165:100:0:0:29010
 Andalucia TV:11934:v:S19.2E:27500:166:104:0:0:29011
-TVC Internacional:11934:v:S19.2E:27500:167:108:0:0:0
-Nasza TV:11992:h:S19.2E:27500:165:98:0:0:0
-WishLine test:12012:v:S19.2E:27500:163:90:0:0:0
+Canal J:11934:v:S19.2E:27500:167:108:0:0:8157
+Extreme Sports Channel:11992:h:S19.2E:27500:165:98,99:0:0:20365
 Pro 7 Austria:12051:v:S19.2E:27500:161:84:0:0:20002
 Kabel 1 Schweiz:12051:v:S19.2E:27500:162:163:0:0:20003
 Kabel 1 Austria:12051:v:S19.2E:27500:166:167:0:0:20004
 Pro 7 Schweiz:12051:v:S19.2E:27500:289:290:0:0:20001
-Kiosque:12129:v:S19.2E:27500:160:80:0:0:0
 KTO:11739:v:S19.2E:27500:163:90:0:0:8304
-TCM:12168:v:S19.2E:27500:160:80:0:0:0
-Cartoon Network France & Spain:12168:v:S19.2E:27500:161:84:0:0:0
-TVBS Europe:12168:v:S19.2E:27500:162:88:0:0:0
-TVBS Europe:12168:v:S19.2E:27500:162:89:0:0:0
-Travel:12168:v:S19.2E:27500:163:92:0:0:0
-TCM Espania:12168:v:S19.2E:27500:164:96:0:0:0
-MTV Spain:12168:v:S19.2E:27500:167:112:0:0:0
-TCM France:12168:v:S19.2E:27500:169:64:0:0:0
-RTL2 CH:12188:h:S19.2E:27500:164:112:0:0:0
+Cartoon Network France:12168:v:S19.2E:27500:161:84:0:0:28511
+TVBS Europe:12168:v:S19.2E:27500:162:88,89:0:0:28631
+travel channel:12168:v:S19.2E:27500:163:92,93:0:0:28001
+TCM Espana:12168:v:S19.2E:27500:164:96,97:0:0:28516
+TCM France:12168:v:S19.2E:27500:169:64,65:0:0:28515
 La Cinquieme:12207:v:S19.2E:27500:160:80:0:0:8501
 LCP:12207:v:S19.2E:27500:165:100:0:0:8506
-Post Filial TV:12226:h:S19.2E:27500:255:256:0:0:0
-Canal Canaris:12246:v:S19.2E:27500:160:80:0:0:0
-Canal Canaris:12246:v:S19.2E:27500:160:81:0:0:0
-Canal Canaris:12246:v:S19.2E:27500:160:82:0:0:0
-Canal Canaris:12246:v:S19.2E:27500:160:83:0:0:0
 AB Moteurs:12266:h:S19.2E:27500:160:80:0:0:17000
-AB Channel 1:12266:h:S19.2E:27500:161:84:0:0:0
-Taquilla 0:12285:v:S19.2E:27500:165:100:0:0:0
-CSAT:12324:v:S19.2E:27500:160:80:0:0:0
-Mosaique:12324:v:S19.2E:27500:162:88:0:0:0
-Mosaique 2:12324:v:S19.2E:27500:163:92:0:0:0
-Mosaique 3:12324:v:S19.2E:27500:164:96:0:0:0
-Le Sesame C+:12324:v:S19.2E:27500:165:1965:0:0:0
-FEED:12344:h:S19.2E:27500:163:92:0:0:0
-RTM 1:12363:v:S19.2E:27500:162:96:0:0:0
-ESC 1:12363:v:S19.2E:27500:163:104:0:0:0
-TV5 Europe:12363:v:S19.2E:27500:164:112:0:0:0
-TV7 Tunisia:12363:v:S19.2E:27500:166:128:0:0:0
-ARTE:12363:v:S19.2E:27500:167:137:0:0:0
+AB 1:12266:h:S19.2E:27500:161:84:0:0:17001
+Escales:12285:v:S19.2E:27500:165:100:0:0:17025
+Canal Club:12324:v:S19.2E:27500:160:80:0:0:8612
 RAI Uno:10788:v:S19.2E:22000:289:290:0:0:9004
-RTP International:12363:v:S19.2E:27500:300:301:0:0:0
-Fashion TV:12402:v:S19.2E:27500:163:92:0:0:0
-VideoService:12422:h:S19.2E:27500:255:256:0:0:0
-Beta Research promo:12422:h:S19.2E:27500:1023:1024:0:0:0
-Canal Canarias:12441:v:S19.2E:27500:160:80:0:0:0
-Fitur:12441:v:S19.2E:27500:514:662:0:0:0
-Astra Info 1:12552:v:S19.2E:22000:164:112:0:0:0
-Astra Info 2:12552:v:S19.2E:22000:165:120:0:0:0
-Astra Vision 1:12552:v:S19.2E:22000:168:144:0:0:0
-Astra Vision 1:12552:v:S19.2E:22000:168:145:0:0:0
-Astra Vision 1:12552:v:S19.2E:22000:168:146:0:0:0
-Astra Vision 1:12552:v:S19.2E:22000:168:147:0:0:0
-Astra Vision 1:12552:v:S19.2E:22000:168:148:0:0:0
-Astra Vision 1:12552:v:S19.2E:22000:168:149:0:0:0
-Astra Vision 1:12552:v:S19.2E:22000:168:150:0:0:0
+K13:12402:v:S19.2E:27500:163:92:0:0:8704
+Astra Mosaic 1:12552:v:S19.2E:22000:175:176:0:0:3988
+Astra Mosaic 2:12552:v:S19.2E:22000:179:120:0:0:3987
+Astra Mosaic 3:12552:v:S19.2E:22000:182:169:0:0:3986
+Astra Mosaic 4:12552:v:S19.2E:22000:185:170:0:0:3985
+Astra Mosaic 5:12552:v:S19.2E:22000:163:170:0:0:3984
+Chamber TV:12552:v:S19.2E:22000:55:56:0:0:12180
 RTL Tele Letzebuerg:12552:v:S19.2E:22000:168:144,146:0:0:3994
-Astra Mosaic:12552:v:S19.2E:22000:175:176:0:0:0
-MHP test:12604:h:S19.2E:22000:5632:0:0:0:0
 VERONICA:12574:h:S19.2E:22000:161:84:0:0:5010
-VH1 Classic:12699:v:S19.2E:22000:3071:3072:0:0:28647
-MTV 2 Pop:12699:v:S19.2E:22000:3081:3082:0:0:28648
+VH1 Classic:12670:v:S19.2E:22000:3071:3072:0:0:28647
+MTV 2 Pop:12670:v:S19.2E:22000:3081:3082:0:0:28648
 Via 1 - Schöner Reisen:12148:h:S19.2E:27500:511:512:0:0:44
 Video Italia:12610:v:S19.2E:22000:121:122:0:0:12220
-AC 3 promo:12670:v:S19.2E:22000:308:256:0:0:0
-ORF/ZDF:12699:h:S19.2E:22000:506:507:0:0:13012
+ORF/ZDF:12670:h:S19.2E:22000:506:507:0:0:13012
 VIVA:12670:v:S19.2E:22000:309:310:0:0:12732
-VIVA2:12552:v:S19.2E:22000:171:172:0:0:12120
-MTV German:12699:v:S19.2E:22000:3031:3032:0:0:28643
-:#IFA-TV:10832:h:S19.2E:22000:132:133:32:0:7251
+VIVA PLUS:12552:v:S19.2E:22000:171:172:0:0:12120
+MTV German:12670:v:S19.2E:22000:3031:3032:0:0:28643
 QVC Germany:12552:v:S19.2E:22000:165:166:0:0:12100
-:#TANGOTV:10832:h:S19.2E:22000:61:62:0:0:61920