## 02_scanning_status_service.dpatch by Tobias Grimm ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: This patch adds the service ReelChannelscan::IsScanningOnReceivingDevice ## DP: that is used by a VDR patch instead of exposiing a global variable in ## DP: VDR. diff -Nru reelchannelscan-0.4.3/channelscan.c reelchannelscan-0.4.3-scanning_status_service/channelscan.c --- reelchannelscan-0.4.3/channelscan.c 2008-09-07 21:28:55.000000000 +0200 +++ reelchannelscan-0.4.3-scanning_status_service/channelscan.c 2008-09-07 21:29:35.000000000 +0200 @@ -30,6 +30,7 @@ #include "service.h" #include "csmenu.h" #include "channelscan.h" +#include "evil_globals.h" int oldChannelNumbers = 0; //XXX @@ -150,6 +151,13 @@ } return true; } + + if (Id && strcmp(Id,"ReelChannelscan::IsScanningOnReceivingDevice")==0) + { + *(bool*)Data = scanning_on_receiving_device; + return true; + } + return false; } diff -Nru reelchannelscan-0.4.3/csmenu.c reelchannelscan-0.4.3-scanning_status_service/csmenu.c --- reelchannelscan-0.4.3/csmenu.c 2008-09-07 21:29:02.000000000 +0200 +++ reelchannelscan-0.4.3-scanning_status_service/csmenu.c 2008-09-07 21:29:35.000000000 +0200 @@ -23,6 +23,7 @@ #include "csmenu.h" #include "filter.h" +#include "evil_globals.h" #define CHNUMWIDTH 16 diff -Nru reelchannelscan-0.4.3/evil_globals.h reelchannelscan-0.4.3-scanning_status_service/evil_globals.h --- reelchannelscan-0.4.3/evil_globals.h 1970-01-01 01:00:00.000000000 +0100 +++ reelchannelscan-0.4.3-scanning_status_service/evil_globals.h 2008-09-07 21:29:35.000000000 +0200 @@ -0,0 +1,6 @@ +#ifndef __EVIL_GLOBALS_H +#define __EVIL_GLOBALS_H + +extern bool scanning_on_receiving_device; + +#endif diff -Nru reelchannelscan-0.4.3/scan.c reelchannelscan-0.4.3-scanning_status_service/scan.c --- reelchannelscan-0.4.3/scan.c 2008-09-07 21:29:00.000000000 +0200 +++ reelchannelscan-0.4.3-scanning_status_service/scan.c 2008-09-07 21:29:35.000000000 +0200 @@ -17,11 +17,12 @@ #include "scan.h" #include #include "debug.h" +#include "evil_globals.h" #define SCAN_DELAY 20 #define DVBS_LOCK_TIMEOUT 4000 -//bool scanning_on_receiving_device = false; +bool scanning_on_receiving_device = false; using std::cout;