summaryrefslogtreecommitdiff
path: root/device.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2003-05-03 13:42:37 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2003-05-03 13:42:37 +0200
commit3fc00d2211c732b2b9ecdead946bb9d3a0d9c621 (patch)
tree25895faeeaaf0b6736d69ee4c05f02110a888329 /device.c
parent201364cd8a874a9496212509877a72a7a53c5367 (diff)
downloadvdr-3fc00d2211c732b2b9ecdead946bb9d3a0d9c621.tar.gz
vdr-3fc00d2211c732b2b9ecdead946bb9d3a0d9c621.tar.bz2
Restoring the current channel in case a recording has switched the transponder
Diffstat (limited to 'device.c')
-rw-r--r--device.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/device.c b/device.c
index 9380f1d1..9346d3b5 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: device.c 1.40 2003/05/02 09:18:42 kls Exp $
+ * $Id: device.c 1.41 2003/05/03 13:40:15 kls Exp $
*/
#include "device.h"
@@ -50,8 +50,6 @@ cDevice::cDevice(void)
ciHandler = NULL;
player = NULL;
- playerDetached = false;
-
for (int i = 0; i < MAXRECEIVERS; i++)
receiver[i] = NULL;
@@ -122,13 +120,6 @@ bool cDevice::HasDecoder(void) const
return false;
}
-bool cDevice::PlayerDetached(void)
-{
- bool result = playerDetached;
- playerDetached = false;
- return result;
-}
-
cOsdBase *cDevice::NewOsd(int x, int y)
{
return NULL;
@@ -408,6 +399,11 @@ bool cDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
return false;
}
+bool cDevice::HasProgramme(void)
+{
+ return Replaying() || pidHandles[ptAudio].pid || pidHandles[ptVideo].pid;
+}
+
void cDevice::SetVolumeDevice(int Volume)
{
}
@@ -536,7 +532,6 @@ void cDevice::Detach(cPlayer *Player)
player->device = NULL;
player = NULL;
SetPlayMode(pmNone);
- playerDetached = true;
Audios.ClearAudio();
}
}