Version 1.3.18vdr-1.3.18

- Removed an unused variable from cTimer::GetWDayFromMDay() (thanks to Wayne Keer
  for reporting this one).
- Some more changes to the 'childTid' handling in cThread (based on suggestions by
  Stefan Huelswitt).
- Fixed the spelling of 'canceling' (thanks to Wayne Keer for reporting this one).
- Re-introduced a sleep to cDvbPlayer::Action() to avoid high CPU load in still
  picture mode (thanks to Reinhard Nissl for reporting this one).
- Fixed a possible race condition in generating the DVB device names (thanks to
  Rainer Zocholl for reporting this one).
- Changed the way PES packets are played to allow replay of AC3 sound over the
  full featured DVB cards (partially based on a patch from Werner Fink).
  + The new function cDevice::PlayPes() is now called with the complete PES data
    stream and calls PlayVideo() and PlayAudio() as necessary.
  + cDevice::PlayVideo() is now only called with actual video PES packets.
  + cDevice::PlayAudio() is now called with the actual audio PES packets, which
    can be either "normal" audio or AC3 data. You need at least firmware version
    0x261d to replay AC3 sound over a full featured DVB card. This function now
    has an 'int' return value.
  + PlayAudio() of derived cDevice classes shall no longer call the base class
    function. It shall just play the given data as audio.
  + cPlayer::PlayVideo() and cPlayer::PlayAudio() are now obsolete and have been
    replaced with cPlayer::PlayPes().
  + All StripAudioPackets() functions are now obsolete. The functionality has been
    moved into cDevice::PlayPes(), where only the video and audio packets that are
    actually required will be processed.
  + All audio track handling is now done by cDevice; cTransfer and cDvbPlayer no
    longer care about audio tracks. cPlayer, however, still has the virtual hooks
    for audio track handling in order to allow plugins to implement players that
    have their own idea about this.
  + cChannel::[AD]pid[12]() have been replaced with cChannel::[AD]pid(int i) to
    allow access to all available PIDs.
- Escaped the '-' and 'ö' characters in the man pages (thanks to Darren Salt for
  pointing this out).
- Completed the Italian OSD texts (thanks to Sean Carlos).
- Fixed setting 'synced' in cRemux when recording radio channels (thanks to
  Laurence Abbott).
- Removed the LOCK_THREAD from the LIRC thread (thanks to Ludwig Nussel).
- Fixed genfontfile.c (sometimes the character width was wrong, and the codes were
  shifted one too far to the left).
- Fixed the character width and shifted the codes one to the right in all font
  files.
- Renamed font???.c to font???-iso8859-1.c for symmetry.
- Switched the character set to iso8859-15 for English, German and Finnish (thanks
  to Andreas Brugger for reporting the missing Euro sign in iso8859-1).
- Added 'channels.conf.terr' entries for Lübeck (thanks to Stefan Hußfeldt).
- Fixed a race condition in starting a thread (thanks to Reinhard Nissl for
  reporting this one).
- Replaced non-threadsafe library functions with their threadsafe versions (thanks
  to Rainer Zocholl for pointing this out).
- Other non-threadsafe functions have been replaced by threadsafe classes that hide
  the actual buffering. In particular these are:
  readdir() -> cReadDir
  readline() -> cReadLine
- Several formerly non-threadsafe functions now have a return type of cString:
  cChannel::ToText()
  tChannelID::ToString()
  cEvent::GetDateString()
  cEvent::GetTimeString()
  cEvent::GetEndTimeString()
  cEvent::GetVpsString()
  cMark::ToText()
  cTimer::ToText()
  cSource::ToString()
  cTimer::PrintDay()
  cTimer::PrintFirstDay()
  PrefixVideoFileName()
  IndexToHMSF()
  ChannelString()
  strescape()
  AddDirectory()
  itoa()
  WeekDayName()
  DayDateTime()
  When using these functions in a 'const char *' context there is nothing special
  to consider, except that you can no longer have a pointer to the return value,
  as in
  const char *date = DayDateTime();
  Although this will compile without error message, the resulting 'date' will not
  be valid after this line. Use this instead:
  cString date = DayDateTime();
  In a 'const void *' context (as in printf() etc.) the result needs to be
  dereferenced with a '*', as in
  printf("%s", *DayDateTime());
  to make it a 'const char *'.
- Removed delay_ms(), using cCondWait::SleepMs() instead.
- Replaced time_ms() with a threadsafe and non-overflowing cTimeMs (thanks to Rainer
  Zocholl for pointing out this problem).
- Added cDevice::mutexReceiver to avoid a race condition when attaching/detaching
  receivers from different threads.
- The new remote control button "Audio" can be used to switch between different
  audio tracks. The "Green" button in the "Main" menu has been changed from "Language"
  to "Audio", since it now also controls switching between normal and Dolby Digital
  audio tracks (see MANUAL for details).
- The description of the audio tracks is now taken from the "component descriptors"
  that are broadcast in the EPG data. However (as no big surprise), not all channels
  actually provide useful data here, so there are now some additional EPG bugfixes,
  which can be activated by setting the "EPG bugfix level" to 3.
- The format of the 'epg.data' files has been extended by the new tag 'X', which
  contains the stream components of an event (see man vdr(5) for details).
- The cStatus class now has the new member function SetAudioTrack(), which can be
  used to get notified when the audio track has been switched, and the new member
  function SetAudioChannel() which is called when the audio channel is changed.
- Skins need to implement the new cSkinDisplayTrack class to display the audio
  track menu.
- The ST:TNG skin now displays the current audio track description (if any) at the
  botton left side.
- The new setup option "DVB/Audio languages" can be used to control which audio
  language shall be selected in case a channel broadcasts in different languages
  (see MANUAL for details).
- The "Left" and "Right" keys in the "Audio" menu can be used to switch between
  the left and right stereo channels in case there are different audio tracks
  in these channels (see MANUAL for details).
- Fixed a possible race condition in cDevice::Action() (thanks to Mattias Grönlund).
- Fixed the default quality value when grabbing a JPEG image (thanks to Patrick
  Gleichmann).
- Fixed deleting a menu item in case the next item is not selectable (thanks to
  Dino Ravnic).
- Implemented displaying mandatory subtitles in the SPU decoder (thanks to Marco
  Schlüßler).
- The setup option "Recording/Record Dolby Digital" has been renamed and moved to
  "DVB/Use Dolby Digital". It now controls whether Dolby Digital is recorded and
  whether an available DD audio track will appear in the "Audio" menu.
- Added support for circular polarization (thanks to Jonan Santiago).
- Thanks to Werner Fink, Reinhard Nissl, Sascha Volkenandt and Bjørnar Nilsen for
  their support in testing and fine tuning this version.

1 files changed, 27 insertions, 18 deletions

diff --git a/vdr.5 b/vdr.5
index 311094f..44ea3e6 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.29 2004/10/31 12:13:43 kls Exp $
+.\" $Id: vdr.5 1.32 2005/01/09 13:16:40 kls Exp $
 .\"
-.TH vdr 5 "31 Oct 2004" "1.3.15" "Video Disk Recorder Files"
+.TH vdr 5 "19 Dec 2004" "1.3.18" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -89,7 +89,9 @@ l l.
 \fBG\fR@Guard interval (4, 8, 16, 32)
 \fBH\fR@Horizontal polarization
 \fBI\fR@Inversion (0, 1)
+\fBL\fR@Left circular polarization
 \fBM\fR@Modulation (0, 16, 32, 64, 128, 256)
+\fBR\fR@Right circular polarization
 \fBT\fR@Transmission mode (2, 8)
 \fBV\fR@Vertical polarization
 \fBY\fR@Hierarchy (0, 1, 2, 4)
@@ -174,12 +176,12 @@ NID, TID and SID are all equal).
 A particular channel can be uniquely identified by its \fBchannel\ ID\fR,
 which is a string that looks like this:
 
-\fBS19.2E-1-1089-12003-0\fR
+\fBS19.2E\-1\-1089\-12003\-0\fR
 
 The components of this string are the \fBSource\fR (S19.2E), \fBNID\fR
 (1), \fBTID\fR (1089), \fBSID\fR (12003) and \fBRID\fR (0) as defined above.
 The last part can be omitted if it is \fB0\fR,
-so the above example could also be written as S19.2E-1-1089-12003).
+so the above example could also be written as S19.2E\-1\-1089\-12003).
 .br
 The \fBchannel\ ID\fR is used in the \fItimers.conf\fR and \fIepg.data\fR
 files to properly identify the channels.
@@ -195,7 +197,7 @@ The file \fItimers.conf\fR contains the timer setup.
 Each line contains one timer definition, with individual fields
 separated by ':' characters. Example:
 
-\fB1:10:-T-----:2058:2150:50:5:Quarks & Co:\fR
+\fB1:10:\-T\-\-\-\-\-:2058:2150:50:5:Quarks & Co:\fR
 
 The fields in a timer definition have the following meaning (from left
 to right):
@@ -234,21 +236,21 @@ timer shall record. This must be in the range \fB1...31\fR.
 
 In case of a `repeating' timer this is a string consisting of exactly seven
 characters, where each character position corresponds to one day of the week
-(with Monday being the first day). The character '-' at a certain position
+(with Monday being the first day). The character '\-' at a certain position
 means that the timer shall not record on that day. Any other character will
 cause the timer to record on that day. Example:
 
-.B MTWTF--
+.B MTWTF\-\-
 
 will define a timer that records on Monday thru Friday and does not record
-on weekends. The same result could be achieved with \fBABCDE--\fR (this is
+on weekends. The same result could be achieved with \fBABCDE\-\-\fR (this is
 used to allow setting the days with language specific characters).
 
 The day definition of a `repeating' timer may be followed by the date when that
-timer shall hit for the first time. The format for this is \fB@YYYY-MM-DD\fR,
+timer shall hit for the first time. The format for this is \fB@YYYY\-MM\-DD\fR,
 so a complete definition could look like this:
 
-\fBMTWTF--@2002-02-18\fR
+\fBMTWTF\-\-@2002\-02\-18\fR
 
 which would implement a timer that records Moday thru Friday, and will hit
 for the first time on or after February 18, 2002.
@@ -416,7 +418,7 @@ and can be one of \fIRed\fR, \fIGreen\fR, \fIYellow\fR, \fIBlue\fR or
 keys, which will be executed just as if they had been pressed in the given
 sequence. The optional \fB@plugin\fR can be used to automatically select
 the given plugin from the main menu (provided that plugin has a main menu
-entry). \fBplugin\fR is the name of the plugin, exactly as given in the -P
+entry). \fBplugin\fR is the name of the plugin, exactly as given in the \-P
 option when starting VDR. There can be only one \fB@plugin\fR per key macro,
 and it implicitly adds an \fIOk\fR key to the macro definition (in order to
 actually select the plugins main menu entry), which counts against the total
@@ -465,12 +467,12 @@ Check for new mail?: /usr/local/bin/checkmail 2>&1
 .br
 CPU status: /usr/local/bin/cpustatus 2>&1
 .br
-Disk space: df -h | grep '/video' | awk '{ print 100 - $5 "% free"; }'
+Disk space: df \-h | grep '/video' | awk '{ print 100 \- $5 "% free"; }'
 .br
 Calendar: date;echo;cal
 
 Note that the commands 'checkmail' and 'cpustatus' are only \fBexamples\fR!
-Don't send emails to the author asking where to find these ;-)
+Don't send emails to the author asking where to find these ;\-)
 .br
 The '?' at the end of the "Check for new mail?" entry will prompt the user
 whether this command shall really be executed.
@@ -511,7 +513,7 @@ The file \fIsetup.conf\fR contains the basic configuration options for \fBvdr\fR
 Each line contains one option in the format "Name = Value".
 See the MANUAL file for a description of the available options.
 .SS THEMES
-The files \fIthemes/<skin>-<theme>.theme\fR in the config directory contain the
+The files \fIthemes/<skin>\-<theme>.theme\fR in the config directory contain the
 color theme definitions for the various skins. In the actual file names \fI<skin>\fR
 will be replaced by the name if the skin this theme belongs to, and \fI<theme>\fR
 will be the name of this theme.
@@ -545,7 +547,7 @@ you can provide language specific descriptions as
 
 \fBDescription.eng = Shades of blue\fR
 .br
-\fBDescription.ger = Blautöne\fR
+\fBDescription.ger = Blaut\(:one\fR
 
 where the language code (as defined in VDR/i18n.c) is added to the keyword
 "Description", separated by a dot. You can enter as many language specific
@@ -613,6 +615,7 @@ l l.
 \fBT\fR@<title>
 \fBS\fR@<short text>
 \fBD\fR@<description>
+\fBX\fR@<stream> <type> <language> <descr>
 \fBV\fR@<vps time>
 \fBe\fR@
 \fBc\fR@
@@ -622,8 +625,10 @@ Lowercase characters mark the end of a sequence that was started by the
 corresponding uppercase character. The outer frame consists of a sequence
 of one or more \fBC\fR...\fBc\fR (Channel) entries. Inside these any number of
 \fBE\fR...\fBe\fR (Event) entries are allowed.
-The \fBT\fR, \fBS\fR and \fBD\fR entries are optional (although every event
+All other tags are optional (although every event
 should at least have a \fBT\fR entry).
+There may be several \fBX\fR tags, depending on the number of tracks (video, audio etc.)
+the event provides.
 
 .TS
 tab (@);
@@ -636,6 +641,10 @@ l l.
 <title>        @is the title of the event
 <short text>   @is the short text of the event (typically the name of the episode etc.)
 <description>  @is the description of the event (any '|' characters will be interpreted as newlines)
+<stream>       @is the stream content (1 = video, 2 = audio)
+<type>         @is the stream type according to ETSI EN 300 468
+<language>     @is the three letter language code
+<descr>        @is the description of this stream component
 <vps time>     @is the Video Programming Service time of this event
 .TE
 
@@ -646,9 +655,9 @@ previous EPG scans.
 .SH AUTHOR
 Written by Klaus Schmidinger.
 .SH REPORTING BUGS
-Report bugs to <vdr-bugs@cadsoft.de>.
+Report bugs to <vdr\-bugs@cadsoft.de>.
 .SH COPYRIGHT
-Copyright \(co 2003 Klaus Schmidinger.
+Copyright \(co 2004 Klaus Schmidinger.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.