Version 0.85vdr-0.85

- Added Norwegian language texts (thanks to Jørgen Tvedt).
- Increased the usleep value in cDvbOsd::Cmd() to 5000 in order to work on
  systems with the KURT/utime-patch (thanks to Guido Fiala).
- Changed the check whether the driver is loaded in runvdr to check for the
  'dvb' module (the last one loaded).
- Fixed repeat function with LIRC (thanks to Stefan Huelswitt).
- Increased the upper limit for the symbol rate to 30000 (thanks to Ulrich
  Röder).
- Made the position of the channel display configurable (thanks to Stefan
  Huelswitt).
- Made the width and height of the OSD configurable (thanks to Stefan Huelswitt).
- DiSEqC support can now be generally enabled/disabled in the Setup menu. This
  may be necessary if your multiswitch gets irritated by the default DiSEqC
  codes '0' (thanks to Markus Lang).
- Fixed replaying in case there is no index file.
- Fixed jumping to an editing mark when replay has been paused.
- Avoiding unnecessary code execution in the replay progress display (thanks
  to Guido Fiala).
- When entering time values the digits that still have to be entered are now
  shown as '-' (as in "1-:--").
- When setting an editing mark while the progress display is not active, the
  display will now be turned on for a short while to indicate the successful
  setting of the mark.
- Updated 'channels.conf' for Premiere World (thanks to Helmut Schächner).
  Check your timers if you use this channels.conf file, since the sequence of
  several PW channels has been changed.
- Changed the color of "Info" messages to "black on green" and that of the
  confirmation messages (like "Delete...") to "black on yellow".
- Fixed display with DEBUG_OSD (it still crashes sometimes, esp. when replaying,
  but I can't seem to find what causes this... any ideas anybody?).
- Avoiding audio/video distortions in 'Transfer Mode' by no longer actually
  tuning the primary interface (which can't receive this channel, anyway).
  Apparently the driver gets irritated when the channel is switched and a
  replay session is started immediately after that.
- Increased timeout until reporting "video data stream broken" when recording.
- Explicitly switching back to the previously active channel after ending a
  replay session (to have it shown correctly in case it was in 'Transfer Mode').

1 files changed, 71 insertions, 51 deletions

diff --git a/channels.conf b/channels.conf
index 36b5b28..8fc1a98 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,6 +1,6 @@
 RTL:12188:h:0:27500:163:104:105:0:12003
 Sat.1:12480:v:0:27500:1791:1792:34:0:46
-Pro-7:12480:v:0:27500:255:256:32:0:898
+Pro-7:12480:v:0:27500:255:256;257:32:0:898
 RTL2:12188:h:0:27500:166:128:68:0:12020
 ARD:11837:h:0:27500:101:102:0:0:28106
 BR3:11837:h:0:27500:201:202:0:0:28107
@@ -16,7 +16,7 @@ ZDF:11954:h:0:27500:110:120:130:0:28006
 KiKa:11954:h:0:27500:310:320:0:0:28008
 arte:11836:h:0:27500:401:402:0:0:28109
 ORF1:12692:h:0:22000:160:161:165:3:13001
-ORF2:12692:h:0:22000:500:501:505:3:13007
+ORF2:12692:h:0:22000:500:501:505:3:13002
 ORF Sat:11954:h:0:27500:506:507:0:0:28010
 ZDF.info:11954:h:0:27500:610:620:0:0:28011
 CNN:12168:v:0:27500:165:100:0:0:28512
@@ -46,62 +46,81 @@ MDR:12110:h:0:27500:401:402:0:0:28204
 NICK-PARAMOUNT:12246:v:0:27500:167:108:0:0:29312
 ORB:12110:h:0:27500:501:502:0:0:28205
 B1:12110:h:0:27500:601:602:0:0:28206
-ARD Online-Kanal:12722:h:0:22000:8191:701:0:0:0
+ARD Online-Kanal:12722:h:0:22000:0:701:0:0:0
 :Premiere World
-Premiere World Promo:11798:h:0:27500:255:256:0:0:8
-Premiere:11798:h:0:27500:511:512:0:3:10
-Star Kino:11798:h:0:27500:767:768:0:3:9
-Cine Action:11798:h:0:27500:1023:1024:0:3:20
-Cine Comedy:11798:h:0:27500:1279:1280:0:3:29
-Sci Fantasy:11798:h:0:27500:1535:1536:0:3:41
-Romantic Movies:11797:h:0:27500:1791:1792:0:3:11
-Studio Universal:12090:v:0:27500:255:256:0:3:36
-13th Street:11797:h:0:27500:2303:2304:0:3:43
+Premiere World:11797:h:0:27500:255:256:32:0:8
+Premiere 1:11797:h:0:27500:511:512:0:3:10
+Premiere 2:11797:h:0:27500:1791:1792:0:3:11
+Premiere 3:11797:h:0:27500:2303:2304:0:3:43
+Premiere Star:11797:h:0:27500:767:768:0:3:9
+Premiere Sci-Fi:11797:h:0:27500:1535:1536:0:3:41
+Premiere Action:11797:h:0:27500:1023:1024:0:3:20
+Premiere Comedy:11797:h:0:27500:1279:1280:0:3:29
+13th Street:12031:h:0:27500:2303:2304:0:3:42
+Studio Universal:12090:V:0:27500:255:256:0:3:36
+Filmpalast:12031:h:0:27500:2559:2560:0:3:516
+Heimatkanal:12031:h:0:27500:2815:2816:0:3:517
+Discovery Channel:12031:h:0:27500:1791:1792:0:3:14
+Planet:12090:V:0:27500:1279:1280:0:3:13
+Fox Kids:12031:h:0:27500:1279:1280:0:3:28
 Junior:12031:h:0:27500:255:256:0:3:19
-K-Toon:12032:h:0:27500:511:512:0:3:12
-Disney Channel:12090:v:0:27500:767:768:0:3:34
-Fox Kids:11797:h:0:27500:2559:2560:0:3:22
+K-Toon:12031:h:0:27500:511:512:0:3:12
+Disney Channel:12090:V:0:27500:767:768:0:3:34
 Sunset:12031:h:0:27500:1023:1024:0:3:16
-Comedy:12031:h:0:27500:1279:1280:0:3:28
-Planet:12090:v:0:27500:1279:1280:0:3:13
-Discovery Channel:12031:h:0:27500:1791:1792:0:3:14
 Krimi&Co:12031:h:0:27500:1535:1536:0:3:23
-Filmpalast:11758:h:0:27500:2559:2560:0:3:516
-Heimatkanal:11758:h:0:27500:2815:2816:0:3:517
-Goldstar:11758:h:0:27500:3839:3840:0:3:518
+Goldstar TV:12031:h:0:27500:3839:3840:0:3:518
 Classica:12031:h:0:27500:767:768:0:3:15
-Seasons:12090:v:0:27500:511:512:0:3:33
-Sport 1:11720:h:0:27500:255:256:0:3:17
-Sport 2:12070:h:0:27500:2047:2048:0:3:27
-Sport 3:12070:h:0:27500:2303:2304:0:3:18
-Sport 4:12070:h:0:27500:2559:2560:0:3:24
-Feed (F1 Boxengasse):11720:h:0:27500:2559:2560:0:3:242
-Feed (F1 Data):11720:h:0:27500:3071:3072:0:3:244
-Feed (F1 Multi):11720:h:0:27500:2815:2816:0:3:243
-Feed (F1 On Board):11720:h:0:27500:2303:2304:0:3:241
-Feed (F1 Verfolger):11720:h:0:27500:2047:2048:0:3:240
-Cinedom Deluxe:12070:h:0:27500:1279:1280:0:3:188
-Cinedom 1A de:11758:h:0:27500:511:512:0:3:178
-Cinedom 1A en:11758:h:0:27500:511:513:0:3:178
-Cinedom 1B:12070:h:0:27500:767:768:0:3:185
-Cinedom 1C:12070:h:0:27500:1791:1792:0:3:191
-Cinedom 1E??:11720:h:0:27500:1535:1537:0:3:176
-Cinedom 2A:12070:h:0:27500:1535:1536:0:3:189
-Cinedom 2B:11758:h:0:27500:767:768:0:3:179
-Cinedom 2C:11758:h:0:27500:1023:1024:0:3:193
-Cinedom 2D??:12070:h:0:27500:511:512:0:3:184
-Cinedom 3A:11758:h:0:27500:255:256:0:3:177
-Cinedom 3B:11758:h:0:27500:1279:1280:0:3:194
-Cinedom 3C??:12090:v:0:27500:1279:1280:17689:3:192
-Cinedom 4A:11758:h:0:27500:1535:1536:0:3:195
-Cinedom 4B:12070:h:0:27500:1023:1025:0:3:186
-Cinedom 4C??:11720:h:0:27500:767:768:0:3:181
-Cinedom 5A:12032:h:0:27500:2559:2560:0:3:187
-Beate Uhse_TV:11797:h:0:27500:2047:2048:0:3:21
-Blue Channel:11758:h:0:27500:2559:2560:0:3:516
+Seasons:12090:V:0:27500:511:512:0:3:33
+:Cinedom
+Cinedom Deluxe:11758:h:0:27500:255:256,257;259:0:3:189
+Cinedom 1A:11758:h:0:27500:511:512,513:0:3:190
+Cinedom 1B:12070:h:0:27500:1535:1536,1537:0:3:178
+Cinedom 1C:11720:h:0:27500:511:512,513:0:3:180
+Cinedom 1D:11720:h:0:27500:1535:1536,1537:0:3:176
+Cinedom 2A:11758:h:0:27500:1023:1024:0:3:193
+Cinedom 2B:11720:h:0:27500:1279:1280:0:3:183
+Cinedom 2C:12070:h:0:27500:1791:1792:0:3:179
+Cinedom 2D:12070:h:0:27500:511:512:0:3:184
+Cinedom 2E:12070:h:0:27500:1279:1280:0:3:188
+Cinedom 3A:11758:h:0:27500:2559:2560:0:3:192
+Cinedom 3B:11758:h:0:27500:1535:1536:0:3:195
+Cinedom 3C:12070:h:0:27500:767:768:0:3:185
+Cinedom 3D:11720:h:0:27500:1023:1024:0:3:182
+Cinedom 4A:11758:h:0:27500:767:768:0:3:191
+Cinedom 4B:11720:h:0:27500:767:768:0:3:181
+Cinedom 4C:12070:h:0:27500:2047:2048:0:3:187
+Cinedom 5A:11758:h:0:27500:1279:1280:0:3:194
+Cinedom 5B:11720:h:0:27500:1791:1792:0:3:177
+Cinedom 5C:12070:h:0:27500:1023:1024:0:3:186
+:Beta Digital
+CNBC:12148:h:0:27500:255:256:0:3:35
+Liberty TV.com:12610:V:0:22000:941:943:0:0:12199
+:PW Erotic
+Beate-Uhse.TV:11758:h:0:27500:3839:3840:0:3:21
 Blue Movie 1:11758:h:0:27500:1791:1792:0:3:513
 Blue Movie 2:11758:h:0:27500:2047:2048:0:3:514
 Blue Movie 3:11758:h:0:27500:2303:2304:0:3:515
+:Sportsworld
+Premiere Sport 1:11719:h:0:27500:255:256:0:3:17
+Premiere Sport 2:11719:h:0:27500:3327:3328:0:3:27
+Premiere Sport 3:11758:h:0:27500:2815:2816:0:3:18
+:Formel 1
+Infokanal:11720:h:0:27500:3071:3072:0:3:244
+Multikanal:11720:h:0:27500:2815:2816:0:3:243
+Supersignal:11720:h:0:27500:255:256:0:3:17
+Verfolgerfeld:11720:h:0:27500:2303:2304:0:3:241
+Cockpitkanal:11720:h:0:27500:2559:2560:0:3:242
+Boxengasse:11720:h:0:27500:2047:2048:0:3:240
+:Premiere World Bundesliga
+Superdom:12070:h:0:27500:255:256:0:3:26
+Spiel 1:11719:h:0:27500:255:256,257:0:3:17
+Spiel 2:11719:h:0:27500:2047:2048,2049:0:3:240
+BuLi-Konferenz:12070:h:0:27500:3071:3072,3073:0:3:208
+BuLi-Spiel 1:12070:h:0:27500:3327:3328,3329:0:3:209
+BuLi-Spiel 2:12070:h:0:27500:2303:2304,2305:0:3:210
+BuLi-Spiel 3:12070:h:0:27500:3583:3584,3585:0:3:211
+BuLi-Spiel 4:12070:h:0:27500:2559:2560,2561:0:3:212
+BuLi-Spiel 5:12070:h:0:27500:2815:2816,2817:0:3:213
 :
 TV Niepokalanow:11876:h:0:27500:305:321:0:0:20601
 Mosaico:11934:v:0:27500:165:100:0:0:29010
@@ -164,7 +183,7 @@ Astra Vision 1:12552:v:0:22000:168:149:0:0:0
 Astra Vision 1:12552:v:0:22000:168:150:0:0:0
 RTL Tele Letzebuerg:12552:v:0:22000:168:144:0:0:0
 Astra Mosaic:12552:v:0:22000:175:176:0:0:0
-MHP test:12604:h:0:22000:5632:8191:0:0:0
+MHP test:12604:h:0:22000:5632:0:0:0:0
 VERONICA:12574:h:0:22000:161:84:0:0:5010
 VH1 Classic:12699:v:0:22000:3071:3072:0:0:28647
 VH-1 Germany:12699:v:0:22000:3081:3082:0:0:28648
@@ -173,3 +192,4 @@ Video Italia:12610:v:0:22000:121:122:0:0:12220
 AC 3 promo:12670:v:0:22000:308:256:0:0:0
 ORF/ZDF:12699:h:0:22000:506:507:0:0:13012
 VIVA:12670:v:0:22000:309:310:0:0:12732
+MTV Central Europe:12699:v:0:22000:3031:3032:0:0:28643