Version 1.1.18vdr-1.1.18

- Fixed missing initialization of 'number' in cChannel (thanks to Martin Hammerschmid
  for reporting this one).
- Fixed a misplaced ')' in the fix about the stale lock files (thanks again to
  Oliver Endriss for pointing this out - it was my fault).
- Group delimiters in the 'channels.conf' file that have no text (like a simple ":"
  or ":@201") no longer show up in the Channels menu (suggested by Guy Roussin).
- Added "Tele 5" to 'channels.conf' (thanks to Georg Hitsch).
- Changed the source directory name for plugins from 'SRC' to 'src' (suggested by
  Clemens Kirchgatterer).
- Removed transponders 10788, 11739 and 12266 from 'channels.conf' (apparently they
  are no longer active).
- Deactivated some templates in tools.h in case some plugin needs to use the STL
  (suggested by Gerald Berwolf).
- Timers now accept channel IDs even if the 'source' is 0 (thanks to Stefan Huelswitt
  for reporting this one).
- Now taking an active SVDRP connection into account when doing shutdown or
  housekeeping (suggested by Emil Naepflein).
- Macros in 'keymacros.conf' can now use "@plugin" to directly access the main menu
  function of a given plugin (see man vdr(5) for details).
- The new plugin 'sky' can be used to integrate a Sky Digibox into the VDR system,
  using a Kfir MPEG2 encoder card (see PLUGINS/src/sky/README for details).

1 files changed, 11 insertions, 5 deletions

diff --git a/channels.conf b/channels.conf
index ab6b4b8..f6b273c 100644
--- a/channels.conf
+++ b/channels.conf
@@ -21,7 +21,7 @@ ZDF.info:11954:h:S19.2E:27500:610:620:0:0:28011:0:0:0
 CNN:12168:v:S19.2E:27500:165:100:0:0:28512:0:0:0
 Super RTL:12188:h:S19.2E:27500:165:120:65:0:12040:0:0:0
 VOX:12188:h:S19.2E:27500:167:136:71:0:12060:0:0:0
-DW TV:10788:v:S19.2E:22000:305:306:0:0:8905:0:0:0
+:#DW TV:10788:v:S19.2E:22000:305:306:0:0:8905:0:0:0
 Kabel 1:12480:v:S19.2E:27500:511:512:33:0:899:0:0:0
 Neun Live:12480:v:S19.2E:27500:767:768:35:0:897:0:0:0
 DSF:12480:v:S19.2E:27500:1023:1024:0:0:900:0:0:0
@@ -116,7 +116,7 @@ Pro 7 Austria:12051:v:S19.2E:27500:161:84:0:0:20002:0:0:0
 Kabel 1 Schweiz:12051:v:S19.2E:27500:162:163:0:0:20003:0:0:0
 Kabel 1 Austria:12051:v:S19.2E:27500:166:167:0:0:20004:0:0:0
 Pro 7 Schweiz:12051:v:S19.2E:27500:289:290:0:0:20001:0:0:0
-KTO:11739:v:S19.2E:27500:163:90:0:0:8304:0:0:0
+:#KTO:11739:v:S19.2E:27500:163:90:0:0:8304:0:0:0
 Cartoon Network France:12168:v:S19.2E:27500:161:84:0:0:28511:0:0:0
 TVBS Europe:12168:v:S19.2E:27500:162:88,89:0:0:28631:0:0:0
 travel channel:12168:v:S19.2E:27500:163:92,93:0:0:28001:0:0:0
@@ -124,11 +124,11 @@ TCM Espana:12168:v:S19.2E:27500:164:96,97:0:0:28516:0:0:0
 TCM France:12168:v:S19.2E:27500:169:64,65:0:0:28515:0:0:0
 La Cinquieme:12207:v:S19.2E:27500:160:80:0:0:8501:0:0:0
 LCP:12207:v:S19.2E:27500:165:100:0:0:8506:0:0:0
-AB Moteurs:12266:h:S19.2E:27500:160:80:0:0:17000:0:0:0
-AB 1:12266:h:S19.2E:27500:161:84:0:0:17001:0:0:0
+:#AB Moteurs:12266:h:S19.2E:27500:160:80:0:0:17000:0:0:0
+:#AB 1:12266:h:S19.2E:27500:161:84:0:0:17001:0:0:0
 Escales:12285:v:S19.2E:27500:165:100:0:0:17025:0:0:0
 Canal Club:12324:v:S19.2E:27500:160:80:0:0:8612:0:0:0
-RAI Uno:10788:v:S19.2E:22000:289:290:0:0:9004:0:0:0
+:#RAI Uno:10788:v:S19.2E:22000:289:290:0:0:9004:0:0:0
 K13:12402:v:S19.2E:27500:163:92:0:0:8704:0:0:0
 Astra Mosaic 1:12552:v:S19.2E:22000:175:176:0:0:3988:0:0:0
 Astra Mosaic 2:12552:v:S19.2E:22000:179:120:0:0:3987:0:0:0
@@ -147,3 +147,9 @@ VIVA:12670:v:S19.2E:22000:309:310:0:0:12732:0:0:0
 VIVA PLUS:12552:v:S19.2E:22000:171:172:0:0:12120:0:0:0
 MTV German:12670:v:S19.2E:22000:3031:3032:0:0:28643:0:0:0
 QVC Germany:12552:v:S19.2E:22000:165:166:0:0:12100:0:0:0
+Tele 5:12480:v:S19.2E:27500:1535:1536:0:0:51:0:0:0
+:@201 Sky
+Sky One:106:h:S28.2E:0:160:80:0:301:222:0:0:0
+itv2:226:h:S28.2E:0:160:80:0:301:451:0:0:0
+sci-fi:130:h:S28.2E:0:160:80:0:301:161:0:0:0
+Paramount Comedy:127:h:S28.2E:0:160:80:0:301:185:0:0:0