Fixed wrong assumption device-nr == card-nr. Added translations, and defaulting to astra in case channel-list is empty.

(Portage version: 2.1.2.7)

5 files changed, 268 insertions, 0 deletions

diff --git a/media-plugins/vdr-reelchannelscan/files/0.4.3/default-source-if-no-channel-set.diff b/media-plugins/vdr-reelchannelscan/files/0.4.3/default-source-if-no-channel-set.diff
new file mode 100644
index 000000000000..849b4ce30bbf
--- /dev/null
+++ b/media-plugins/vdr-reelchannelscan/files/0.4.3/default-source-if-no-channel-set.diff
@@ -0,0 +1,13 @@
+Index: reelchannelscan-0.4.3/csmenu.c
+===================================================================
+--- reelchannelscan-0.4.3.orig/csmenu.c
++++ reelchannelscan-0.4.3/csmenu.c
+@@ -241,7 +241,7 @@ void cMenuChannelscan::Set()
+ 
+   // avoid C/T-positions for SAT 
+   // and take Astra as start position
+-  if (srcTypes[sourceStat]==SAT  && (source==cSource::FromString("C") || source==cSource::FromString("T")))
++  if (srcTypes[sourceStat]==SAT  && (source==cSource::FromString("C") || source==cSource::FromString("T") || source==0))
+     source = cSource::FromString("S19.2E"); 
+ 
+    int blankLines = 4;
diff --git a/media-plugins/vdr-reelchannelscan/files/0.4.3/device-numbering.diff b/media-plugins/vdr-reelchannelscan/files/0.4.3/device-numbering.diff
new file mode 100644
index 000000000000..4de4dcc572ac
--- /dev/null
+++ b/media-plugins/vdr-reelchannelscan/files/0.4.3/device-numbering.diff
@@ -0,0 +1,174 @@
+Index: reelchannelscan-0.4.3/csmenu.c
+===================================================================
+--- reelchannelscan-0.4.3.orig/csmenu.c
++++ reelchannelscan-0.4.3/csmenu.c
+@@ -190,26 +190,27 @@ void cMenuChannelscan::TunerDetection()
+ {
+ 
+   int stp=0;
+-  for (int i=0;i<4;i++) 
++  for (int i=0;i<cDevice::NumDevices();i++) 
+   {
+     cDevice *device = cDevice::GetDevice(i);
+-    srcTexts[i]=NULL; 
++    srcTexts[srcTuners]=NULL; 
+     if (device) {
+       char *txt=NULL;
+       if (device->ProvidesSource(cSource::stTerr)) {
+-         asprintf(&txt,"%s (%s %i)",tr("DVB-T - Terrestrial"),tr("Tuner"),i+1);
++         asprintf(&txt,"%s (%s %i)",tr("DVB-T - Terrestrial"),tr("Tuner"),srcTuners+1);
+          stp=TERR;
+       }
+       else if (device->ProvidesSource(cSource::stCable)) {
+-         asprintf(&txt,"%s (%s %i)",tr("DVB-C - Cable"),tr("Tuner"),i+1);
++         asprintf(&txt,"%s (%s %i)",tr("DVB-C - Cable"),tr("Tuner"),srcTuners+1);
+          stp=CABLE;
+       }
+       else if (device->ProvidesSource(cSource::stSat)) {
+-         asprintf(&txt,"%s (%s %i)",tr("DVB-S - Satellite"),tr("Tuner"),i+1);
++         asprintf(&txt,"%s (%s %i)",tr("DVB-S - Satellite"),tr("Tuner"),srcTuners+1);
+          stp=SAT;
+       }
+       if (txt) {
+          srcTypes[srcTuners]=stp;
++	 srcDeviceNr[srcTuners]=i;
+          srcTexts[srcTuners++]=txt;
+       }
+     }
+@@ -417,9 +418,9 @@ eOSState cMenuChannelscan::ProcessKey(eK
+    
+     sourceType=srcTypes[sourceStat];
+   
+-    scp.card = sourceStat;
++    scp.deviceNr = srcDeviceNr[sourceStat];
+     scp.type=sourceType;
+-    scp.source = 
++    scp.source = source; 
+     scp.bandwidth = bandwidth;
+     scp.polarization = polarization;
+     scp.symbolrate = symbolrate;
+@@ -573,7 +574,7 @@ cMenuScanActive::cMenuScanActive(scanPar
+   // auto_ptr
+   Scan.reset(new cScan());
+   
+-  isyslog (" start Scanning @ Card %d --- ", scp->card);
++  isyslog (" start Scanning @ Card %d --- ", scp->deviceNr);
+   if (!Scan->StartScanning(scp))
+   {
+      esyslog (ERR "  Tuner Error");
+Index: reelchannelscan-0.4.3/csmenu.h
+===================================================================
+--- reelchannelscan-0.4.3.orig/csmenu.h
++++ reelchannelscan-0.4.3/csmenu.h
+@@ -51,8 +51,9 @@ private:
+   int source;
+   int frequency;
+   int symbolrate;
+-  char *srcTexts[4];
+-  int srcTypes[4];
++  char *srcTexts[MAXDEVICES];
++  int srcTypes[MAXDEVICES];
++  int srcDeviceNr[MAXDEVICES];
+   int srcTuners;
+   const char *fecTexts[10];
+   const char *modTexts[10];
+Index: reelchannelscan-0.4.3/scan.c
+===================================================================
+--- reelchannelscan-0.4.3.orig/scan.c
++++ reelchannelscan-0.4.3/scan.c
+@@ -38,7 +38,7 @@ cScan::cScan()
+ 
+   newChannels = 0;
+   fd_frontend= -1;
+-  cardnr = -1;
++  devicenr = -1;
+   transponderNr = 0;
+   channelNumber = 0;
+   frequency = 0;
+@@ -70,26 +70,26 @@ cScan::~cScan()
+ 
+   if (NFilter) 
+   {
+-    cDevice::GetDevice(cardnr)->Detach(NFilter);
++    cDevice::GetDevice(devicenr)->Detach(NFilter);
+     delete NFilter;
+     NFilter=NULL;
+   }
+ 
+   if (PFilter)  
+   {
+-    cDevice::GetDevice(cardnr)->Detach(PFilter);
++    cDevice::GetDevice(devicenr)->Detach(PFilter);
+     delete PFilter;
+     PFilter=NULL;
+   }
+   if (SFilter)
+   {
+-    cDevice::GetDevice(cardnr)->Detach(SFilter);
++    cDevice::GetDevice(devicenr)->Detach(SFilter);
+     delete SFilter;
+     SFilter=NULL;
+   }
+   if (EFilter)
+   {
+-    cDevice::GetDevice(cardnr)->Detach(EFilter);
++    cDevice::GetDevice(devicenr)->Detach(EFilter);
+     delete EFilter;
+     EFilter=NULL;
+   }
+@@ -144,8 +144,9 @@ bool cScan::StartScanning(scanParameters
+     
+     cDevice::PrimaryDevice()->StopReplay();
+ 
+-    cardnr = scp->card;
+-    DLOG (DBG " Stop Replay Card Number %d", cardnr);
++    devicenr = scp->deviceNr;
++    int cardnr = cDevice::GetDevice(devicenr)->CardIndex();
++    DLOG (DBG " Stop Replay Card Number %d", deviceNr);
+ 
+     scanning_on_receiving_device=true;
+ 
+@@ -330,7 +331,7 @@ void cScan::ScanDVB_S(cTransponder *tp, 
+      }
+ #endif        
+   }
+-  else if (cDevice::GetDevice(cardnr)->HasLock(DVBS_LOCK_TIMEOUT))
++  else if (cDevice::GetDevice(devicenr)->HasLock(DVBS_LOCK_TIMEOUT))
+   {
+      if (cMenuChannelscan::scanState == ssGetTransponders) {
+        ScanNitServices();
+@@ -500,7 +501,7 @@ void cScan::Action()
+   // the one and only "scanning = true" !
+   // cMenuChannelscan::scanning = true;
+ 
+-  device = cDevice::GetDevice(cardnr);
++  device = cDevice::GetDevice(devicenr);
+   std::auto_ptr<cChannel> c(new cChannel);
+ 
+   cTransponders &transponders = cTransponders::GetInstance();
+Index: reelchannelscan-0.4.3/scan.h
+===================================================================
+--- reelchannelscan-0.4.3.orig/scan.h
++++ reelchannelscan-0.4.3/scan.h
+@@ -62,7 +62,7 @@ private:
+   int origUpdateChannels;
+   bool nitScan;
+   int sourceCode;    // internal VDR Code for dvb Sources  see vdr/sources.c
+-  int cardnr;
++  int devicenr;
+   int transponderNr;
+   int channelNumber;
+   int frequency;
+Index: reelchannelscan-0.4.3/transponders.h
+===================================================================
+--- reelchannelscan-0.4.3.orig/transponders.h
++++ reelchannelscan-0.4.3/transponders.h
+@@ -39,7 +39,7 @@ namespace setup
+ #endif
+ 
+ typedef struct {
+-    int card;
++    int deviceNr;
+     int type;
+     int source;
+     int frequency;     // 0: Full band scan
diff --git a/media-plugins/vdr-reelchannelscan/files/0.4.3/i18n.diff b/media-plugins/vdr-reelchannelscan/files/0.4.3/i18n.diff
new file mode 100644
index 000000000000..dc014bdfc5fe
--- /dev/null
+++ b/media-plugins/vdr-reelchannelscan/files/0.4.3/i18n.diff
@@ -0,0 +1,78 @@
+Index: reelchannelscan-0.4.3/i18n.c
+===================================================================
+--- reelchannelscan-0.4.3.orig/i18n.c
++++ reelchannelscan-0.4.3/i18n.c
+@@ -207,6 +207,28 @@
+     "", // Dansk
+     "", // Èesky (Czech)
+   },
++  { "SearchMode$Auto NIT",
++    "NIT Automatik",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "", // Hrvatski (Croatian)
++    "", // Eesti
++    "", // Dansk
++    "", // Èesky (Czech)
++  },
+   { "Manual",
+     "Manuell",
+     "",
+@@ -317,6 +339,28 @@
+     "", // Dansk
+     "", // Èesky (Czech)
+   },
++  { "Tuner",
++    "Tuner",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "",
++    "", // Hrvatski (Croatian)
++    "", // Eesti
++    "", // Dansk
++    "", // Èesky (Czech)
++  },
+   { "Scanning on transponder",
+     "Durchsuche Transponder",
+     "",
+Index: reelchannelscan-0.4.3/csmenu.c
+===================================================================
+--- reelchannelscan-0.4.3.orig/csmenu.c
++++ reelchannelscan-0.4.3/csmenu.c
+@@ -128,9 +128,11 @@ cMenuChannelscan::cMenuChannelscan(int C
+   sBwItem[1] = "7 MHz";
+   sBwItem[2] = "8 MHz";
+ 
++  /*
+   sSRScanMode[0]= tr("Intelligent 6900/6875/6111");
+   sSRScanMode[1]= tr("Try all 6900/6875/6111");
+   sSRScanMode[2]= tr("Manual");
++  */
+ 
+   srScanMode=0;
+   
diff --git a/media-plugins/vdr-reelchannelscan/files/0.4.3/series b/media-plugins/vdr-reelchannelscan/files/0.4.3/series
index 0758e7ac501a..9039c46d25cf 100644
--- a/media-plugins/vdr-reelchannelscan/files/0.4.3/series
+++ b/media-plugins/vdr-reelchannelscan/files/0.4.3/series
@@ -1 +1,4 @@
+default-source-if-no-channel-set.diff
+device-numbering.diff
+i18n.diff
 gentoo.diff
diff --git a/media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3-r1 b/media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3-r2
index eef97dc65401..eef97dc65401 100644
--- a/media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3-r1
+++ b/media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3-r2