Version 1.1.13vdr-1.1.13

- Added cDevice::DeviceNumber() to get the number of a device, not counting any
  gaps that might be in the index count.
- Fixed fetching the current/next information to handle cases where the duration
  of an event is set wrongly and would last beyond the start time of the next
  event.
- Adapted type names to the new HEAD version of the driver (which the previous
  NEWSTRUCT branch has been merged into). Note that to use this driver version
  you still need to add NEWSTRUCT=1 to the make call when building VDR. You
  need a HEAD version of the LinuxDVB driver dated 2002-10-11 or later to compile
  VDR with NEWSTRUCT=1.
- Fixed radio channels in channels.conf.cable (thanks to Robert Schiele and Uwe
  Scheffler).
- Fixed switching the video format in the Setup/DVB menu (thanks to Uwe Scheffler
  for reporting this one).
- Reactivated full handling of second audio PID (even in 'Transfer Mode').
- Fixed a crash when closing down with remote control plugins (thanks to Oliver
  Endriss helping to debug this one).
- Commands in the file 'commands.conf' can now have a '?' at the end of their
  title, which will result in a confirmation prompt before executing the
  command.
- Changed a few leftover 'new char[...]' to MALLOC(char, ...).
- If a command executed from the "Commands" menu doesn't return any output, the
  OSD will now be closed automatically.
- The SVDRP command PUTE now triggers an immediate write of the 'epg.data' file
  (suggested by Gerhard Steiner).
- The new configuration file 'reccmds.conf' can be used to define commands that
  shall be executed from the "Recordings" menu; see MANUAL and 'man vdr(5)' for
  details (suggested by Gerhard Steiner).

1 files changed, 40 insertions, 2 deletions

diff --git a/device.h b/device.h
index 9dcf16c..54dc41e 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.21 2002/10/05 15:18:13 kls Exp $
+ * $Id: device.h 1.23 2002/10/12 11:15:13 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -111,6 +111,8 @@ public:
   bool IsPrimaryDevice(void) const { return this == primaryDevice; }
   int CardIndex(void) const { return cardIndex; }
          // Returns the card index of this device (0 ... MAXDEVICES - 1).
+  int DeviceNumber(void) const;
+         // Returns number of this device (0 ... MAXDEVICES - 1).
   int ProvidesCa(int Ca) const;
          // Checks whether this device provides the given value in its
          // caCaps. Returns 0 if the value is not provided, 1 if only this
@@ -217,7 +219,7 @@ public:
          // Sets the output video format to either 16:9 or 4:3 (only useful
          // if this device has an MPEG decoder).
 
-// Volume facilities
+// Audio facilities
 
 private:
   bool mute;
@@ -225,6 +227,27 @@ private:
 protected:
   virtual void SetVolumeDevice(int Volume);
        // Sets the audio volume on this device (Volume = 0...255).
+  virtual int NumAudioTracksDevice(void) const;
+       // Returns the number of audio tracks that are currently available on this
+       // device. The default return value is 0, meaning that this device
+       // doesn't have multiple audio track capabilities. The return value may
+       // change with every call and need not necessarily be the number of list
+       // entries returned by GetAudioTracksDevice(). This function is mainly called to
+       // decide whether there should be an "Audio" button in a menu.
+  virtual const char **GetAudioTracksDevice(int *CurrentTrack = NULL) const;
+       // Returns a list of currently available audio tracks. The last entry in the
+       // list must be NULL. The number of entries does not necessarily have to be
+       // the same as returned by a previous call to NumAudioTracksDevice().
+       // If CurrentTrack is given, it will be set to the index of the current track
+       // in the returned list. Note that the list must not be changed after it has
+       // been returned by a call to GetAudioTracksDevice()! The only time the list may
+       // change is *inside* the GetAudioTracksDevice() function.
+       // By default the return value is NULL and CurrentTrack, if given, will not
+       // have any meaning.
+  virtual void SetAudioTrackDevice(int Index);
+       // Sets the current audio track to the given value, which should be within the
+       // range of the list returned by a previous call to GetAudioTracksDevice()
+       // (otherwise nothing will happen).
 public:
   bool IsMute(void) const { return mute; }
   bool ToggleMute(void);
@@ -233,6 +256,21 @@ public:
        // Sets the volume to the given value, either absolutely or relative to
        // the current volume.
   static int CurrentVolume(void) { return primaryDevice ? primaryDevice->volume : 0; }//XXX???
+  int NumAudioTracks(void) const;
+       // Returns the number of audio tracks that are currently available on this
+       // device or a player attached to it.
+  const char **GetAudioTracks(int *CurrentTrack = NULL) const;
+       // Returns a list of currently available audio tracks. The last entry in the
+       // list is NULL. The number of entries does not necessarily have to be
+       // the same as returned by a previous call to NumAudioTracks().
+       // If CurrentTrack is given, it will be set to the index of the current track
+       // in the returned list.
+       // By default the return value is NULL and CurrentTrack, if given, will not
+       // have any meaning.
+  void SetAudioTrack(int Index);
+       // Sets the current audio track to the given value, which should be within the
+       // range of the list returned by a previous call to GetAudioTracks() (otherwise
+       // nothing will happen).
 
 // Player facilities