Version 0.97vdr-0.97

- Implemented a lock file to prevent more than one instance of VDR from removing
  files from the video directory at the same time.
- The new setup parameter SplitEditedFiles can be used to control whether or
  not the result of an editing process shall be written into separate files.
- Fixed handling repeat function when using LIRC (thanks to Matthias Weingart).
- The shutdown program (defined with the '-s' option) now also gets the channel
  number and recording title of the timer (see INSTALL).
- New channel data for 'Premiere One', 'Premiere X-Action', 'Fox Kids Türkce'
  and 'N24' (thanks to Andreas Share, Ulrich Röder, Uwe Scheffler and Simon
  Bauschulte). Note that if you are using the default 'channels.conf' or
  'channels.conf.cable' files you may need to check any exiting timers to see
  whether they still use the correct channel number.
- Fixed the "EPG bugfix" (sometimes had duplicate information in Subtitle and
  Extended Description).
- Fixed checking for valid video device when setting the video mode.
- The external command 'sort' is no longer required. VDR now sorts the list of
  recordings itself, making sure that recordings that stem from repeating timers
  are sorted chronologically. Sorting is done according to the setting of the
  current locale, so you may want to make sure LC_COLLATE is set to the desired
  value (see INSTALL).
- Fixed handling 'newline' characters in EPG texts (thanks to Rolf Hakenes for
  an improved version of his 'libdtv').
  Newline characters are always mapped to a single "blank" in VDR, because they
  would otherwise disturb the Title and Subtitle layout in the channel display
  (where these are assumed to be single line texts) and would have to be
  specially handled in the 'epg.data' file and the LSTE command in SVDRP.
- Mapping ` ("backtick") characters in EPG texts to ' (single quote).
- Fixed timers starting and ending at unexpected times. 'localtime()' was not
  thread safe, now using localtime_r().
- Removed the "system time seen..." message.
- Fixed a bug in the replay mode display when pressing the Green or Yellow
  button while in trick mode (thanks to Stefan Huelswitt)
- Closing all open file descriptors when calling external programs.
- The menu timeout now also works when pressing the "Back" button during replay
  to enter the "Recordings" menu.
- Updated 'channels.conf' for the "Bundesliga" channels of Premiere World
  (thanks to Helmut Schächner).
- Fixed reading timers.conf and channels.conf that contain blanks after numeric
  values.
- Fixed handling trick modes near the beginning and end of a recording.
- Pressing the "Back" button while replaying a DVD now leads to the DVD menu.

1 files changed, 73 insertions, 78 deletions

diff --git a/channels.conf.cable b/channels.conf.cable
index 60b3eb5..6e0f43b 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -1,54 +1,56 @@
 :verschlüsselte Fernsehprogramm
-PREMIERE 1:370:h:0:6900:511:512:0:1:10
-PREMIERE 2:370:h:0:6900:1791:1792:0:1:11
-PREMIERE 3:370:h:0:6900:2303:2304:0:1:43
-PREMIERE ACTION:370:h:0:6900:1023:1024:0:1:20
+PREMIERE ONE:378:h:0:6900:3071:3072:0:1:51
+PREMIERE MOVIE 1:370:h:0:6900:511:512: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:0:1:42
+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
-SEASONS:402:h:0:6900:1040:1044:0:1:33
 CLASSICA:378:h:0:6900:767:768:0:1:15
 GOLDSTAR TV:378:h:0:6900:3839:3840:0:1:518
-FILMPALAST:378:h:0:6900:2559:2560:0:1:516
 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
-K-TOON:378:h:0:6900:12:13:0:1:12
 :Fernsehprogramme
-Das Erste:410:h:0:6900:101:102:104:0:28106
-ZDF:394:h:0:6900:110:120:130:0:28006
+Das Erste:410:h:0:6900:101:102,88:104:0:28106
+ZDF:394:h:0:6900:110:120,121:130:0:28006
 ZDF.info:394:h:0:6900:610:620:0:0:28011
 ZDF.doku:394:h:0:6900:660:670:0:0:28014
-ZDF Theaterkanal:394:h:0:6900:3440:3441:0:0:28016
+ZDF Theaterkanal:394:h:0:6900:1110:1120:130:0:28016
+EinsExtra:426:h:0:6900:101:102:0:0:28201
+EinsFestival:426:h:0:6900:201:202:0:0:28202
+EinsMuXx:426:h:0:6900:301:302:0:0:28203
 3sat:394:h:0:6900:210:220:230:0:28007
-KiKa:394:h:0:6900:310:320:330:0:28008
+arte:410:h:0:6900:401:402:404:0:28109
 EuroNews:394:h:0:6900:2221:2233:768:0:28015
+Phoenix:410:h:0:6900:901:902:0:0:28114
 Eurosport:394:h:0:6900:410:420:430:0:28009
 DW-tv:610:h:0:6900:634:632:0:0:6101
 CNBC:394:h:0:6900:510:520:530:0:28010
-Test-R:410:h:0:6900:901:902:104:0:28130
-Bayerisches FS:410:h:0:6900:201:202:204:0:28107
 WDR FERNSEHEN:410:h:0:6900:601:602:604:0:28111
-arte:410:h:0:6900:401:402:404:0:28109
+MDR FERNSEHEN:426:h:0:6900:401:402:404:0:28204
 SR Fernsehen Suedwest:410:h:0:6900:501:502:504:0:28110
-hessen fernsehen:410:h:0:6900:301:302:304:0:28108
+SuedWest BW:410:h:0:6900:801:802:804:0:28113
+SuedWest RP:426:h:0:6900:3101:3102:3104:0:28231
 BR-alpha:410:h:0:6900:701:702:704:0:28112
-SWR Fernsehen:410:h:0:6900:801:802:804:0:28113
-Phoenix:410:h:0:6900:901:902:0:0:28114
-EinsExtra:426:h:0:6900:101:102:0:0:28201
-EinsFestival:426:h:0:6900:201:202:0:0:28202
-EinsMuXx:426:h:0:6900:301:302:0:0:28203
-MDR FERNSEHEN:426:h:0:6900:401:402:404:0:28204
-ORB-Fernsehen:426:h:0:6900:501:502:504:0:28205
 B1 Berlin:426:h:0:6900:601:602:604:0:28206
 N3:426:h:0:6900:2401:2402:2404:0:28224
+ORB-Fernsehen:426:h:0:6900:501:502:504:0:28205
+hessen fernsehen:410:h:0:6900:301:302:304:0:28108
+Bayerisches FS:410:h:0:6900:201:202:204:0:28107
+Test-R:410:h:0:6900:901:902:104:0:28130
 :Mediavision
 Extreme Sport:346:h:0:6900:801:802:0:1:50700
 Bloomberg:346:h:0:6900:811:812:0:1:50701
@@ -60,6 +62,7 @@ Einstein:346:h:0:6900:623:624:0:1:50719
 Leitseite:346:h:0:6900:2254:0:0:0:5004
 Via 1 - Schöner Reisen:346:h:0:6900:611:612:0:0:50705
 Parlamentsfernsehen:610:h:0:6900:33:36:47:0:6100
+Vh1 - Classic:610:h:0:6900:604:603:0:0:6106
 :Diverse TV-Sender
 TV Polonia:434:h:0:6900:641:642:0:1:53204
 Kanal D:434:h:0:6900:651:652:0:1:53205
@@ -68,18 +71,10 @@ ERT-Sat:434:h:0:6900:691:692:0:1:53209
 CNE:434:h:0:6900:4056:4057:0:1:53208
 ZEE TV:442:h:0:6900:517:773:0:1:53301
 NTV i:442:h:0:6900:514:515:0:1:53302
-Leonardo:610:h:0:6900:653:652:0:1:6102
-Alice:610:h:0:6900:651:650:0:1:6103
-Nuvolari:610:h:0:6900:649:648:0:1:6104
 ATV:434:h:0:6900:631:632:0:0:53203
-unknown:434:h:0:6900:2570:2571:0:0:18954
 TW1:610:h:0:6900:6106:6107:0:0:6106
-unknown:346:h:0:6900:2930:2931:0:0:11122
-unknown:394:h:0:6900:1844:1845:0:1:59188
-unknown:410:h:0:6900:627:628:0:1:627
 PREMIERE WORLD:370:h:0:6900:255:256:32:0:8
 :Premiere World Bundesliga
-SUPERDOM:386:h:0:6900:255:257:0:1:26
 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
@@ -90,9 +85,9 @@ 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
-PR-SPORT 1:362:h:0:6900:255:256:0:1:17
-PR-SPORT 2:362:h:0:6900:3327:3328:0:1:27
-PR-SPORT 3:362:h:0:6900:2815:2816:0:1:18
+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
@@ -106,35 +101,40 @@ 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:0:1:179
-Cinedom 2B:362:h:0:6900:1279:1280:0:1:183
+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:0:1:182
+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:0:1:181
+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:0:1:186
-Cinedom 5B:354:h:0:6900:1279:1280:0:1:194
+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;259:0:1:189
+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
-100,6:354:h:0:6900:0:1312:0:0:161
+Fritz:426:h:0:6900:0:901:0:0:28209
+HR XXL:410:h:0:6900:0:3501:0:0:28125
+JUMP:426:h:0:6900:0:1001:0:0:28210
+SPUTNIK:426:h:0:6900:0:1201:0:0:28212
+RADIOmultikulti:426:h:0:6900:0:1301:0:0:28213
 DLR-Berlin:394:h:0:6900:0:710:0:0:28012
 DLF-Köln:394:h:0:6900:0:810:0:0:28013
 Österreich 1:394:h:0:6900:0:169:0:0:28017
+100,6:354:h:0:6900:0:1312:0:0:161
 Bayern 4 Klassik:410:h:0:6900:0:3001:0:0:28120
 B5 aktuell:410:h:0:6900:0:3101:0:0:28121
 Bremen 2:410:h:0:6900:0:3801:0:0:28128
@@ -143,47 +143,42 @@ NDR 4 Info:410:h:0:6900:0:3701:0:0:28127
 SR 1:410:h:0:6900:0:3901:0:0:28129
 hr-klassik:410:h:0:6900:0:3401:0:0:28124
 hr2:410:h:0:6900:0:3301:0:0:28123
-HR XXL:410:h:0:6900:0:3501:0:0:28125
 hr-chronos:410:h:0:6900:0:3201:0:0:28122
 Radio 3:426:h:0:6900:0:701:0:0:28207
 MDR KULTUR:426:h:0:6900:0:801:0:0:28208
-Fritz:426:h:0:6900:0:901:0:0:28209
-JUMP:426:h:0:6900:0:1001:0:0:28210
 MDR info:426:h:0:6900:0:1101:0:0:28211
-SPUTNIK:426:h:0:6900:0:1201:0:0:28212
-RADIOmultikulti:426:h:0:6900:0:1301:0:0:28213
 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
-KLASSIK POPULÄR:378:h:0:6900:0:592:0:1:145
-KLASS. SYMPHONIEN:378:h:0:6900:0:608:0:1:146
-OPER & VOKALMUSIK:378:h:0:6900:0:624:0:1:147
-BAROCKMUSIK:378:h:0:6900:0:640:0:1:148
-JAZZ:378:h:0:6900:0:656:0:1:149
-HITLISTE:378:h:0:6900:0:784:0:1:150
-ALTERNATIVE ROCK:378:h:0:6900:0:800:0:1:151
-DANCE:378:h:0:6900:0:816:0:1:152
-COUNTRY:378:h:0:6900:0:352:0:1:153
-CLASSIC ROCK:378:h:0:6900:0:544:0:1:154
-FILMMUSIK:378:h:0:6900:0:368:0:1:155
-DEUTSCHE HITS:402:h:0:6900:0:1156:0:1:156
-SOUL CLASSICS:402:h:0:6900:0:1161:0:1:157
-TÜRK MÜZIGI:402:h:0:6900:0:1166:0:1:158
-GOLD:402:h:0:6900:0:1171:0:1:159
-EASY LISTENING:402:h:0:6900:0:1201:0:1:162
-LOVE SONGS:402:h:0:6900:0:1191:0:1:163
-MUSICALS:402:h:0:6900:0:1196:0:1:164
-OLD GOLD:402:h:0:6900:0:1186:0:1:165
-SCHLAGER:402:h:0:6900:0:1176:0:1:166
-VOLKSMUSIK:402:h:0:6900:0:1181:0:1:167
-All Jazz:442:h:0:6900:0:535:0:1:53350
-Cristal New Age:442:h:0:6900:0:536:0:0:53351
-Movie Sounds:442:h:0:6900:0:537:0:1:53352
-Sinfonica:442:h:0:6900:0:538:0:1:53353
-Opernfestival:442:h:0:6900:0:539:0:1:53354
-Barock Fantasie:442:h:0:6900:0:540:0:1:53355
-Musica Camerata:442:h:0:6900:0:541:0:1:53356
-Musica Antica:442:h:0:6900:0:542:0:1:53357
-Adagio:442:h:0:6900:0:543:0:1:53358
-Jazz Legends:442:h:0:6900:0:544:0:1:53359
+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