Version 1.0.0pre4vdr-1.0.0pre4

- Added 'Ca' code 201 for 'Cryptoworks, GOD-DIGITAL' to 'ca.conf' (thanks to
  Bernd Schweikert).
- Fixed avoiding the primary DVB interface in case Setup.PrimaryLimit is 0.
- Fixed handling CICAM settings if the first one of a DVB card was FTA.
- Fixed reacting on changes in CICAM settings (needed to restart VDR before).
- The "Blue" button in the "Main" menu now works as "Stop" button if a recording
  is currently being replayed.
- New command line option '-m' to mute audio of the primary DVB device at
  startup (suggested by Mirko Günther).
- The new SVDRP command VOLU can be used to control the audio volume (suggested
  by Mirko Günther).
- Fixed resetting 'mute' state when setting the volume to a non-zero value.
- Added log messages when deleting recordings in case the disk runs full while
  recording.
- Fixed closing a pipe (used for replaying Dolby Digital audio), which
  sometimes left 'zombie' processes behind (thanks to Werner Fink for helping
  to debug this one).
- Now starting the Dolby Digital output thread only if the recording actually
  contains Dolby Digital audio data (thanks to Werner Fink).
- Implemented OSD for Volume and Mute (works only if there is no other OSD
  activity, but this should be no problem for normal use).
- Changed the MANUAL description of the "Conditional Access" setup parameters
  to reflect the actual "CICAM DVBn m" notation in the "Setup" menu.
- The new Setup parameter "Use time from transponder" can be used to define which
  transponder shall be used to set the system time (see MANUAL for details).
  If you have been using the SetSystemTime option previously, you now MUST
  select a channel that you trust to have a reliable time base.
- Grouped the Setup parameters into several sub-menus, so that each group of
  parameters fits on a single screen - unless the height of the OSD has been
  set to a small value (based on code from Markus Lang).
- Changed the title of the "Main" menu to "VDR".
- Fixed displaying a system message while the replay mode is being shown.
- Physically removing a deleted recording if one with the same name shall be
  deleted again.
- The "Left" and "Right" keys are now used to page up and down in text displays
  (like the EPG descriptions or the results of commands executed from the
  "Commands" menu).
- Fixed high CPU usage in transfer mode.
- Replaced 'killproc' with 'killall' in 'runvdr', since apparently 'killproc'
  is not available by default on some Linux distributions, whereas 'killall' is.
  Please check if your system provides 'killall' - if it doesn't, please change
  this back in 'runvdr' and report this (thanks to Achim Lange).
- The "Commands" menu now automatically assigns number keys as hotkeys to the
  commands. If you have preceeded your commands with digits you may want to
  remove these from your 'commands.conf' file.
- The new Setup item "Restart" can be used to force a complete restart of VDR,
  including reloading the driver. Note that this can only work if VDR and the
  driver are wrapped into a mechanism that actually performs this action if VDR
  exits. The 'runvdr' script can be used for this purpose.
- Refined texts of the "Setup" menu.

1 files changed, 171 insertions, 142 deletions

diff --git a/MANUAL b/MANUAL
index c4cda08..b940505 100644
--- a/MANUAL
+++ b/MANUAL
@@ -8,20 +8,20 @@ Video Disk Recorder User's Manual
   possible, several keys have different meanings in the various
   modes:
 
-  Key     Normal      Main       Channels   Timers     Edit/New      Recordings  Replay
-
-  Up      Ch up       Crsr up    Crsr up    Crsr up    Crsr up       Crsr up     Play
-  Down    Ch down     Crsr down  Crsr down  Crsr down  Crsr down     Crsr down   Pause
-  Left    Prev group  -          Page up    Page up    Decrement     Page up     Search back
-  Right   Next group  -          Page down  Page down  Increment     Page down   Search forward
-  Ok      Ch display  Select     Switch     Edit       Accept        Play        Progress disp.
-  Menu    Menu on     Menu off   Menu off   Menu off   Menu off      Menu off    Menu on
-  Back    -           Menu off   Main menu  Main menu  Discard       Main menu   Recordings menu
-  Red     -           Record     Edit       Edit       -             Play        Jump
-  Green   -           Language   New        New        -             Rewind      Skip -60s
-  Yellow  -           -          Delete     Delete     -             Delete      Skip +60s
-  Blue    -           Resume     Mark       On/Off(1)  -             Summary     Stop
-  0..9    Ch select   -          -          -          Numeric inp.  -           Editing
+  Key     Normal      VDR          Channels   Timers     Edit/New      Recordings  Replay
+
+  Up      Ch up       Crsr up      Crsr up    Crsr up    Crsr up       Crsr up     Play
+  Down    Ch down     Crsr down    Crsr down  Crsr down  Crsr down     Crsr down   Pause
+  Left    Prev group  -            Page up    Page up    Decrement     Page up     Search back
+  Right   Next group  -            Page down  Page down  Increment     Page down   Search forward
+  Ok      Ch display  Select       Switch     Edit       Accept        Play        Progress disp.
+  Menu    Menu on     Menu off     Menu off   Menu off   Menu off      Menu off    Menu on
+  Back    -           Menu off     VDR menu   VDR menu   Discard       VDR menu    Recordings menu
+  Red     -           Record       Edit       Edit       -             Play        Jump
+  Green   -           Language     New        New        -             Rewind      Skip -60s
+  Yellow  -           -            Delete     Delete     -             Delete      Skip +60s
+  Blue    -           Stop/Resume  Mark       On/Off(1)  -             Summary     Stop
+  0..9    Ch select   -            -          -          Numeric inp.  -           Editing
 
   Power   Shutdown
   Volume+ Volume up
@@ -34,7 +34,7 @@ Video Disk Recorder User's Manual
 
 * Navigating through the On Screen Menus
 
-  The "Main" menu can be called up with the "Menu" key of your remote
+  The "VDR" menu can be called up with the "Menu" key of your remote
   control unit. The "Up" and "Down" keys are used to select a specific
   item. The "Left" and "Right" keys can be used to change options, and
   the numeric keys allow direct input of numeric data. The "Ok" key
@@ -74,7 +74,7 @@ Video Disk Recorder User's Manual
 
   The "Schedule" menu implements VDR's "Electronic Program Guide" (EPG).
 
-  Select "Schedule" from the "Main" menu and you get a list of all upcoming
+  Select "Schedule" from the "VDR" menu and you get a list of all upcoming
   broadcasts on the current channel.
 
   "Up" and "Down" can be used to scroll through this list, and pressing "Ok"
@@ -135,7 +135,7 @@ Video Disk Recorder User's Manual
 * Selecting language specific audio track
 
   If the current channel provides different audio tracks (typically for
-  different languages), the "Green" button in the "Main" menu can be pressed
+  different languages), the "Green" button in the "VDR" menu can be pressed
   to toggle between these. There can be two different audio PIDs per channel,
   assuming that typically a channel broadcasts a country specific language
   plus the movie's original soundtrack.
@@ -157,7 +157,7 @@ Video Disk Recorder User's Manual
 * Instant Recording
 
   You can start recording the current channel by pressing the "Red" button
-  in the "Main" menu. This will create a timer event named "@channelname" that
+  in the "VDR" menu. This will create a timer event named "@channelname" that
   starts at the current time and records for two hours.
   If you want to modify the recording time you need to edit the timer.
   Stop instant recording by pressing the "Menu" button and selecting
@@ -176,17 +176,17 @@ Video Disk Recorder User's Manual
   number of new recordings (as opposed to a recording's entry, which displays
   the date and time of the recording).
 
-  If the setup parameter UseSubtitle was turned on when a recording took place,
-  VDR adds the "subtitle" (which is usually the name of the episode in case of
+  If the setup parameter "Use episode name" was turned on when a recording took place,
+  VDR adds the "Episode name" (which is usually the name of the episode in case of
   a series) to the recording's name. The "Recordings" menu then displays all
   recordings of a repeating timer in chronological order, since these are
   usually the individual episodes of a series, which you may want to view in
   the order in which they were broadcast.
 
-  Playback can be stopped via the "Main" menu by selecting "Stop replaying",
+  Playback can be stopped via the "VDR" menu by selecting "Stop replaying",
   or by pressing the "Blue" button outside the menu.
   A previously stopped playback session can be resumed by pressing the "Blue"
-  button in the "Main" menu.
+  button in the "VDR" menu.
 
 * Replay Control
 
@@ -322,10 +322,10 @@ Video Disk Recorder User's Manual
              structure "/video/Sci-Fi/Star_Trek/Voyager". The '~' character has
              been chosen for this since the file system's directory delimiter '/'
              may be part of a regular programme name.
-             Repeating timers create recordings that contain the 'Subtitle'
+             Repeating timers create recordings that contain the 'Episode name'
              information from the EPG data in their file name. Typically (on tv
              stations that care about their viewers) this contains the episode
-             title of a series. The subtitle is appended to the timer's file name,
+             title of a series. The episode name is appended to the timer's file name,
              separated by a '~' character, so that it results in all recordings
              of this timer being collected in a common subdirectory.
              If this field is left blank, the channel name will be used to form
@@ -342,7 +342,7 @@ Video Disk Recorder User's Manual
   the channel or replay another recording on that interface. However, if there
   is an other DVB interface that is currently not recording and provides the
   necessary conditional access facilities to continue the recording that is
-  currently being performed on the primary DVB interface, the Main menu will
+  currently being performed on the primary DVB interface, the "VDR" menu will
   contain an option that allows you to stop recording on the primary DVB
   interface. Select that option to stop the ongoing recording and thus free the
   primary DVB interface to allow channel switching or replaying. The interrupted
@@ -352,87 +352,60 @@ Video Disk Recorder User's Manual
 
 * Parameters in the "Setup" menu
 
-  Select "Setup" from the "Main" menu to enter the setup menu. From there you can
+  Select "Setup" from the "VDR" menu to enter the setup menu. From there you can
   modify the following system parameters (note that "boolean" values will be
   displayed as "no" and "yes" in the "Setup" menu, while in the setup file they
   are stored as '0' and '1', respectively):
 
-  OSDLanguage = 0        Defines the language used to display the OSD texts.
-                         0 = Englisch
-                         1 = Deutsch
-                         2 = Slovenian
-                         3 = Italian
-                         4 = Dutch
-                         5 = Portugese
-                         6 = French
-                         7 = Norwegian
-
-  PrimaryDVB = 1         Defines the primary DVB interface (i.e. the one that
-                         will display the menus and will react on input through
-                         the remote control). Valid values range from '1' to the
-                         number of installed DVB cards. If more than one DVB card
-                         is installed and a recording is to be started, the
-                         program will try to use a free DVB card that is different
-                         from the primary DVB interface, so that the viewer will
-                         be disturbed as little as possible.
+  OSD:
 
-  ShowInfoOnChSwitch = 1 Turns the display of the current/next information on
-                         or off when switching the channel. The information is
-                         always displayed when pressing the "Ok" button in
-                         normal viewing mode.
+  Language = English     Defines the language used to display the OSD texts.
 
-  MenuScrollPage = 1     0 = when pressing the "Down" ("Up") key while the cursor
-                             is on the last (first) line of a list page, the
-                             list is advanced by a full page and the cursor will
-                             be at the top (bottom) of that page
-                         1 = dto., but the cursor remains at the bottom (top) of
-                             the page (this mode allows for faster scrolling
-                             through long lists).
+  Width = 52             The width and height of the OSD .
+  Height = 18            The valid ranges are width=40...56, height=12...21.
 
-  MarkInstantRecord = 1  Defines whether an "instant recording" (started by
-                         pressing the "Red" button in the "Main" menu) will be
-                         marked with a '@' character to make it distinguishable
-                         from timer recordings in the "Recordings" menu.
-                         0 = instant recordings will not be marked
-                         1 = instant recordings will be marked.
+  Message time = 1       The time (in seconds) how long an informational
+                         message shall be displayed on the OSD. The valid range
+                         is 1...60.
 
-  NameInstantRecord = TITLE-EPISODE
-                         Defines how to name an instant recording. If the keywords
-                         TITLE and/or EPISODE are present, they will be replaced
-                         with the title and episode information from the EPG data
-                         at the time of recording (if that data is available).
-                         If this parameter is empty, the channel name will be used
-                         by default.
+  Channel info position = bottom
+                         The position of the channel info window in the OSD
+                         (either 'bottom' or 'top').
 
-  LnbSLOF    = 11700     The switching frequency (in MHz) between low and high LOF
-  LnbFrequLo = 9750      The LNB's low and high local oscillator frequencies (in MHz)
-  LnbFrequHi = 10600     (these have no meaning for DVB-C receivers)
+  Info on channel switch = yes
+                         Turns the display of the current/next information on
+                         or off when switching the channel. The information is
+                         always displayed when pressing the "Ok" button in
+                         normal viewing mode.
 
-  DiSEqC = 1             Generally turns DiSEqC support on or off.
-                         0 = disabled
-                         1 = enabled
+  Scroll pages = yes     yes = when pressing the "Down" ("Up") key while the cursor
+                               is on the last (first) line of a list page, the
+                               list is advanced by a full page and the cursor will
+                               be at the top (bottom) of that page
+                         no  = dto., but the cursor remains at the bottom (top) of
+                               the page (this mode allows for faster scrolling
+                               through long lists).
 
-  SetSystemTime = 0      Defines whether the system time will be set according to
-                         the time received from the DVB data stream.
-                         0 = system time will not be set
-                         1 = system time wil be set
-                         Note that this works only if VDR is running under a user
-                         id that has permisson to set the system time.
+  Sort timers = yes      Turns sorting the timers in the "Timers" menu on/off.
+                         Timers are sorted by ascending start times, with the
+                         first one being the next timer that will start.
 
-  MarginStart = 2        Defines how many minutes before the official start time
-  MarginStop = 10        of a broadcast VDR shall start recording, and how long
-                         after the official end time it shall stop recording.
+  Recording directories = yes
+                         Turns displaying the Recordings menu as a hierarchical
+                         directory structure on or off.
+
+  EPG:
 
-  EPGScanTimeout = 5     The time (in hours) of user inactivity after which the
+  EPG scan timeout = 5   The time (in hours) of user inactivity after which the
                          DVB card in a single card system starts scanning channels
                          to keep the EPG up-to-date.
                          A value of '0' completely turns off scanning on both single
                          and multiple card systems.
 
-  EPGBugfixLevel = 2     Some tv stations transmit weirdly formatted EPG data.
+  EPG bugfix level = 2   Some tv stations transmit weirdly formatted EPG data.
                          VDR attempts to fix these bugs up to the given level:
                          0 = no EPG fixing
-                         1 = basic fixing of text location (Title, Subtitle and
+                         1 = basic fixing of text location (Title, Episode and
                              Extended Description)
                          2 = removal of excess whitespace and hyphens, mapping of
                              wrongly used characters
@@ -443,15 +416,74 @@ Video Disk Recorder User's Manual
                          be fixed accordingly. Restart VDR if you want to make sure
                          all data is fixed.
 
-  SVDRPTimeout = 300     The time (in seconds) of inactivity on an open SVDRP
-                         connection after which the connection is automatically
-                         closed. Default is 300, a value of 0 means no timeout.
+  Set system time = no   Defines whether the system time will be set according to
+                         the time received from the DVB data stream.
+                         Note that this works only if VDR is running under a user
+                         id that has permisson to set the system time. You also
+                         need to set the option "Use time from transponder" to a
+                         channel that you trust to transmit a reliable time base
+                         (not all channels seem to have access to a correct time
+                         base...).
+
+  Use time from transponder = 0
+                         The frequency of the transponder that shall be used to
+                         set the system time. The Setup menu will offer the full
+                         list of channels, even if several of them are on the
+                         same transponder. Also, when selecting a channel, saving
+                         the Setup and opening the Setup menu again, there may be
+                         a different channel listed here, since the first one
+                         in 'channels.conf' that is on the given transponder will
+                         be taken. Note that in order to set the system time from
+                         the transponder data the option "Set system time" must also
+                         be enabled.
+
+  DVB:
+
+  Primary DVB interface = 1
+                         Defines the primary DVB interface (i.e. the one that
+                         will display the menus and will react on input through
+                         the remote control). Valid values range from '1' to the
+                         number of installed DVB cards. If more than one DVB card
+                         is installed and a recording is to be started, the
+                         program will try to use a free DVB card that is different
+                         from the primary DVB interface, so that the viewer will
+                         be disturbed as little as possible.
 
-  SortTimers = 1         Turns sorting the timers in the "Timers" menu on/off.
-                         Timers are sorted by ascending start times, with the
-                         first one being the next timer that will start.
+  Video format = 4:3     The video format (or aspect ratio) of the tv set in use
+                         (4:3 or 16:9).
 
-  PrimaryLimit = 0       The minimum priority a timer must have to be allowed to
+  LNB:
+
+  SLOF               = 11700  The switching frequency (in MHz) between low and
+                              high LOF
+  Low LNB frequency  =  9750  The LNB's low and high local oscillator frequencies
+  High LNB frequency = 10600  (in MHz, these have no meaning for DVB-C receivers)
+
+  Use DiSEqC = no        Generally turns DiSEqC support on or off.
+
+  CICAM:
+
+  CICAM DVBn m           Defines the "Conditional Access" capabilities of the DVB
+                         card 'n'. Each DVB card can provide up to two CICAM
+                         methods ('m' = [1, 2]).
+
+                         In the 'setup.conf' file the value consists of the card
+                         number, followed by a list of decryption method values
+                         (defined in 'ca.conf').
+                         For instance
+                           CaCaps = 3 101 102
+                         would define that card number 3 is able to decrypt
+                         "Premiere World" and the "ORF".
+
+  Recording:
+
+  Margin at start = 2    Defines how many minutes before the official start time
+  Margin at stop = 10    of a broadcast VDR shall start recording, and how long
+                         after the official end time it shall stop recording.
+                         These margins are added automatically to timers that
+                         are created from the EPG data.
+
+  Primary limit = 0      The minimum priority a timer must have to be allowed to
                          use the primary DVB interface, or to force another timer
                          with higher priority to use the primary DVB interface.
                          This is mainly useful for recordings that should take
@@ -459,55 +491,67 @@ Video Disk Recorder User's Manual
                          never keep the user from viewing stuff on the primary
                          interface. On systems with only one DVB card, timers
                          with a priority below PrimaryLimit will never execute.
-  
-  DefaultPriority = 50   The default Priority and Lifetime values used when
-  DefaultLifetime = 50   creating a new timer event. A Lifetime value of 99
+
+  Default priority = 50  The default Priority and Lifetime values used when
+  Default lifetime = 50  creating a new timer event. A Lifetime value of 99
                          means that this recording will never be deleted
                          automatically.
 
-  UseSubtitle = 1        Repeating timers use the EPG's 'Subtitle' information to
-                         create recording file names in a hierarchical structure
+  Use episode name = yes Repeating timers use the EPG's 'Episode name' information
+                         to create recording file names in a hierarchical structure
                          (for instance to gather all episodes of a series in a
                          common subdirectory). This parameter can be used to
                          control this.
-                         0 = don't use the 'Subtitle'
-                         1 = use it (and create subdirectories)
+                         no  = don't use the 'Episode name'
+                         yes = use it (and create subdirectories)
 
-  RecordingDirs = 1      Turns displaying the Recordings menu as a hierarchical
-                         directory structure on or off.
+  Mark instant recording = yes
+                         Defines whether an "instant recording" (started by
+                         pressing the "Red" button in the "VDR" menu) will be
+                         marked with a '@' character to make it distinguishable
+                         from timer recordings in the "Recordings" menu.
 
-  VideoFormat = 0        The video format (or aspect ratio) of the tv set in use.
-                         0 = 4:3
-                         1 = 16:9
+  Name instant recording = TITLE EPISODE
+                         Defines how to name an instant recording. If the keywords
+                         TITLE and/or EPISODE are present, they will be replaced
+                         with the title and episode information from the EPG data
+                         at the time of recording (if that data is available).
+                         If this parameter is empty, the channel name will be used
+                         by default.
 
-  RecordDolbyDigital = 1 Turns recording of the Dolby Digital audio channels on
+  Record Dolby Digital = yes
+                         Turns recording of the Dolby Digital audio channels on
                          or off. This may be useful if you don't have the equipment
                          to replay Dolby Digital audio and want to save disk space.
 
-  ChannelInfoPos = 0     The position of the channel info window in the OSD.
-                         0 = bottom
-                         1 = top
-
-  OSDwidth  = 52         The width and height of the OSD .
-  OSDheight = 18         The valid ranges are width=40...56, height=12...21.
-
-  OSDMessageTime = 1     The time (in seconds) how long an informational
-                         message shall be displayed on the OSD. The valid range
-                         is 1...60.
-
-  MaxVideoFileSize=2000  The maximum size of a single recorded video file in MB.
+  Max. video file size = 2000
+                         The maximum size of a single recorded video file in MB.
                          The valid range is 100...2000. Default is 2000, but
                          you may want to use smaller values if you are planning
                          on archiving a recording to CD.
 
-  SplitEditedFiles = 0   During the actual editing process VDR writes the result
+  Split edited files = no
+                         During the actual editing process VDR writes the result
                          into files that may grow up to MaxVideoFileSize. If you
                          prefer to have each marked sequence stored in a separate
                          file (named 001.vdr, 002.vdr, ...) you can set this
-                         option to 1.
+                         option to 'yes'.
+
+  Replay:
+
+  Multi speed mode = no  Defines the function of the "Left" and "Right" keys in
+                         replay mode. If set to 'no', one speed will be used, while
+                         if set to 'yes' there will be three speeds for fast and slow
+                         search, respectively.
+
+  Show replay mode = no  Turns displaying the current replay mode on or off.
 
-  MinEventTimeout=30     If the command line option '-s' has been set, VDR will
-  MinUserInactivity=120  automatically shutdown the computer if the next timer
+  Miscellaneous:
+
+  Min. event timeout = 30
+  Min. user inactivity = 120
+                         If the command line option '-s' has been set, VDR will
+                         automatically shutdown the computer if the next timer
                          event is at least MinEventTimeout minutes in the future,
                          and the user has been inactive for at least
                          MinUserInactivity minutes. Setting MinUserInactivity
@@ -515,30 +559,15 @@ Video Disk Recorder User's Manual
                          retaining the possibility to manually shutdown the
                          computer.
 
-  MultiSpeedMode = 0     Defines the function of the "Left" and "Right" keys in
-                         replay mode. If set to 0, one speed will be used, while
-                         if set to 1 there will be three speeds for fast and slow
-                         search, respectively.
-                         0 = off
-                         1 = on
-
-  ShowReplayMode = 0     Turns displaying the current replay mode on or off.
-                         0 = off
-                         1 = on
-
-  CaCaps (no default)    Defines the "Conditional Access Capabilities" of a DVB
-                         card. The value consists of the card number, followed by
-                         a list of decryption method values (defined in 'ca.conf').
-                         For instance
-                           CaCaps = 3 101 102
-                         would define that card number 3 is able to decrypt
-                         "Premiere World" and the "ORF".
+  SVDRP timeout = 300    The time (in seconds) of inactivity on an open SVDRP
+                         connection after which the connection is automatically
+                         closed. Default is 300, a value of 0 means no timeout.
 
 * Executing system commands
 
-  The "Main" menu option "Commands" allows you to execute any system commands
+  The "VDR" menu option "Commands" allows you to execute any system commands
   defined in the configuration file 'commands.conf' (see FORMATS for details).
-  The "Commands" option will only be present in the "Main" menu if a valid
+  The "Commands" option will only be present in the "VDR" menu if a valid
   'commands.conf' file containing at least one command definition has been
   found at program start.