Updated PW channels

3 files changed, 82 insertions, 108 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4fc70b06..a9cdc4ca 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -12,6 +12,7 @@ Carsten Koch <Carsten.Koch@icem.de>
  for implementing the 'new recording' indicator
  for suggesting that the "Back" button in replay mode should bring up the "Recordings" menu
  for fixing the watchdog timer if the program hangs in OSD activities
+ for his support in keeping the Premiere World channels up to date in 'channels.conf'
 
 Plamen Ganev <pganev@com-it.net>
  for fixing the frequency offset for Hotbird channels
@@ -321,3 +322,6 @@ Marcus Kuba <marcus@kuba4u.de>
 Ulrich Petri <ulope@gmx.de>
  for his help in debugging a crash on systems with disks that have a block size
  larger than 1MB
+
+Oliver Lorei <oliverlorei@cityweb.de>
+ for his support in keeping the Premiere World channels up to date in 'channels.conf.cable'
diff --git a/HISTORY b/HISTORY
index 32f3adb1..a5f15585 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1219,7 +1219,7 @@ Video Disk Recorder Revision History
 - Now encoding '.' at the end of a directory name in case of VFAT=1, since Windows
   can't handle these (thanks to Simon Dean for reporting this one).
 
-2002-05-01: Version 1.0.2
+2002-05-03: Version 1.0.2
 
 - Now taking an active video cutting process into account when doing shutdown or
   housekeeping (thanks to Stefan Huelswitt).
@@ -1230,3 +1230,9 @@ Video Disk Recorder Revision History
   for reporting this one).
 - Fixed a crash on systems with disks that have a block size larger than 1MB
   (thanks to Ulrich Petri for helping to debug this one).
+- Updated 'channels.conf' for the new PW settings (thanks to Andreas Share and
+  Carsten Koch). Note that all channels with numbers over 50 may have moved,
+  so you should carefully check any timers you have set!
+- Updated 'channels.conf.cable' for the new PW settings (thanks to Oliver Lorei
+  and Stephan Schreiber). Note that all channels may have moved, so you should
+  carefully check any timers you have set!
diff --git a/channels.conf.cable b/channels.conf.cable
index b6d5c050..53d4212a 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -1,28 +1,44 @@
 :verschlüsselte Fernsehprogramm
-PREMIERE ONE:378:h:0:6900:3071:3072:0:1:51
-PREMIERE MOVIE 1:370:h:0:6900:511:512;515:0:1:10
-PREMIERE MOVIE 2:370:h:0:6900:1791:1792:0:1:11
-PREMIERE MOVIE 3:370:h:0:6900:2303:2304:0:1:43
-PREMIERE ACTION:370:h:0:6900:1023:1024,1025:0:1:20
-PREMIERE X-ACTION:370:h:0:6900:2047:2048,2049:0:1:50
-PREMIERE SCI-FI:370:h:0:6900:1535:1536:0:1:41
-PREMIERE STAR:370:h:0:6900:767:768:0:1:9
-PREMIERE COMEDY:370:h:0:6900:1279:1280:0:1:29
-13 TH STREET:378:h:0:6900:2303:2304,2305:0:1:42
-KRIMI &CO:378:h:0:6900:1535:1536:0:1:23
-STUDIO UNIVERSAL:402:h:0:6900:1050:1054:0:1:36
-DISCOVERY CHANNEL:378:h:0:6900:1791:1792:0:1:14
-FILMPALAST:378:h:0:6900:2559:2560:0:1:516
-DISNEY CHANNEL:402:h:0:6900:1030:1034:0:1:34
-SUNSET:378:h:0:6900:1023:1024:0:1:16
-PLANET:402:h:0:6900:1100:1104:0:1:13
-CLASSICA:378:h:0:6900:767:768:0:1:15
-GOLDSTAR TV:378:h:0:6900:3839:3840:0:1:518
-HEIMATKANAL:378:h:0:6900:2815:2816:0:1:517
-K-TOON:378:h:0:6900:511:512:0:1:12
-FOX KIDS:378:h:0:6900:1279:1280:0:1:28
-KiKa:394:h:0:6900:310:320:330:0:28008
-JUNIOR:378:h:0:6900:255:256:0:1:19
+PREMIERE START:370:h:0:6900:255:256:0:101:8
+PREMIERE 1:370:h:0:6900:511:512:0:101:10
+PREMIERE 2:370:h:0:6900:1791:1792:0:101:11
+PREMIERE 3:370:h:0:6900:2303:2304:0:101:43
+PREMIERE 4:370:h:0:6900:767:768:0:101:9
+PREMIERE 5:370:h:0:6900:1279:1280:0:101:29
+PREMIERE 6:370:h:0:6900:1535:1536:0:101:41
+PREMIERE 7:370:h:0:6900:1023:1024:0:101:20
+PREMIERE SERIE:378:h:0:6900:1023:1024:0:101:16
+13 TH STREET:354:h:0:6900:2303:2304:0:101:42
+STUDIO UNIVERSAL:402:h:0:6900:1050:1054:0:101:36
+KRIMI &CO:378:h:0:6900:1535:1536:0:101:23
+DISNEY CHANNEL:402:h:0:6900:1030:1034:0:101:34
+FOX KIDS:354:h:0:6900:1279:1280:0:101:28
+JUNIOR:354:h:0:6900:255:256:0:101:19
+K-TOON:354:h:0:6900:12:13:0:101:12
+DISCOVERY CHANNEL:378:h:0:6900:1791:1792:0:101:14
+PLANET:402:h:0:6900:13:14:0:101:13
+PREMIERE NOSTALGIE:378:h:0:6900:2559:2560:0:101:516
+GOLDSTAR TV:354:h:0:6900:3839:3840:0:101:518
+CLASSICA:354:h:0:6900:767:768:0:101:15
+PREMIERE MAIL:354:h:0:6900:3569:0:0:101:22
+:PPV1
+PPV1:362:h:0:6900:1023:1024,1025;1027:0:101:182
+PPV1:378:h:0:6900:511:512,513;515:0:101:177
+:ppv2
+PPV2:378:h:0:6900:255:256:0:101:176
+PPV2:362:h:0:6900:767:768:0:101:181
+:ppv3
+PPV3:362:h:0:6900:511:512:0:101:180
+PPV3:362:h:0:6900:1279:1280:0:101:18:ppv4
+PREMIERE DIREKT 4:378:h:0:6900:2815:2816:0:101:18
+:Sport
+PREMIERE SPORT 1:362:h:0:6900:255:256:0:101:17
+PREMIERE SPORT 2:378:h:0:6900:3839:3840:0:101:27
+unknown:402:h:0:6900:595:596:0:101:8787
+unknown:410:h:0:6900:3494:3495:0:101:28070
+Kino Klassik:458:h:0:6900:2551:2552:0:101:2550
+BEATE-UHSE.TV:354:h:0:6900:1023:1024:0:101:21
+PREMIERE EROTIK:378:h:0:6900:1279:1280:0:101:513
 :Fernsehprogramme
 Das Erste:410:h:0:6900:101:102,88:104:0:28106
 ZDF:394:h:0:6900:110:120,121:130:0:28006
@@ -73,58 +89,6 @@ ZEE TV:442:h:0:6900:517:773:0:1:53301
 NTV i:442:h:0:6900:514:515:0:1:53302
 ATV:434:h:0:6900:631:632:0:0:53203
 TW1:610:h:0:6900:6106:6107:0:0:6106
-PREMIERE WORLD:370:h:0:6900:255:256:32:0:8
-:Premiere World Bundesliga
-Superdom:362:h:0:6900:255:256:0:1:26
-Spiel 1:362:h:0:6900:255:256,257:0:1:17
-Spiel 2:362:h:0:6900:2047:2048,2049:0:1:240
-BuLi-Konferenz:362:h:0:6900:3071:3072,3073:0:1:208
-BuLi-Spiel 1:362:h:0:6900:3327:3328,3329:0:1:209
-BuLi-Spiel 2:362:h:0:6900:2303:2304,2305:0:1:210
-BuLi-Spiel 3:362:h:0:6900:3583:3584,3585:0:1:211
-BuLi-Spiel 4:362:h:0:6900:2559:2560,2561:0:1:212
-BuLi-Spiel 5:362:h:0:6900:2815:2816,2817:0:1:213
-:Premiere Sport
-PREMIERE SPORT 1:362:h:0:6900:255:256:0:1:17
-PREMIERE SPORT 2:362:h:0:6900:3327:3328:0:1:27
-PREMIERE SPORT 3:354:h:0:6900:2815:2816:0:1:18
-:Premiere Formel 1
-F1 Studio:362:h:0:6900:255:256:0:1:17
-F1 Box:362:h:0:6900:2047:2048:0:1:240
-F1 Verfolger:362:h:0:6900:2303:2304:0:1:241
-F1 Cockpit:362:h:0:6900:2559:2560:0:1:242
-F1 Multi:362:h:0:6900:2815:2816:0:1:243
-F1 Info:362:h:0:6900:3071:3072:0:1:244
-:Premiere Cinedom 1
-Cinedom 1A:362:h:0:6900:1535:1536,1537:0:1:176
-Cinedom 1B:386:h:0:6900:1535:1536,1537:0:1:178
-Cinedom 1C:362:h:0:6900:511:512,513:0:1:180
-Cinedom 1D:354:h:0:6900:511:512,513:0:1:190
-:Premiere Cinedom 2
-Cinedom 2A:386:h:0:6900:1791:1792,1793:0:1:179
-Cinedom 2B:362:h:0:6900:1279:1280,1281:0:1:183
-Cinedom 2C:386:h:0:6900:511:512:0:1:184
-Cinedom 2D:386:h:0:6900:1279:1280:0:1:188
-Cinedom 2E:354:h:0:6900:1023:1024:0:1:193
-: Premiere Cinedom 3
-Cinedom 3A:362:h:0:6900:1023:1024,1025:0:1:182
-Cinedom 3B:386:h:0:6900:767:768:0:1:185
-Cinedom 3C:354:h:0:6900:2559:2560:0:1:192
-Cinedom 3D:354:h:0:6900:1535:1536:0:1:195
-: Premiere Cinedom 4
-Cinedom 4A:362:h:0:6900:767:768,769:0:1:181
-Cinedom 4B:386:h:0:6900:2047:2048:0:1:187
-Cinedom 4C:354:h:0:6900:767:768:0:1:191
-: Premiere Cinedom 5
-Cinedom 5A:386:h:0:6900:1023:1024,1025:0:1:186
-Cinedom 5B:354:h:0:6900:1279:1280,1281:0:1:194
-: Premiere Cinedom Deluxe
-CINEDOM DELUXE:354:h:0:6900:255:256,257:0:1:189
-:Premiere Erotic
-BEATE-UHSE.TV:354:h:0:6900:3839:3840:0:1:21
-BLUE MOVIE 1:354:h:0:6900:1791:1792:0:1:513
-BLUE MOVIE 2:354:h:0:6900:2047:2048:0:1:514
-BLUE MOVIE 3:354:h:0:6900:2303:2304:0:1:515
 :Radioprogramme
 Fritz:426:h:0:6900:0:901:0:0:28209
 HR XXL:410:h:0:6900:0:3501:0:0:28125
@@ -151,34 +115,34 @@ SWR-2:426:h:0:6900:0:1401:0:0:28214
 WDR3:426:h:0:6900:0:1501:0:0:28215
 WDR Radio 5:426:h:0:6900:0:1601:0:0:28216
 :verschlüsselte Radioprogramme
-ALTERNATIVE ROCK:378:h:0:6900:1:800:0:1:151
-HITLISTE:378:h:0:6900:1:784:0:1:150
-DANCE:378:h:0:6900:1:816:0:1:152
-EASY LISTENING:402:h:0:6900:1:1201:0:1:162
-CLASSIC ROCK:378:h:0:6900:1:544:0:1:154
-Cristal New Age:442:h:0:6900:1:536:0:0:53351
-Movie Sounds:442:h:0:6900:1:537:0:1:53352
-LOVE SONGS:402:h:0:6900:1:1191:0:1:163
-KLASSIK POPULÄR:378:h:0:6900:1:592:0:1:145
-KLASS. SYMPHONIEN:378:h:0:6900:1:608:0:1:146
-OPER & VOKALMUSIK:378:h:0:6900:1:624:0:1:147
-BAROCKMUSIK:378:h:0:6900:1:640:0:1:148
-JAZZ:378:h:0:6900:1:656:0:1:149
-COUNTRY:378:h:0:6900:1:352:0:1:153
-FILMMUSIK:378:h:0:6900:1:368:0:1:155
-DEUTSCHE HITS:402:h:0:6900:1:1156:0:1:156
-SOUL CLASSICS:402:h:0:6900:1:1161:0:1:157
-TÜRK MÜZIGI:402:h:0:6900:1:1166:0:1:158
-GOLD:402:h:0:6900:1:1171:0:1:159
-MUSICALS:402:h:0:6900:1:1196:0:1:164
-OLD GOLD:402:h:0:6900:1:1186:0:1:165
-SCHLAGER:402:h:0:6900:1:1176:0:1:166
-VOLKSMUSIK:402:h:0:6900:1:1181:0:1:167
-All Jazz:442:h:0:6900:1:535:0:1:53350
-Sinfonica:442:h:0:6900:1:538:0:1:53353
-Opernfestival:442:h:0:6900:1:539:0:1:53354
-Barock Fantasie:442:h:0:6900:1:540:0:1:53355
-Musica Camerata:442:h:0:6900:1:541:0:1:53356
-Musica Antica:442:h:0:6900:1:542:0:1:53357
-Adagio:442:h:0:6900:1:543:0:1:53358
-Jazz Legends:442:h:0:6900:1:544:0:1:53359
+COUNTRY:362:h:0:6900:0:352:0:1:153
+FILMMUSIK:362:h:0:6900:0:368:0:1:155
+JAZZ:362:h:0:6900:0:656:0:1:149
+MUSICALS:362:h:0:6900:0:384:0:1:164
+VOLKSMUSIK:362:h:0:6900:0:336:0:1:167
+ALTERNATIVE ROCK:370:h:0:6900:0:800:0:1:151
+CLASSIC ROCK:370:h:0:6900:0:544:0:1:154
+DANCE:370:h:0:6900:0:816:0:1:152
+DEUTSCHE HITS:370:h:0:6900:0:592:0:1:156
+EASY LISTENING:370:h:0:6900:0:384:0:1:162
+GOLD:370:h:0:6900:0:576:0:1:159
+HITLISTE:370:h:0:6900:0:784:0:1:150
+LOVE SONGS:370:h:0:6900:0:352:0:1:163
+OLD GOLD:370:h:0:6900:0:304:0:1:165
+SCHLAGER:370:h:0:6900:0:320:0:1:166
+SOUL CLASSICS:370:h:0:6900:0:400:0:1:157
+BAROCK:378:h:0:6900:0:640:0:1:148
+KLASSIK POPUL04R:378:h:0:6900:0:592:0:1:145
+OPER:378:h:0:6900:0:624:0:1:147
+ORCHESTRALE WERKE:378:h:0:6900:0:608:0:1:146
+TÜRK MÜZIGI:378:h:0:6900:0:560:0:1:158
+Adagio:442:h:0:6900:0:543:0:1:53358
+All Jazz:442:h:0:6900:0:535:0:1:53350
+Barock Fantasie:442:h:0:6900:0:540:0:1:53355
+Cristal New Age:442:h:0:6900:0:536:0:1:53351
+Jazz legends:442:h:0:6900:0:544:0:1:53359
+Movie Sounds:442:h:0:6900:0:537:0:1:53352
+Musica Antica:442:h:0:6900:0:542:0:1:53357
+Musica Camerata:442:h:0:6900:0:541:0:1:53356
+Opernfestival:442:h:0:6900:0:539:0:1:53354
+Sinfonica:442:h:0:6900:0:538:0:1:53353