From patchwork Tue Sep 27 09:28:48 2005 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carsten Koch X-Patchwork-Id: 12047 Received: from mail.icem.de ([158.225.1.2]) by www.linuxtv.org with esmtp (Exim 4.50) id 1EKBli-0007DJ-Lu for vdr@linuxtv.org; Tue, 27 Sep 2005 11:28:59 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.icem.de (Postfix) with ESMTP id 4BD33125CBD for ; Tue, 27 Sep 2005 11:28:57 +0200 (CEST) Received: from mail.icem.de ([127.0.0.1]) by localhost (melpumpe [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 24603-07; Tue, 27 Sep 2005 11:28:52 +0200 (CEST) Received: from [192.168.25.3] (wald3.icemnet.de [192.168.25.3]) by mail.icem.de (Postfix) with ESMTP id 9C638125C65 for ; Tue, 27 Sep 2005 11:28:50 +0200 (CEST) Message-ID: <433910D0.3040207@icem.com> Date: Tue, 27 Sep 2005 11:28:48 +0200 From: Carsten Koch User-Agent: Mozilla Thunderbird 1.0 (X11/20041207) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Video Disk Recorder Mailing List X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at icem.com Subject: [vdr] SourceCaps patch for VDR 1.3.33. X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Klaus Schmidinger's VDR List-Id: Klaus Schmidinger's VDR List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Sep 2005 09:28:59 -0000 Status: O X-Status: X-Keywords: X-UID: 5176 The attached patch allows a VDR system with multiple cards to attach each card to an individual dish pointing at a different satellite. I have 3 DVB cards in my VDR system: 1) FF card connected to one output of LNB at a dish pointed at Astra 19.2E. 2) budget card connected to another output of LNB at a dish pointed at Astra 19.2E. 3) budget card connected to output of LNB at a dish pointed at Eutelsat 13.0E. I am using the following entries for that in my setup.conf: SourceCaps = 1 S19.2E SourceCaps = 2 S19.2E SourceCaps = 3 S13.0E diff -ur vdr-1.3.33/config.c vdr-1.3.33+SourceCaps/config.c --- vdr-1.3.33/config.c 2005-09-09 17:08:59.000000000 +0200 +++ vdr-1.3.33+SourceCaps/config.c 2005-09-25 20:25:45.869496656 +0200 @@ -15,6 +15,7 @@ #include "interface.h" #include "plugin.h" #include "recording.h" +#include "sources.h" // IMPORTANT NOTE: in the 'sscanf()' calls there is a blank after the '%d' // format characters in order to allow any number of blanks after a numeric @@ -300,6 +301,8 @@ MultiSpeedMode = 0; ShowReplayMode = 0; ResumeID = 0; + memset(SourceCaps, 0, sizeof SourceCaps); + SourceCapsSet = false; CurrentChannel = -1; CurrentVolume = MAXVOLUME; CurrentDolby = 0; @@ -401,6 +404,49 @@ return true; } +void cSetup::StoreSourceCaps(const char *Name) +{ + cSetupLine *l; + while ((l = Get(Name)) != NULL) + Del(l); + + for (int i = 0; i < MAXDEVICES; i++) { + char buffer[MAXPARSEBUFFER]={0,}, *q = buffer; + int j = 0; + while (SourceCaps[i][j] && j < MAXSOURCECAPS) { + if (j==0) + q += snprintf(buffer, sizeof(buffer), "%i ", i+1); + q += snprintf(q, sizeof(buffer) - (q-buffer), "%s ", *cSource::ToString(SourceCaps[i][j++])); + } + if (*buffer) + Store(Name, buffer, NULL, true); + } +} + +bool cSetup::ParseSourceCaps(const char *Value) +{ + char *p; + int d = strtol(Value, &p, 10)-1, i = 0; + while (p < Value+strlen(Value)) { + if (*p==0) return true; + if (isblank(*p)) ++p; + if (isalpha(*p)) { + int source = cSource::FromString(p); + if (source != cSource::stNone) { + SourceCaps[d][i++] = source; + SourceCapsSet = true; + } + else + return false; + while (!isblank(*p) && *p) + ++p; + if (i>MAXSOURCECAPS) + return false; + } + } + return true; +} + bool cSetup::Parse(const char *Name, const char *Value) { if (!strcasecmp(Name, "OSDLanguage")) OSDLanguage = atoi(Value); @@ -458,6 +504,7 @@ else if (!strcasecmp(Name, "MultiSpeedMode")) MultiSpeedMode = atoi(Value); else if (!strcasecmp(Name, "ShowReplayMode")) ShowReplayMode = atoi(Value); else if (!strcasecmp(Name, "ResumeID")) ResumeID = atoi(Value); + else if (!strcasecmp(Name, "SourceCaps")) return ParseSourceCaps(Value); else if (!strcasecmp(Name, "CurrentChannel")) CurrentChannel = atoi(Value); else if (!strcasecmp(Name, "CurrentVolume")) CurrentVolume = atoi(Value); else if (!strcasecmp(Name, "CurrentDolby")) CurrentDolby = atoi(Value); @@ -523,6 +570,7 @@ Store("MultiSpeedMode", MultiSpeedMode); Store("ShowReplayMode", ShowReplayMode); Store("ResumeID", ResumeID); + if (SourceCapsSet) StoreSourceCaps("SourceCaps"); Store("CurrentChannel", CurrentChannel); Store("CurrentVolume", CurrentVolume); Store("CurrentDolby", CurrentDolby); diff -ur vdr-1.3.33/config.h vdr-1.3.33+SourceCaps/config.h --- vdr-1.3.33/config.h 2005-09-14 18:04:09.000000000 +0200 +++ vdr-1.3.33+SourceCaps/config.h 2005-09-25 20:25:45.871496352 +0200 @@ -30,6 +30,9 @@ #define MINOSDHEIGHT 324 #define MAXOSDHEIGHT 567 +#define MAXDEVICES 16 // the maximum number of devices in the system +#define MAXSOURCECAPS 128 // the maximum number of different sources per device + #define MaxFileName 256 #define MaxSkinName 16 #define MaxThemeName 16 @@ -198,6 +201,8 @@ void StoreLanguages(const char *Name, int *Values); bool ParseLanguages(const char *Value, int *Values); bool Parse(const char *Name, const char *Value); + void StoreSourceCaps(const char *Name); + bool ParseSourceCaps(const char *Value); cSetupLine *Get(const char *Name, const char *Plugin = NULL); void Store(const char *Name, const char *Value, const char *Plugin = NULL, bool AllowMultiple = false); void Store(const char *Name, int Value, const char *Plugin = NULL); @@ -252,6 +257,8 @@ int MultiSpeedMode; int ShowReplayMode; int ResumeID; + int SourceCaps[MAXDEVICES][MAXSOURCECAPS]; + bool SourceCapsSet; int CurrentChannel; int CurrentVolume; int CurrentDolby; diff -ur vdr-1.3.33/device.c vdr-1.3.33+SourceCaps/device.c --- vdr-1.3.33/device.c 2005-09-17 16:29:44.000000000 +0200 +++ vdr-1.3.33+SourceCaps/device.c 2005-09-25 20:25:45.873496048 +0200 @@ -174,8 +174,10 @@ for (int i = 0; i < MAXRECEIVERS; i++) receiver[i] = NULL; - if (numDevices < MAXDEVICES) + if (numDevices < MAXDEVICES) { device[numDevices++] = this; + SetSourceCaps(cardIndex); + } else esyslog("ERROR: too many devices!"); } @@ -313,6 +315,17 @@ return d; } +void cDevice::SetSourceCaps(int Index) +{ + for (int d = 0; d < numDevices; d++) { + if (Index < 0 || Index == device[d]->CardIndex()) { + for (int i = 0; i < MAXSOURCECAPS; i++) + device[d]->sourceCaps[i] = Setup.SourceCaps[device[d]->CardIndex()][i]; + } + } +} + + void cDevice::Shutdown(void) { primaryDevice = NULL; Only in vdr-1.3.33+SourceCaps: device.c.orig diff -ur vdr-1.3.33/device.h vdr-1.3.33+SourceCaps/device.h --- vdr-1.3.33/device.h 2005-09-17 16:29:28.000000000 +0200 +++ vdr-1.3.33+SourceCaps/device.h 2005-09-25 20:25:45.874495896 +0200 @@ -23,7 +23,6 @@ #include "thread.h" #include "tools.h" -#define MAXDEVICES 16 // the maximum number of devices in the system #define MAXPIDHANDLES 64 // the maximum number of different PIDs per device #define MAXRECEIVERS 16 // the maximum number of receivers per device #define MAXVOLUME 255 @@ -133,6 +132,8 @@ ///< given Priority. ///< See ProvidesChannel() for more information on how ///< priorities are handled, and the meaning of NeedsDetachReceivers. + static void SetSourceCaps(int Index = -1); + ///< Sets the SourceCaps of the given device according to the Setup data. static void Shutdown(void); ///< Closes down all devices. ///< Must be called at the end of the program. @@ -140,6 +141,7 @@ static int nextCardIndex; int cardIndex; protected: + int sourceCaps[MAXSOURCECAPS]; cDevice(void); virtual ~cDevice(); virtual bool Ready(void); diff -ur vdr-1.3.33/dvbdevice.c vdr-1.3.33+SourceCaps/dvbdevice.c --- vdr-1.3.33/dvbdevice.c 2005-08-21 11:17:20.000000000 +0200 +++ vdr-1.3.33+SourceCaps/dvbdevice.c 2005-09-25 20:25:45.876495592 +0200 @@ -754,10 +754,17 @@ bool cDvbDevice::ProvidesSource(int Source) const { int type = Source & cSource::st_Mask; - return type == cSource::stNone - || type == cSource::stCable && frontendType == FE_QAM - || type == cSource::stSat && frontendType == FE_QPSK - || type == cSource::stTerr && frontendType == FE_OFDM; + if (Setup.SourceCapsSet && type == cSource::stSat && frontendType == FE_QPSK) { + for (int i = 0; i < MAXSOURCECAPS; i++) + if (sourceCaps[i] == Source) + return true; + return false; + } + else + return type == cSource::stNone + || type == cSource::stCable && frontendType == FE_QAM + || type == cSource::stSat && frontendType == FE_QPSK + || type == cSource::stTerr && frontendType == FE_OFDM; } bool cDvbDevice::ProvidesTransponder(const cChannel *Channel) const