Version 0.95vdr-0.95

- Fixed behaviour in case the shutdown didn't take place (there were many
  "next timer event at..." messages in that case).
- Reduced the default value for MinEventTimeout to 30 minutes.
- Fixed detecting manual start in shutdown feature.
- An error message is now displayed in case the Transfer Mode can't be
  started because the necessary DVB card is currently recording (or there
  is no DVB card that can access this channel).
- Fixed toggling channels with the '0' key in case the "Ok" button has been
  pressed to display the current/next information.
- Pressing the "Power" key now always initiates the shutdown sequence (after
  user confirmation in case of a recording timer), event if there is currently
  a menu or a replay session active. Note the additional remarks in INSTALL
  regarding the values of the two parameters given to the shutdown program
  in case of a currently recording timer.
- Switching through channel groups with the "Left" and "Right" keys now
  always starts at the group that contains the current channel.
- Implemented "Multi Speed Mode" (thanks to Stefan Huelswitt).
- Implemented backtracing to hit the right spot after fast forward/rewind
  (thanks to Stefan Huelswitt).
- Implemented replay mode display (thanks to Stefan Huelswitt, with a few
  rewrites by kls).
- Changed the size of all input buffers used to parse config files or receive
  SVDRP commands to the same value of 10KB. This allows long strings to be
  used in the 'summary' field of a timer, for instance.
- The pipe to the Dolby Digital replay command (option '-a') now closes all
  unused file descriptors in the child process to avoid crashing when the
  OSD is used (thanks to Andreas Vitting).
- Switched to the driver's new tuning API (VDR now requires a driver version
  dated 2001-09-14 or higher).
- Changed obsolete macro VIDEO_WINDOW_CHROMAKEY to VID_TYPE_CHROMAKEY (thanks
  to Guido Fiala).
- New version of the "Master-Timer" tool (thanks to Matthias Schniedermeyer).
- Better error handling when writing configuration files.
- Fixed putting the final editing mark into the edited version's marks file.
- Fixed manipulating an editing mark at the very end of a recording.
- Fixed starting a new replay immediately after stopping a previous one (had
  caused a mix between live video and replay).
- Three new keys ("Volume+", Volume-" and "Mute") to control the DVB card's
  audio output volume.
- New version of the 'epg2timers' tool (thanks to Carsten Koch).

6 files changed, 325 insertions, 121 deletions

diff --git a/Tools/master-timer/sample/channels-to-scan b/Tools/master-timer/sample/channels-to-scan
index 6acf157..22f473d 100644
--- a/Tools/master-timer/sample/channels-to-scan
+++ b/Tools/master-timer/sample/channels-to-scan
@@ -3,6 +3,4 @@
 3
 4
 5
-13
-18
-21
+49
diff --git a/Tools/master-timer/sample/config b/Tools/master-timer/sample/config
index d01c8a8..3180943 100644
--- a/Tools/master-timer/sample/config
+++ b/Tools/master-timer/sample/config
@@ -1,14 +1,32 @@
-# How Many Seconds "too early" should the timer begin
+# Master-Timer config file. Values shown here are defaults.
+
+# How many seconds "too early" should the timer begin
 marginstart	= 600
-# How Many Seocnds "too long" should the timer end
+
+# How many seconds "too long" should the timer end
 marginstop	= 600
-# When the Prio isn't provied in the config-File use this value
+
+# When the Prio isn't provided in the config file use this value
 defaultprio	= 50
-# How many DVB-Cards are installed in the Computer (Not used yet)
-DVBCards	= 3
-# IP/Hostname:Port of the Destinations (Space is used for delimiter)
-Dest-Host 	= localhost:2001
-# Should Timers on the same channels be joined when they overlapp (0 = off)
-jointimers	= 1
-# Debug-Level
+
+# How many DVB cards are installed in the computer (not used yet)
+DVBCards	= 1
+
+# IP/Hostname:Port of the destination (space is used for delimiter)
+Dest	 	= localhost:2001
+
+# Should timers on the same channels be joined when they overlap (0 = off)
+jointimers	= 0
+
+# Should the description be transfered to VDR?
+description     = 0
+
+# Debug level
+#    1     : Dump "torecord"
+#    2     : Dump all timers
+#    4     : Show when a timer will be deleted
+#    8     : Dump the "Done" REs
+#    16    : Verbose config reading
+#    32    : Dump program variables
+#    64    : Excessive deepblack/torecord debuging
 debug		= 0
diff --git a/Tools/master-timer/sample/convert-channel-list b/Tools/master-timer/sample/convert-channel-list
new file mode 100644
index 0000000..a97f3c5
--- /dev/null
+++ b/Tools/master-timer/sample/convert-channel-list
@@ -0,0 +1,26 @@
+Kabel 1|Kabel 1
+MTV|MTV Central
+PRW 13TH Street|13th Street
+PRW Discovery Channel|Discovery Channel
+PRW Disney Channel|Disney Channel
+PRW FOX KIDS|Fox Kids
+PRW Junior|Junior
+PRW K-Toon|K-Toon
+PRW Krimi & Co|Krimi &Co
+PRW Planet|Planet
+PRW Sci-Fantasy|Premiere Sci-Fi
+PRW Studio Universal|Studio Universal
+PRW Sunset|Sunset
+Premiere Action|Premiere Action
+Premiere Comedy|Premiere Comedy
+Premiere STAR|Premiere Star
+Premiere World 1|Premiere 1
+Premiere World 2|Premiere 2
+Premiere World 3|premiere 3
+Pro Sieben|Pro-7
+RTL|RTL
+RTL 2|RTL2
+Sat.1|Sat.1
+Super RTL|Super RTL
+Viva|VIVA
+Vox|VOX
diff --git a/Tools/master-timer/sample/deepblack b/Tools/master-timer/sample/deepblack
index 63b4f9e..12884fe 100644
--- a/Tools/master-timer/sample/deepblack
+++ b/Tools/master-timer/sample/deepblack
@@ -1,79 +1,172 @@
-Für alle Fälle Stefanie
-'MAX' - Das ganze Leben!
-10 vor 11
-17:30 live
-18:30
-24 Stunden
-Andreas Türck
-Arabella
-^BIZZ$
-Big Brother
-Britt - Der Talk um Eins
-Bärbel Schäfer
-Call TV
-Chicago Hope - Endstation Hoffnung
-Chicago Hope
-DIE REDAKTION
-Dauerwerbesendungen
-Die Harald Schmidt Show
-Die Oliver Geissen Show
-Die Quiz Show
-Doppelter Einsatz
-Dr. Stefan Frank - Der Arzt, dem die Frauen vertrauen
-EXCLUSIV
-EXTRA
-Ehekriege
-Ein Bayer auf Rügen
-Emergency Room
-Explosiv - Das Magazin
-GIRLSCAMP
-Glücksrad
-Gute Zeiten, schlechte Zeiten
-Hallo, Onkel Doc!
-Hans Meiser
-Hercules
-Hinter  Gittern - Der Frauenknast
-Infomercials
-Jeder gegen Jeden
-K1 DIE REPORTAGE
-K1 Das Magazin
-K1 Nachrichten
-Kickers
-Kochduell
-Nachrichten
-Nicole - Entscheidung am Nachmittag
-OP ruft Dr. Bruckner
-PREMIERE WORLD - Das Programm
-PROSIEBEN REPORTAGE
-Peter Imhof
-Programm ab
-Programm von
-Punkt 12
-Punkt 6
-Punkt 9
-RTL II News
-RTL SHOP
-RTL aktuell
-RTL-Nachtjournal
-SAT.1-FRÜHSTÜCKSFERNSEHEN
-Spiegel TV-Reportage
-UEFA Champions
-fussball
-fßball
-Vera am Mittag
-Wolffs Revier
-Zapping
-alphateam
-peep!
-s.a.m.
-taff.
-^blitz$
-SK Kölsch
-^Becker$
-Kommissar Rex
-Fit For Fun TV
-Nur die Liebe zählt
-Unsere kleine Farm
-Die Waltons
-^Die Zwei$
-^Sieben$
+# [<Anytext>]
+#   This marks the beginning of a deepblack-entry
+# Title = <text>
+#   This matches a title
+# Subtitle = <text>
+#   This matches a subtitle
+# Description = <text>
+#   This matches a description
+# Category = <left>/<right>
+#   This matches a DTV-Category
+# Channel = <Channel>
+#   Restricts a deepblack-entry to a specific channel.
+#   A single "!" at start of channel list negates the selection.
+# Timeframe = <begin>-<end>
+#   Restricts a deepblack-entry to a specific timeframe.
+#   No timers with start time in the timeframe will be programmed.
+# minlength = <Number>
+#   Restricts a deepblack-entry to a specific minimum length
+#   (postfix "m" for minutes, "h" for hours.)
+# maxlength = <Number>
+#   Restricts a deepblack-entry to a specific maximum length
+#   (postfix "m" for minutes, "h" for hours.)
+# weekday = MTWTFSS
+#   Restricts a deepblack-entry to a specific weekday
+# instance = <Number>
+#   Only apply this deepblack-entry for a specific Instance
+#   "s" is a special value used for "-s"-Mode
+#
+# The "Title", "Subtitle", "Description", "Channel"-Lines can be
+# supplied any number of times for a specific entry
+#
+# To deepblack something at least one of the "Title", "Subtitle" or
+# "Description" (If you don't have anything "better" use "Title = ."
+# for this matches everything) fields has to be provided.
+# These three fields are "include" and the rest are "exclude" fields.
+
+[Blacklist all Talkshows]
+Title = .
+Category = Talk
+
+[Blacklist all Lifestyles]
+Title = .
+Category = /Lifestyles
+
+[Blacklist Sport/Tennis]
+Title = .
+Category = Sport/Tennis
+
+[Record only ZDF and Pro7]
+Title = .
+Channel = !ZDF
+Channel = ProSieben
+
+[Blacklist a timeframe]
+Title = .
+Timeframe = 1000-1400
+
+[Blacklist everything with less than 5 minutes duration]
+Title = .
+maxlength = 5m
+
+[Sinnlose Serien]
+Title = Für alle Fälle Stefanie
+Title = Chicago Hope - Endstation Hoffnung
+Title = Chicago Hope
+Title = Doppelter Einsatz
+Title = Dr. Stefan Frank - Der Arzt, dem die Frauen vertrauen
+Title = Ehekriege
+Title = Ein Bayer auf Rügen
+Title = Emergency Room
+Title = Gute Zeiten, schlechte Zeiten
+Title = Hallo, Onkel Doc!
+Title = Hercules
+Title = Hinter  Gittern - Der Frauenknast
+Title = OP ruft Dr. Bruckner
+Title = Wolffs Revier
+Title = alphateam
+Title = SK Kölsch
+Title = ^Becker$
+Title = Kommissar Rex
+Title = Nur die Liebe zählt
+Title = Unsere kleine Farm
+Title = Die Waltons
+Title = ^Die Zwei$
+
+[Glueckspiele]
+Title = Die Quiz Show
+Title = Glücksrad
+Title = Jeder gegen Jeden
+Title = Kochduell
+
+[Infotainment und Boulevardzeug]
+Title = 'MAX' - Das ganze Leben!
+Title = ^BIZZ$
+Title = Big Brother
+Title = GIRLSCAMP
+Title = Call TV
+Title = DIE REDAKTION
+Title = EXCLUSIV
+Title = EXTRA
+Title = Explosiv - Das Magazin
+Title = K1 DIE REPORTAGE
+Title = K1 Das Magazin
+Title = PROSIEBEN REPORTAGE
+Title = Fit For Fun TV
+Title = peep!
+Title = s.a.m.
+Title = taff.
+Title = ^blitz$
+Title = Die Harald Schmidt Show
+Title = Spiegel TV-Reportage
+
+[Nachrichten]
+Title = 10 vor 11
+Title = 17:30 live
+Title = 18:30
+Title = 24 Stunden
+Title = Punkt 12
+Title = Punkt 6
+Title = Punkt 9
+Title = RTL II News
+Title = RTL aktuell
+Title = RTL-Nachtjournal
+Title = K1 Nachrichten
+Title = Nachrichten
+
+[Talkshows]
+Title = Andreas Türck
+Title = Arabella
+Title = Britt - Der Talk um Eins
+Title = Bärbel Schäfer
+Title = Die Oliver Geissen Show
+Title = Peter Imhof
+Title = Vera am Mittag
+Title = Hans Meiser
+Title = Nicole - Entscheidung am Nachmittag
+Title = Franklin
+
+[So richtig Sinnloses]
+Title = Dauerwerbesendungen
+Title = Infomercials
+Title = Kickers
+Title = RTL SHOP
+Title = SAT.1-FRÜHSTÜCKSFERNSEHEN
+Title = Zapping
+
+[PREMIERE WORLD - Das Programm]
+Title = PREMIERE WORLD - Das Programm
+Title = Programm ab
+Title = Programm von
+
+[Fussball]
+Title = fussball
+Title = fußball
+Title = UEFA Champions
+
+#Sonstiges
+[^Sieben$]
+Title = ^Sieben$
+
+[Starporträt Kevin Spacey]
+Title = Starporträt Kevin Spacey
+
+ 
+[All Movies for -s]
+Subtitle = MOVIE
+Instance = s
+ 
+[All >= 65m for -s]
+Title = .
+minlength = 65m
+Instance = s
diff --git a/Tools/master-timer/sample/subtitle-movie b/Tools/master-timer/sample/subtitle-movie
index 3b5a0ab..9bd3579 100644
--- a/Tools/master-timer/sample/subtitle-movie
+++ b/Tools/master-timer/sample/subtitle-movie
@@ -3,6 +3,7 @@
 ^Actionkomödie$
 ^Actionthriller$
 ^Agentenfilm$
+^Beziehungskomödie$
 ^Biografie$
 ^Biographie$
 ^Computeranimation$
@@ -12,19 +13,24 @@
 ^Familiendrama$
 ^Fantasy$
 ^Fantasykomödie$
+^Fantasy-Komödie$
 ^Gangsterfilm$
 ^Gerichtsfilm$
 ^Gesellschaftsdrama$
+^Historiendrama$
 ^Horrorfilm$
 ^Horrorkomödie$
+^Jugenddrama$
 ^Kinderfilm$
 ^Komödie$
 ^Kriegsfilm$
 ^Krimikomödie$
 ^Kriminalfilm$
 ^Liebesfilm$
+^Liebeskomödie$
 ^Melodram$
 ^Melodrama$
+^Monumentalfilm$
 ^Musical$
 ^Politthriller$
 ^Psychothriller$
@@ -32,10 +38,15 @@
 ^Romanze$
 ^Satire$
 ^Science-Fiction$
+^Science-Fiction-Komödie$
 ^Spielfilm$
 ^TV Movie$
 ^TV-Drama$
+^Teil .$
+^Teil 0.$
 ^Thriller$
+^Tragikomödie$
 ^Western$
+^Westernkomödie$
 ^Zeichentrick$
 ^Zeichentrickkomödie$
diff --git a/Tools/master-timer/sample/torecord b/Tools/master-timer/sample/torecord
index 0306830..0c97b91 100644
--- a/Tools/master-timer/sample/torecord
+++ b/Tools/master-timer/sample/torecord
@@ -1,32 +1,90 @@
-# Format: (Every field is "optional".
-# [Title RE|Subtitle RE|Description RE|Channel-Name|Timeframe|Prio|Timer-Title|Marginstart;Marginstop|VDR-Instance]
+# [<Anytext>]
+#   This marks the beginning of a timer entry
+# Title = <text>
+#   This matches a title
+# Subtitle = <text>
+#   This matches a subtitle.
+#   You may use the magic "MOVIE" or "!MOVIE" which matches
+#   all entries from file "subtitle-movie".
+# Description = <text>
+#   This matches a description
+# Category = <left>/<right>
+#   This matches a DTV-Category
+# Channel = <Channel>
+#   Restricts a time to a specific channel.
+#   A single "!" at start of channel list negates the selection.
+# Timeframe = <begin>-<end>
+#   Restricts timer to a specific timeframe.
+#   Only timers with start time in the timeframe will be programmed.
+# minlength = <Number>
+#   Restricts timer entry to a specific minimum length
+#   (postfix "m" for minutes, "h" for hours.)
+# maxlength = <Number>
+#   Restricts a timer entry to a specific maximum length
+#   (postfix "m" for minutes, "h" for hours.)
+# weekday = MTWTFSS
+#   Restricts a timer to a specific weekday
+# Timertitle = <text>
+#   The title used for this timer.
+#   If this is not provided "Title" will be used.
+#   If "Title" is not provided the EPG title will be used.
+# Margin = <Number>;<Number>
+#   Seconds added to the beginning and end of the timer.
+#   Positive numbers will lengthen the recording.
+# instance = <Number>
+#   The instance of VDR for which this timer is.
+#   If this is not provided the timer is valid for ALL instances.
 #
-# To record something at least one of the "Title", "Subtitle" or "Description" 
-# Fields has to be provided. This 3 fields are "include" and the rest are 
-# "exclude" fields!
-#
-# More than one channel definition can be provided. The delimiter is ";"
-# Additionaly you can make a "blacklist" of Channels when you prepent a "!" to the first Channel Definition
-# The "!" is only tested for the FIRST Channel definition.
-# You can only have a white or a blacklist (Mixing doesn't make sense!)
-#
-# ex. Record the series "Deep Space Nine" on Sci-Fantasy in the timeframe 09:00 - 14:00 with 60 Seconds Marginstart and -60 Seconds Marginstop
-# Deep Space Nine|||Sci-Fantasy|0900-1400|99|DS9|60;-60
+# The "Title", "Subtitle", "Description", "Channel"-Lines can be
+# supplied any number of times for a specific entry
 #
-# Record all "Actionfilm"s with "Schwarzenegger"
-# |Actionfilm|Schwarzenegger
-#
-Babylon 5|||!Pro-7||99|60;-60|1
-Deep Space Nine|||||99|DS9|60;-60|2
-Seven Days|||||99|
-Stargate|||||99|
-Futurama||||2100-2300|50|
-Ally McBeal|||||99|
-Snoops|||||50|
-^Friends$|||||99|Friends|
-Pensacola|||||50|
-seaQuest|||||50|
-||Paltrow|Sci Fantasy;13th Street;Star Kino;Cine Action;Cine Comedy;Romantic Movies;Studio Universal;Premiere||99|
-||Aniston|||99|
-Matrix
+# To record something at least one of the "Title", "Subtitle" or "Description"
+# fields has to be provided. These three fields are "include" and the rest are
+# "exclude" fields!
+
+[Dies ist ein Test-Timer]
+Title = Titel
+Subtitle = Subtitel
+Description = Description
+Category = Serie/Krimi
+Channel = Pro-7
+Channel = VIVA
+Timeframe = 1230-1830
+Prio = 50
+Lifetime = 50
+minlength = 10m
+maxlength = 3h
+weekday = ---T---
+Timertitle = Test
+Margin = 600;600
+instance = 2
+
+# Record Babylon 5 only if NOT playing on Pro 7;
+# recording starts one minute too early and ends
+# one minute too early (to skip following ads).
+[Babylon 5]
+Title = Babylon 5
+Channel = !Pro-7
+Prio = 99
+Margin = 60;-60
+
+[DS9]
+Title = Deep Space Nine
+Prio = 99
+Timertitle = DS9
+Margin = 60;-60
+
+[Seven Days]
+Title = Seven Days
+Prio = 99
+
+[Stargate]
+Title = Stargate
+Prio = 99
+
+[Aniston]
+Description = Aniston
+Prio = 99
 
+[Matrix]
+Title = Matrix