From af2a135212088f0cba6bd8f98544b271c2f71bef Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 4 May 2003 18:00:00 +0200
Subject: =?UTF-8?q?Version=201.1.30=20-=20Fixed=20minimum=20lifespan=20of?=
 =?UTF-8?q?=20deleted=20recordings=20(thanks=20to=20Jaakko=20Hyv=C3=A4tti)?=
 =?UTF-8?q?.=20-=20Updated=20French=20OSD=20texts=20(thanks=20to=20Olivier?=
 =?UTF-8?q?=20Jacques).=20-=20Fixed=20paging=20through=20lists=20with=20re?=
 =?UTF-8?q?peated=20Left/Right=20keys.=20-=20Fixed=20setting=20the=20PCR-P?=
 =?UTF-8?q?ID=20in=20case=20it=20is=20equal=20to=20one=20of=20the=20other?=
 =?UTF-8?q?=20PIDs=20(thanks=20=20=20to=20Oliver=20Endriss=20for=20reporti?=
 =?UTF-8?q?ng=20this=20one).=20-=20Fixed=20double=20call=20to=20MainMenuAc?=
 =?UTF-8?q?tion()=20of=20a=20plugin=20if=20invoked=20via=20a=20hotkey=20(t?=
 =?UTF-8?q?hanks=20=20=20to=20Kai=20Moeller=20for=20reporting=20this=20one?=
 =?UTF-8?q?).=20-=20Fixed=20handling=20dedicated=20keys.=20-=20Now=20turni?=
 =?UTF-8?q?ng=20off=20live=20PIDs=20when=20replaying.=20This=20avoids=20sh?=
 =?UTF-8?q?ort=20spikes=20from=20other=20=20=20channels=20when=20switching?=
 =?UTF-8?q?=20between=20Transfer=20Mode=20channels,=20and=20also=20lets=20?=
 =?UTF-8?q?an=20ongoing=20=20=20replay=20continue=20even=20if=20a=20record?=
 =?UTF-8?q?ing=20is=20started=20on=20the=20primary=20device.=20-=20The=20R?=
 =?UTF-8?q?CU=20channel=20display=20no=20longer=20changes=20when=20a=20rec?=
 =?UTF-8?q?ording=20on=20a=20different=20=20=20channel=20starts=20on=20the?=
 =?UTF-8?q?=20primary=20device.=20-=20Restoring=20the=20current=20channel?=
 =?UTF-8?q?=20in=20case=20a=20recording=20has=20switched=20the=20transpond?=
 =?UTF-8?q?er.=20=20=20If=20all=20devices=20are=20busy=20and=20none=20of?=
 =?UTF-8?q?=20them=20can=20provide=20the=20current=20channel,=20the=20=20?=
 =?UTF-8?q?=20message=20"Channel=20not=20available!"=20will=20be=20display?=
 =?UTF-8?q?ed.=20-=20Removed=20the=20(no=20longer=20necessary)=20'panic'?=
 =?UTF-8?q?=20stuff=20from=20cThread.=20-=20Added=20cStatus::OsdItem()=20t?=
 =?UTF-8?q?o=20provide=20the=20entire=20list=20of=20menu=20items=20to=20a?=
 =?UTF-8?q?=20plugin=20=20=20(thanks=20to=20Carsten=20Siebholz).=20-=20The?=
 =?UTF-8?q?=20red=20("Record")=20and=20yellow=20("Pause")=20button=20in=20?=
 =?UTF-8?q?the=20"Main"=20menu=20are=20no=20longer=20=20=20available=20whe?=
 =?UTF-8?q?n=20replaying.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 device.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'device.h')

diff --git a/device.h b/device.h
index 8ffd495..d2cc4f8 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.30 2003/04/26 09:49:12 kls Exp $
+ * $Id: device.h 1.32 2003/05/03 13:35:55 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -181,6 +181,9 @@ protected:
 public:
   static int CurrentChannel(void) { return primaryDevice ? currentChannel : 0; }
          ///< Returns the number of the current channel on the primary device.
+  virtual bool HasProgramme(void);
+         ///< Returns true if the device is currently showing any programme to
+         ///< the user, either through replaying or live.
 
 // PID handle facilities
 
@@ -201,7 +204,7 @@ protected:
          ///< Returns true if this device is currently receiving the given PID.
   bool AddPid(int Pid, ePidType PidType = ptOther);
          ///< Adds a PID to the set of PIDs this device shall receive.
-  void DelPid(int Pid);
+  void DelPid(int Pid, ePidType PidType = ptOther);
          ///< Deletes a PID from the set of PIDs this device shall receive.
   virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
          ///< Does the actual PID setting on this device.
@@ -300,7 +303,6 @@ public:
 
 private:
   cPlayer *player;
-  bool playerDetached;
 protected:
   virtual bool CanReplay(void) const;
        ///< Returns true if this device can currently start a replay session.
@@ -349,8 +351,6 @@ public:
        ///< Attaches the given player to this device.
   void Detach(cPlayer *Player);
        ///< Detaches the given player from this device.
-  bool PlayerDetached(void);
-       ///< Returns true if a player has been detached and resets the 'playerDetached' flag.
 
 // Receiver facilities
 
-- 
cgit v1.2.3