Version 1.1.5vdr-1.1.5

- Added direct access to the index data of cPalette (needed for displaying SPUs,
  thanks to Andreas Schultz).
- The status monitor function cStatus::Replaying() now gets a 'cControl *' argument instead
  of a 'cDvbPlayerControl *' in order to allow additional players to call this function.
  cPlayer and cControl have been given the functions GetIndex() and GetReplayMode() to
  allow access to the player's status.
- Added cOsd::OpenRaw() to create a raw OSD (needed for displaying SPUs).
- Changed the symantics of the Name parameter in cStatus::Recording() and
  cStatus::Replaying(). It is no longer the full directory name of the recording,
  but rather just the basic name. This has been changed to allow players that can't
  provide a name to simply use a string that describes the player type (like, e.g.,
  "DVD").
- Fixed a hangup when switching to the next file during replay.
- Fixed a possible race condition in the cDvbPlayer (thanks to Andreas Schultz
  for pointing out this one).
- Disabled channels on Transponder 12070 in 'channels.conf', which apparently no longer transmits.

1 files changed, 11 insertions, 8 deletions

diff --git a/status.h b/status.h
index d68f23a..8041f8c 100644
--- a/status.h
+++ b/status.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: status.h 1.3 2002/06/16 13:24:50 kls Exp $
+ * $Id: status.h 1.5 2002/07/14 10:54:39 kls Exp $
  */
 
 #ifndef __STATUS_H
@@ -12,7 +12,7 @@
 
 #include "config.h"
 #include "device.h"
-#include "dvbplayer.h"
+#include "player.h"
 #include "tools.h"
 
 class cStatus : public cListObject {
@@ -25,11 +25,14 @@ protected:
                // If ChannelNumber is 0, this is before the channel is being switched,
                // otherwise ChannelNumber is the number of the channel that has been switched to.
   virtual void Recording(const cDevice *Device, const char *Name) {}
-               // The given DVB device has started recording Name. Name is the full directory
-               // name of the recording. If Name is NULL, the recording has ended. 
-  virtual void Replaying(const cDvbPlayerControl *DvbPlayerControl, const char *Name) {}
-               // The given player control has started replaying Name. Name is the full directory
-               // name of the recording. If Name is NULL, the replay has ended. 
+               // The given DVB device has started recording Name. Name is the name of the
+               // recording, without any directory path.
+               // If Name is NULL, the recording has ended. 
+  virtual void Replaying(const cControl *Control, const char *Name) {}
+               // The given player control has started replaying Name. Name is the name of the
+               // recording, without any directory path. In case of a player that can't provide
+               // a name, Name can be a string that identifies the player type (like, e.g., "DVD").
+               // If Name is NULL, the replay has ended. 
   virtual void SetVolume(int Volume, bool Absolute) {}
                // The volume has been set to the given value, either
                // absolutely or relative to the current volume.
@@ -60,7 +63,7 @@ public:
   // These functions are called whenever the related status information changes:
   static void MsgChannelSwitch(const cDevice *Device, int ChannelNumber);
   static void MsgRecording(const cDevice *Device, const char *Name);
-  static void MsgReplaying(const cDvbPlayerControl *DvbPlayerControl, const char *Name);
+  static void MsgReplaying(const cControl *Control, const char *Name);
   static void MsgSetVolume(int Volume, bool Absolute);
   static void MsgOsdClear(void);
   static void MsgOsdTitle(const char *Title);