summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-10-23 10:18:01 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2004-10-23 10:18:01 +0200
commit8ed9becabc8bb8d0be5a928ebb88398f6eb8a72f (patch)
tree7f2e7a4f0c8a2ff71ce1bb1239774983235b7a88
parent41669352b7f1e7a9f292b0c663441c8905c8cd8f (diff)
downloadvdr-8ed9becabc8bb8d0be5a928ebb88398f6eb8a72f.tar.gz
vdr-8ed9becabc8bb8d0be5a928ebb88398f6eb8a72f.tar.bz2
Fixed attaching a cPlayer to a cDevice
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY2
-rw-r--r--device.c4
3 files changed, 6 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2e436ba1..e42cd35e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1054,6 +1054,8 @@ Marco Schlüßler <marco@lordzodiac.de>
for avoiding unnecessary section filter start/stops
for pointing out that if one PID can't be added, the whole cDevice::AttachReceiver()
should fail and all PIDs added so far should be deleted
+ for fixing attaching a cPlayer to a cDevice, so that 'Operation not permited'
+ errors don't occur any more
Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP
diff --git a/HISTORY b/HISTORY
index 1ea3fb1f..360188ac 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3046,3 +3046,5 @@ Video Disk Recorder Revision History
- Added some missing 'const' to cChannel.
- Added a sample setup for 'DisiCon-4 Single Cable Network' to 'diseqc.conf'
(thanks to Oliver Endriss).
+- Fixed attaching a cPlayer to a cDevice, so that 'Operation not permited'
+ errors don't occur any more (thanks to Marco Schlüßler).
diff --git a/device.c b/device.c
index b53c0ab2..5a57faf8 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.60 2004/10/17 09:39:10 kls Exp $
+ * $Id: device.c 1.61 2004/10/23 10:15:31 kls Exp $
*/
#include "device.h"
@@ -595,8 +595,8 @@ bool cDevice::AttachPlayer(cPlayer *Player)
if (player)
Detach(player);
player = Player;
- player->device = this;
SetPlayMode(player->playMode);
+ player->device = this;
player->Activate(true);
return true;
}