summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-02-15 15:07:27 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2004-02-15 15:07:27 +0100
commitc817c341cead8ddbb8f544d6dd5e4dbe4050af19 (patch)
tree0dfc8ae130058ba5e6211d15aec569857f46da56
parent0a3f7e7ca23078eab860032350d61ceb2a8ab50c (diff)
downloadvdr-c817c341cead8ddbb8f544d6dd5e4dbe4050af19.tar.gz
vdr-c817c341cead8ddbb8f544d6dd5e4dbe4050af19.tar.bz2
Fixed handling receivers in the 'sky' plugin
-rw-r--r--HISTORY2
-rw-r--r--PLUGINS/src/sky/HISTORY2
-rw-r--r--PLUGINS/src/sky/sky.c6
3 files changed, 7 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 746e3608..52742e3e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2671,3 +2671,5 @@ Video Disk Recorder Revision History
from www.bleb.org.
- Limited automatic retuning to devices that actually provide the transponder
(necessary for the 'sky' plugin).
+- Fixed handling receivers in the 'sky' plugin, so that a recording on the same
+ channel won't interrupt an ongoing Transfer mode.
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index 2b7f2b34..c1c5f98e 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -22,3 +22,5 @@ VDR Plugin 'sky' Revision History
- Now using the actual channel IDs a derived from the data stream.
- Switched EPG data retrieval to http://www.bleb.org.
- Added automatic DST detection to getskyepg.pl.
+- Fixed handling receivers, so that a recording on the same channel
+ won't interrupt an ongoing Transfer mode.
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index dbadf1dc..6196eefc 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: sky.c 1.5 2004/02/15 12:40:22 kls Exp $
+ * $Id: sky.c 1.6 2004/02/15 14:59:46 kls Exp $
*/
#include <sys/socket.h>
@@ -199,7 +199,7 @@ bool cDigiboxDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool
cSkyChannel *SkyChannel = SkyChannels.GetSkyChannel(Channel);
if (SkyChannel) {
- if (Receiving()) {
+ if (Receiving(true)) {
if (digiboxChannelNumber == SkyChannel->digiboxChannelNumber) {
needsDetachReceivers = false;
result = true;
@@ -217,7 +217,7 @@ bool cDigiboxDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool
bool cDigiboxDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
{
- if (fd_lirc >= 0 && !Receiving()) { // if we are receiving the channel is already set!
+ if (fd_lirc >= 0 && !Receiving(true)) { // if we are receiving the channel is already set!
cSkyChannel *SkyChannel = SkyChannels.GetSkyChannel(Channel);
if (SkyChannel) {
digiboxChannelNumber = SkyChannel->digiboxChannelNumber;