Version 0.90vdr-0.90

- Modified the display of the channel group separators (thanks to Markus Lang
  for this suggestion).
- Added support for replaying DVDs (thanks to Andreas Schultz). See INSTALL for
  instructions on how to compile VDR with DVD support.
- Fixed replay progress display in case replay is paused while watching an
  ongoing recording.
- Ringbuffer uses semaphores to signal empty/full conditions.
- Fixed calculating the timeout value in cFile::FileReady() (thanks to
  Wolfgang Henselmann-Weiss).

6 files changed, 175 insertions, 0 deletions

diff --git a/Tools/master-timer/sample/channels-to-scan b/Tools/master-timer/sample/channels-to-scan
new file mode 100644
index 0000000..6acf157
--- /dev/null
+++ b/Tools/master-timer/sample/channels-to-scan
@@ -0,0 +1,8 @@
+1
+2
+3
+4
+5
+13
+18
+21
diff --git a/Tools/master-timer/sample/config b/Tools/master-timer/sample/config
new file mode 100644
index 0000000..d01c8a8
--- /dev/null
+++ b/Tools/master-timer/sample/config
@@ -0,0 +1,14 @@
+# How Many Seconds "too early" should the timer begin
+marginstart	= 600
+# How Many Seocnds "too long" should the timer end
+marginstop	= 600
+# When the Prio isn't provied 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
+debug		= 0
diff --git a/Tools/master-timer/sample/deepblack b/Tools/master-timer/sample/deepblack
new file mode 100644
index 0000000..63b4f9e
--- /dev/null
+++ b/Tools/master-timer/sample/deepblack
@@ -0,0 +1,79 @@
+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$
diff --git a/Tools/master-timer/sample/done b/Tools/master-timer/sample/done
new file mode 100644
index 0000000..76819c7
--- /dev/null
+++ b/Tools/master-timer/sample/done
@@ -0,0 +1 @@
+Alles Routine|Komödie
diff --git a/Tools/master-timer/sample/subtitle-movie b/Tools/master-timer/sample/subtitle-movie
new file mode 100644
index 0000000..3b5a0ab
--- /dev/null
+++ b/Tools/master-timer/sample/subtitle-movie
@@ -0,0 +1,41 @@
+^Abenteuerfilm$
+^Actionfilm$
+^Actionkomödie$
+^Actionthriller$
+^Agentenfilm$
+^Biografie$
+^Biographie$
+^Computeranimation$
+^Drama$
+^Episodenfilm$
+^Erotikfilm$
+^Familiendrama$
+^Fantasy$
+^Fantasykomödie$
+^Gangsterfilm$
+^Gerichtsfilm$
+^Gesellschaftsdrama$
+^Horrorfilm$
+^Horrorkomödie$
+^Kinderfilm$
+^Komödie$
+^Kriegsfilm$
+^Krimikomödie$
+^Kriminalfilm$
+^Liebesfilm$
+^Melodram$
+^Melodrama$
+^Musical$
+^Politthriller$
+^Psychothriller$
+^Road Movie$
+^Romanze$
+^Satire$
+^Science-Fiction$
+^Spielfilm$
+^TV Movie$
+^TV-Drama$
+^Thriller$
+^Western$
+^Zeichentrick$
+^Zeichentrickkomödie$
diff --git a/Tools/master-timer/sample/torecord b/Tools/master-timer/sample/torecord
new file mode 100644
index 0000000..0306830
--- /dev/null
+++ b/Tools/master-timer/sample/torecord
@@ -0,0 +1,32 @@
+# Format: (Every field is "optional".
+# [Title RE|Subtitle RE|Description RE|Channel-Name|Timeframe|Prio|Timer-Title|Marginstart;Marginstop|VDR-Instance]
+#
+# 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
+#
+# 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
+