Refactoring of cPvrSourceParam: it can now be used by ParseChannels

The parsing and writing of the channel's source parameter is now focused at one place.

24 files changed, 535 insertions, 504 deletions

diff --git a/Makefile b/Makefile
index bffb464..3817a60 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
-OBJS = pvrinput.o common.o device.o reader.o menu.o setup.o filter.o
+OBJS = pvrinput.o common.o device.o reader.o menu.o setup.o filter.o sourceparams.o
 
 ### The main target:
 
diff --git a/common.h b/common.h
index a7a617d..56194b9 100644
--- a/common.h
+++ b/common.h
@@ -22,6 +22,11 @@ enum eLogLevel { pvrUNUSED, pvrERROR, pvrINFO, pvrDEBUG1, pvrDEBUG2, pvrDEBUG3 }
 #include <vdr/sources.h>
 #include <vdr/device.h>
 #include <vdr/plugin.h>
+#if VDRVERSNUM > 10712
+#include <vdr/sourceparams.h>
+#define PVR_SOURCEPARAMS
+#endif
+
 
 
 #include "setup.h"
@@ -31,6 +36,7 @@ enum eLogLevel { pvrUNUSED, pvrERROR, pvrINFO, pvrDEBUG1, pvrDEBUG2, pvrDEBUG3 }
 #include "reader.h"
 #include "pvrinput.h"
 #include "menu.h"
+#include "sourceparams.h"
 
 #if VDRVERSNUM < 10507
 #include "i18n.h"
diff --git a/device.c b/device.c
index 395efc8..f77ed15 100644
--- a/device.c
+++ b/device.c
@@ -19,188 +19,6 @@ cPvrDevice *PvrDevices[kMaxPvrDevices];
 
 cString cPvrDevice::externChannelSwitchScript;
 
-#ifdef PVR_SOURCEPARAMS
-class cPvrSourceParam : public cSourceParam {
-private:
-  int param;
-  int input;
-  int standard;
-  int card;
-
-public:
-  cPvrSourceParam();
-  cString ParametersToString(void) const;
-  void    ParseParameters(const char *Parameters);
-  virtual void SetData(cChannel *Channel);
-  virtual void GetData(cChannel *Channel);
-  virtual cOsdItem *GetOsdItem(void);
-
-  static bool IsPvr(int Code);
-  
-  static const char  sSourceID = 'V';
-  static const uint  stPvr = (sSourceID << 24);
-  static const int   sNumInputs = 12;
-  static const char *sInputs[];
-  static const int   sNumCards = 9;
-  static const char *sCards[];
-  static const int   sNumStandards = 31;
-  static const char *sStandards[];
-};
-
-const char *cPvrSourceParam::sInputs[] = {
- "TV",
- "RADIO",
- "COMPOSITE0",
- "COMPOSITE1",
- "COMPOSITE2",
- "COMPOSITE3",
- "COMPOSITE4",
- "SVIDEO0",
- "SVIDEO1",
- "SVIDEO2",
- "SVIDEO3",
- "COMPONENT"
-};
-
-const char *cPvrSourceParam::sCards[] = {
- "",
- "CARD0",
- "CARD1",
- "CARD2",
- "CARD3",
- "CARD4",
- "CARD5",
- "CARD6",
- "CARD7"
-};
-
-const char *cPvrSourceParam::sStandards[] = {
-  "",
-  "PAL",
-  "NTSC",
-  "SECAM",
-  "NTSC_M",
-  "NTSC_M_JP",
-  "NTSC_443",
-  "NTSC_M_KR",
-  "PAL_M",
-  "PAL_N",
-  "PAL_NC",
-  "PAL_B",
-  "PAL_B1",
-  "PAL_G",
-  "PAL_BG",
-  "PAL_D",
-  "PAL_D1",
-  "PAL_K",
-  "PAL_DK",
-  "PAL_H",
-  "PAL_I",
-  "PAL_60",
-  "SECAM_B",
-  "SECAM_D",
-  "SECAM_G",
-  "SECAM_H",
-  "SECAM_K",
-  "SECAM_K1",
-  "SECAM_DK",
-  "SECAM_L",
-  "SECAM_LC"
-};
-
-cPvrSourceParam::cPvrSourceParam()
-:cSourceParam(sSourceID, "analog (pvrinput)")
-{
-  param = 0;
-  input = 0;
-  standard = 0;
-  card = 0;
-}
-
-cString cPvrSourceParam::ParametersToString(void) const
-{
-  if ((standard == 0) && (card == 0))
-     return cString::sprintf("%s", sInputs[input]);
-  if ((standard == 0) && (card != 0))
-     return cString::sprintf("%s|%s", sInputs[input], sCards[card]);
-  if ((standard != 0) && (card == 0))
-     return cString::sprintf("%s|%s", sInputs[input], sStandards[standard]);
-  return cString::sprintf("%s|%s|%s", sInputs[input], sCards[card], sStandards[standard]);
-}
-
-void    cPvrSourceParam::ParseParameters(const char *Parameters)
-{
-  char *Input     = NULL;
-  char *optArg[2] = { NULL, NULL };
-  int NumArgs = sscanf(Parameters, "%a[^|]|%a[^|]|%a[^:\n]", &Input, &optArg[0], &optArg[1]);
-  input = 0;
-  card = 0;
-  standard = 0;
-  if (NumArgs >= 1) {
-    for (int i = 0; i < sNumInputs; i++) {
-      if (!strcasecmp(Input, sInputs[i])) {
-        input = i;
-        break;
-      }
-    }
-  }
-  for (int opt = 0; opt < 2; opt++) {
-    if (NumArgs >= (opt + 2)) {
-      bool parsed = false;
-      for (int c = 1; c < sNumCards; c++) {
-        if (!strcasecmp(optArg[opt], sCards[c])) {
-          card = c;
-          parsed = true;
-          break;
-        }
-      }
-      if (!parsed) {
-        for (int s = 1; s < sNumStandards; s++) {
-          if (!strcasecmp(optArg[opt], sStandards[s])) {
-            standard = s;
-            break;
-          }
-        }
-      }
-    }
-  }
-}
-
-void cPvrSourceParam::SetData(cChannel *Channel)
-{
-  ParseParameters(Channel->Parameters());
-  param = 0;
-}
-
-void cPvrSourceParam::GetData(cChannel *Channel)
-{
-  Channel->SetTransponderData(Channel->Source(), Channel->Frequency(), Channel->Srate(), ParametersToString(), true);
-}
-
-cOsdItem *cPvrSourceParam::GetOsdItem(void)
-{
-  switch (param++) {
-    case 0: return new cMenuEditStraItem(tr("SourceParam.pvrinput$Input"), &input, sNumInputs, sInputs);
-    case 1: return new cMenuEditStraItem(tr("SourceParam.pvrinput$Card"), &card, sNumCards, sCards);
-    case 2: return new cMenuEditStraItem(tr("SourceParam.pvrinput$Standard"), &standard, sNumStandards, sStandards);
-    default: return NULL;
-  }
-  return NULL;
-}
-
-bool cPvrSourceParam::IsPvr(int Code)
-{
-  return (Code & cSource::st_Mask) == stPvr;
-}
-#endif
-
-static void cPvrSourceParam_Initialize()
-{
-#ifdef PVR_SOURCEPARAMS
-  new cPvrSourceParam();
-#endif
-}
-
 cPvrDevice::cPvrDevice(int DeviceNumber)
 : number(DeviceNumber),
   CurrentNorm(0), //uint64_t can't be negative
@@ -434,7 +252,9 @@ bool cPvrDevice::Probe(int DeviceNumber)
 bool cPvrDevice::Initialize(void)
 {
   int found = 0;
-  cPvrSourceParam_Initialize();
+#ifdef PVR_SOURCEPARAMS
+  new cPvrSourceParam();
+#endif
   for (int i = 0; i < kMaxPvrDevices; i++) {
     PvrDevices[i] = NULL;
     if (Probe(i)) {
@@ -829,140 +649,38 @@ bool cPvrDevice::ParseChannel(const cChannel *Channel, int *input, uint64_t *nor
   *LinesPerFrame = CurrentLinesPerFrame; //see above
   *input = -1;
   if (Channel->IsCable() && Channel->Ca() == 0xA1) {
-    Skins.Message(mtError, tr("pvrinput no longer supports old channel syntax!"), 2);
-    log(pvrERROR, "cPvrDevice::pvrinput no longer supports old channel syntax!");
-    }
+     Skins.Message(mtError, tr("pvrinput no longer supports old channel syntax!"), 2);
+     log(pvrERROR, "cPvrDevice::pvrinput no longer supports old channel syntax!");
+     return false;
+     }
 #ifdef PVR_SOURCEPARAMS
   if (cPvrSourceParam::IsPvr(Channel->Source())) {
-    const char *str = Channel->Parameters();
-    const char *PluginId = "PVRINPUT";
-    char *Input    = NULL;
-    char *optArg1  = NULL;
-    char *optArg2  = NULL;
-    int NumArgs = 1 + sscanf(str, "%a[^|]|%a[^|]|%a[^:\n]", &Input, &optArg1, &optArg2);
+     const char *str = Channel->Parameters();
 #else
   if (Channel->IsPlug()) {
-    const char *str = Channel->PluginParam();
-    char *PluginId = NULL;
-    char *Input    = NULL;
-    char *optArg1  = NULL;
-    char *optArg2  = NULL;
-    int NumArgs = sscanf(str, "%a[^|]|%a[^|]|%a[^|]|%a[^:\n]", &PluginId, &Input, &optArg1, &optArg2);
+     const char *str = Channel->PluginParam();
 #endif
 
-    if (NumArgs >= 2) {
-      if (strcasecmp(PluginId, "PVRINPUT"))
-         return false;
-      log(pvrDEBUG1, "cPvrDevice::ParseChannel: using iptv channel syntax.");
-      *vpid = Channel->Vpid();
-      *apid = Channel->Apid(0);
-      *tpid = Channel->Tpid();
-      if      (!strcasecmp (Input, "RADIO"))           *inputType = eRadio;
-      else if (!strcasecmp (Input, "TV"))              *inputType = eTelevision;
-      else if (!strncasecmp(Input, "COMPOSITE", 9))    *inputType = eExternalInput;
-      else if (!strncasecmp(Input, "SVIDEO", 6))       *inputType = eExternalInput;
-      else if (!strncasecmp(Input, "COMPONENT", 9))    *inputType = eExternalInput;
-      else return false;
-      if      (!strcasecmp (Input, "TV"))              *input = inputs[eTelevision];
-      else if (!strcasecmp (Input, "RADIO"))           *input = inputs[eRadio];
-      else if (!strcasecmp (Input, "COMPOSITE0"))      *input = inputs[eComposite0];
-      else if (!strcasecmp (Input, "COMPOSITE1"))      *input = inputs[eComposite1];
-      else if (!strcasecmp (Input, "COMPOSITE2"))      *input = inputs[eComposite2];
-      else if (!strcasecmp (Input, "COMPOSITE3"))      *input = inputs[eComposite3];
-      else if (!strcasecmp (Input, "COMPOSITE4"))      *input = inputs[eComposite4];
-      else if (!strcasecmp (Input, "COMPOSITE"))       *input = inputs[eComposite0];
-      else if (!strcasecmp (Input, "SVIDEO0"))         *input = inputs[eSVideo0];
-      else if (!strcasecmp (Input, "SVIDEO1"))         *input = inputs[eSVideo1];
-      else if (!strcasecmp (Input, "SVIDEO2"))         *input = inputs[eSVideo2];
-      else if (!strcasecmp (Input, "SVIDEO3"))         *input = inputs[eSVideo3];
-      else if (!strcasecmp (Input, "SVIDEO"))          *input = inputs[eSVideo0];
-      else if (!strcasecmp (Input, "COMPONENT"))       *input = inputs[eComponent];
-      else return false; //unknown
-      if (NumArgs > 2) { /* only if optional arg norm or card given */
-        if      (!strcasecmp  (optArg1, "PAL"))        { *norm = V4L2_STD_PAL;       *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "NTSC" ))      { *norm = V4L2_STD_NTSC;      *LinesPerFrame = 525; }
-        else if (!strcasecmp  (optArg1, "SECAM"))      { *norm = V4L2_STD_SECAM;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "NTSC_M"))     { *norm = V4L2_STD_NTSC_M;    *LinesPerFrame = 525; }
-        else if (!strcasecmp  (optArg1, "NTSC_M_JP"))  { *norm = V4L2_STD_NTSC_M_JP; *LinesPerFrame = 525; }
-        else if (!strcasecmp  (optArg1, "NTSC_443"))   { *norm = V4L2_STD_NTSC_443;  *LinesPerFrame = 525; }
-        else if (!strcasecmp  (optArg1, "NTSC_M_KR"))  { *norm = V4L2_STD_NTSC_M_KR; *LinesPerFrame = 525; }
-        else if (!strcasecmp  (optArg1, "PAL_M"))      { *norm = V4L2_STD_PAL_M;     *LinesPerFrame = 525; }
-        else if (!strcasecmp  (optArg1, "PAL_N"))      { *norm = V4L2_STD_PAL_N;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "PAL_NC"))     { *norm = V4L2_STD_PAL_Nc;    *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "PAL_B"))      { *norm = V4L2_STD_PAL_B;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "PAL_B1"))     { *norm = V4L2_STD_PAL_B1;    *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "PAL_G"))      { *norm = V4L2_STD_PAL_G;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "PAL_BG"))     { *norm = V4L2_STD_PAL_BG;    *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "PAL_D"))      { *norm = V4L2_STD_PAL_D;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "PAL_D1"))     { *norm = V4L2_STD_PAL_D1;    *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "PAL_K"))      { *norm = V4L2_STD_PAL_K;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "PAL_DK"))     { *norm = V4L2_STD_PAL_DK;    *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "PAL_H"))      { *norm = V4L2_STD_PAL_H;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "PAL_I"))      { *norm = V4L2_STD_PAL_I;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "PAL_60"))     { *norm = V4L2_STD_PAL_60;    *LinesPerFrame = 525; }
-        else if (!strcasecmp  (optArg1, "SECAM_B"))    { *norm = V4L2_STD_SECAM_B;   *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "SECAM_D"))    { *norm = V4L2_STD_SECAM_D;   *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "SECAM_G"))    { *norm = V4L2_STD_SECAM_G;   *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "SECAM_H"))    { *norm = V4L2_STD_SECAM_H;   *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "SECAM_K"))    { *norm = V4L2_STD_SECAM_K;   *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "SECAM_K1"))   { *norm = V4L2_STD_SECAM_K1;  *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "SECAM_DK"))   { *norm = V4L2_STD_SECAM_DK;  *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "SECAM_L"))    { *norm = V4L2_STD_SECAM_L;   *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg1, "SECAM_LC"))   { *norm = V4L2_STD_SECAM_LC;  *LinesPerFrame = 625; }
-        if      (!strcasecmp  (optArg1, "CARD0"))      *card = 0;
-        else if (!strcasecmp  (optArg1, "CARD1"))      *card = 1;
-        else if (!strcasecmp  (optArg1, "CARD2"))      *card = 2;
-        else if (!strcasecmp  (optArg1, "CARD3"))      *card = 3;
-        else if (!strcasecmp  (optArg1, "CARD4"))      *card = 4;
-        else if (!strcasecmp  (optArg1, "CARD5"))      *card = 5;
-        else if (!strcasecmp  (optArg1, "CARD6"))      *card = 6;
-        else if (!strcasecmp  (optArg1, "CARD7"))      *card = 7;
+     int inputIndex = 0;
+     int standardIndex = 0;
+     int cardIndex = 0;
+     if (!cPvrSourceParam::ParseParameters(str, &inputIndex, &standardIndex, &cardIndex))
+        return false;
+     *input = inputs[cPvrSourceParam::sInputType[inputIndex]];
+     *inputType = cPvrSourceParam::sInputType[inputIndex];
+     if ((*inputType != eTelevision) && (*inputType != eRadio))
+        *inputType = eExternalInput;
+     if (standardIndex > 0) {
+        *norm = cPvrSourceParam::sStandardNorm[standardIndex];
+        *LinesPerFrame = cPvrSourceParam::sStandardLinesPerFrame[standardIndex];
         }
-      if (NumArgs > 3) { /* only if optional arg norm or card given */
-        if      (!strcasecmp  (optArg2, "PAL"))        { *norm = V4L2_STD_PAL;       *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "NTSC" ))      { *norm = V4L2_STD_NTSC;      *LinesPerFrame = 525; }
-        else if (!strcasecmp  (optArg2, "SECAM"))      { *norm = V4L2_STD_SECAM;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "NTSC_M"))     { *norm = V4L2_STD_NTSC_M;    *LinesPerFrame = 525; }
-        else if (!strcasecmp  (optArg2, "NTSC_M_JP"))  { *norm = V4L2_STD_NTSC_M_JP; *LinesPerFrame = 525; }
-        else if (!strcasecmp  (optArg2, "NTSC_443"))   { *norm = V4L2_STD_NTSC_443;  *LinesPerFrame = 525; }
-        else if (!strcasecmp  (optArg2, "NTSC_M_KR"))  { *norm = V4L2_STD_NTSC_M_KR; *LinesPerFrame = 525; }
-        else if (!strcasecmp  (optArg2, "PAL_M"))      { *norm = V4L2_STD_PAL_M;     *LinesPerFrame = 525; }
-        else if (!strcasecmp  (optArg2, "PAL_N"))      { *norm = V4L2_STD_PAL_N;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "PAL_NC"))     { *norm = V4L2_STD_PAL_Nc;    *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "PAL_B"))      { *norm = V4L2_STD_PAL_B;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "PAL_B1"))     { *norm = V4L2_STD_PAL_B1;    *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "PAL_G"))      { *norm = V4L2_STD_PAL_G;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "PAL_BG"))     { *norm = V4L2_STD_PAL_BG;    *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "PAL_D"))      { *norm = V4L2_STD_PAL_D;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "PAL_D1"))     { *norm = V4L2_STD_PAL_D1;    *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "PAL_K"))      { *norm = V4L2_STD_PAL_K;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "PAL_DK"))     { *norm = V4L2_STD_PAL_DK;    *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "PAL_H"))      { *norm = V4L2_STD_PAL_H;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "PAL_I"))      { *norm = V4L2_STD_PAL_I;     *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "PAL_60"))     { *norm = V4L2_STD_PAL_60;    *LinesPerFrame = 525; }
-        else if (!strcasecmp  (optArg2, "SECAM_B"))    { *norm = V4L2_STD_SECAM_B;   *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "SECAM_D"))    { *norm = V4L2_STD_SECAM_D;   *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "SECAM_G"))    { *norm = V4L2_STD_SECAM_G;   *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "SECAM_H"))    { *norm = V4L2_STD_SECAM_H;   *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "SECAM_K"))    { *norm = V4L2_STD_SECAM_K;   *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "SECAM_K1"))   { *norm = V4L2_STD_SECAM_K1;  *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "SECAM_DK"))   { *norm = V4L2_STD_SECAM_DK;  *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "SECAM_L"))    { *norm = V4L2_STD_SECAM_L;   *LinesPerFrame = 625; }
-        else if (!strcasecmp  (optArg2, "SECAM_LC"))   { *norm = V4L2_STD_SECAM_LC;  *LinesPerFrame = 625; }
-        if      (!strcasecmp  (optArg2, "CARD0"))      *card = 0;
-        else if (!strcasecmp  (optArg2, "CARD1"))      *card = 1;
-        else if (!strcasecmp  (optArg2, "CARD2"))      *card = 2;
-        else if (!strcasecmp  (optArg2, "CARD3"))      *card = 3;
-        else if (!strcasecmp  (optArg2, "CARD4"))      *card = 4;
-        else if (!strcasecmp  (optArg2, "CARD5"))      *card = 5;
-        else if (!strcasecmp  (optArg2, "CARD6"))      *card = 6;
-        else if (!strcasecmp  (optArg2, "CARD7"))      *card = 7;
-        }
-      log(pvrDEBUG2, "ParseChannel %s input %d, norm=0x%08llx, card %d",
-          (*inputType == eRadio) ? "Radio" : (*inputType == eTelevision) ? "TV" : "Ext", *input, *norm, *card);
-      return true;
-      }
-    }
+     if (cardIndex > 0)
+        *card = cardIndex - 1;
+
+     log(pvrDEBUG2, "ParseChannel %s input %d, norm=0x%08llx, card %d",
+         (*inputType == eRadio) ? "Radio" : (*inputType == eTelevision) ? "TV" : "Ext", *input, *norm, *card);
+     return true;
+     }
   return false;
 }
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 33bd23b..7aae48f 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pvrinput\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:29+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -16,15 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -192,3 +183,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 2be10cd..5542168 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs_CZ\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:36+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -193,3 +184,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/po/da_DK.po b/po/da_DK.po
index 3e5bcf4..8fd2d1b 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pvrinput\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:33+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -16,15 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -192,3 +183,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index 9ba433c..4f1ba2d 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de_DE\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2009-10-11 22:39+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -19,15 +19,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr "Eingang"
-
-msgid "SourceParam.pvrinput$Card"
-msgstr "Karte"
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr "Standard"
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr "pvrinput unterstützt alte Kanalsyntax nicht mehr!"
 
@@ -196,6 +187,15 @@ msgstr "PVR Bildeinstellungen "
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr "Kein analog empfangener Sender!"
 
+msgid "SourceParam.pvrinput$Input"
+msgstr "Eingang"
+
+msgid "SourceParam.pvrinput$Card"
+msgstr "Karte"
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr "Standard"
+
 #~ msgid "Setup.pvrinput$PVRUSB2 Stop on Change"
 #~ msgstr "PVRUSB2 Stop bei Kanalwechsel"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 3e5bcf4..8fd2d1b 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pvrinput\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:33+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -16,15 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -192,3 +183,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index 807cbab..0bcc09a 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es_ES\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:37+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -193,3 +184,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/po/et_EE.po b/po/et_EE.po
index 46c1f25..970ff21 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: et_EE\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:37+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -193,3 +184,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 2dbd747..93f8001 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fi_FI\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:37+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -193,3 +184,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 1384019..1fb9101 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr_FR\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:38+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -17,15 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -193,3 +184,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/po/hr_HR.po b/po/hr_HR.po
index ee1c4ee..ca6f03e 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pvrinput\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:38+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -16,15 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -192,3 +183,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 9bcd226..320010e 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pvrinput\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:39+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -16,15 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -192,3 +183,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index c94de67..0e5f5ea 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it_IT\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2009-10-11 22:40+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -17,18 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#, fuzzy
-msgid "SourceParam.pvrinput$Input"
-msgstr "Input"
-
-#, fuzzy
-msgid "SourceParam.pvrinput$Card"
-msgstr "Card"
-
-#, fuzzy
-msgid "SourceParam.pvrinput$Standard"
-msgstr "Standard"
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr "Sintassi vecchi canali non supportata"
 
@@ -204,6 +192,18 @@ msgstr "Impostazioni immagine PVR"
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr "Non è un canale analogico!"
 
+#, fuzzy
+msgid "SourceParam.pvrinput$Input"
+msgstr "Input"
+
+#, fuzzy
+msgid "SourceParam.pvrinput$Card"
+msgstr "Card"
+
+#, fuzzy
+msgid "SourceParam.pvrinput$Standard"
+msgstr "Standard"
+
 #~ msgid "Setup.pvrinput$PVRUSB2 Stop on Change"
 #~ msgstr "Ferma PVRUSB2 al cambio"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 9bcd226..320010e 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pvrinput\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:39+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -16,15 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -192,3 +183,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 9bcd226..320010e 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pvrinput\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:39+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -16,15 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -192,3 +183,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 1dcbdf4..c90a1ae 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pvrinput\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:40+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -16,15 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -192,3 +183,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 1dcbdf4..c90a1ae 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pvrinput\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:40+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -16,15 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -192,3 +183,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/po/ro_RO.po b/po/ro_RO.po
index b0946e0..77f02ed 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro_RO\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2009-06-02 22:59+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -21,15 +21,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -208,6 +199,15 @@ msgstr "Reglaje imagine PVR"
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr "Canalul nu este receptionat cu placa PVR!"
 
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Setup.pvrinput$PVRUSB2 Stop on Change"
 #~ msgstr "2D sym inseparabil"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 1dcbdf4..c90a1ae 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pvrinput\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:40+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -16,15 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -192,3 +183,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 1dcbdf4..c90a1ae 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pvrinput\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-03-07 11:36+0100\n"
+"POT-Creation-Date: 2010-03-21 21:18+0100\n"
 "PO-Revision-Date: 2008-05-24 13:40+0200\n"
 "Last-Translator: root\n"
 "Language-Team:  <de@li.org>\n"
@@ -16,15 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-msgid "SourceParam.pvrinput$Input"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Card"
-msgstr ""
-
-msgid "SourceParam.pvrinput$Standard"
-msgstr ""
-
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr ""
 
@@ -192,3 +183,12 @@ msgstr ""
 
 msgid "Setup.pvrinput$Not on an analogue channel!"
 msgstr ""
+
+msgid "SourceParam.pvrinput$Input"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Card"
+msgstr ""
+
+msgid "SourceParam.pvrinput$Standard"
+msgstr ""
diff --git a/sourceparams.c b/sourceparams.c
new file mode 100644
index 0000000..9410dd3
--- /dev/null
+++ b/sourceparams.c
@@ -0,0 +1,257 @@
+#include "common.h"
+
+#ifdef PVR_SOURCEPARAMS
+const char *cPvrSourceParam::sPluginId = "";
+#else
+const char *cPvrSourceParam::sPluginId = "PVRINPUT|";
+#endif
+
+const char *cPvrSourceParam::sInputName[] = {
+ "TV",
+ "RADIO",
+ "COMPOSITE0",
+ "COMPOSITE1",
+ "COMPOSITE2",
+ "COMPOSITE3",
+ "COMPOSITE4",
+ "SVIDEO0",
+ "SVIDEO1",
+ "SVIDEO2",
+ "SVIDEO3",
+ "COMPONENT"
+};
+
+const eInputType cPvrSourceParam::sInputType[] = {
+ eTelevision,
+ eRadio,
+ eComposite0,
+ eComposite1,
+ eComposite2,
+ eComposite3,
+ eComposite4,
+ eSVideo0,
+ eSVideo1,
+ eSVideo2,
+ eSVideo3,
+ eComponent
+};
+
+const char *cPvrSourceParam::sCards[] = {
+ "",
+ "CARD0",
+ "CARD1",
+ "CARD2",
+ "CARD3",
+ "CARD4",
+ "CARD5",
+ "CARD6",
+ "CARD7"
+};
+
+const char *cPvrSourceParam::sStandardName[] = {
+  "",
+  "PAL",
+  "NTSC",
+  "SECAM",
+  "NTSC_M",
+  "NTSC_M_JP",
+  "NTSC_443",
+  "NTSC_M_KR",
+  "PAL_M",
+  "PAL_N",
+  "PAL_NC",
+  "PAL_B",
+  "PAL_B1",
+  "PAL_G",
+  "PAL_BG",
+  "PAL_D",
+  "PAL_D1",
+  "PAL_K",
+  "PAL_DK",
+  "PAL_H",
+  "PAL_I",
+  "PAL_60",
+  "SECAM_B",
+  "SECAM_D",
+  "SECAM_G",
+  "SECAM_H",
+  "SECAM_K",
+  "SECAM_K1",
+  "SECAM_DK",
+  "SECAM_L",
+  "SECAM_LC"
+};
+
+const uint64_t cPvrSourceParam::sStandardNorm[] = {
+  0,
+  V4L2_STD_PAL,
+  V4L2_STD_NTSC,
+  V4L2_STD_SECAM,
+  V4L2_STD_NTSC_M,
+  V4L2_STD_NTSC_M_JP,
+  V4L2_STD_NTSC_443,
+  V4L2_STD_NTSC_M_KR,
+  V4L2_STD_PAL_M,
+  V4L2_STD_PAL_N,
+  V4L2_STD_PAL_Nc,
+  V4L2_STD_PAL_B,
+  V4L2_STD_PAL_B1,
+  V4L2_STD_PAL_G,
+  V4L2_STD_PAL_BG,
+  V4L2_STD_PAL_D,
+  V4L2_STD_PAL_D1,
+  V4L2_STD_PAL_K,
+  V4L2_STD_PAL_DK,
+  V4L2_STD_PAL_H,
+  V4L2_STD_PAL_I,
+  V4L2_STD_PAL_60,
+  V4L2_STD_SECAM_B,
+  V4L2_STD_SECAM_D,
+  V4L2_STD_SECAM_G,
+  V4L2_STD_SECAM_H,
+  V4L2_STD_SECAM_K,
+  V4L2_STD_SECAM_K1,
+  V4L2_STD_SECAM_DK,
+  V4L2_STD_SECAM_L,
+  V4L2_STD_SECAM_LC
+};
+
+const int cPvrSourceParam::sStandardLinesPerFrame[] = {
+  -1,
+  625,
+  525,
+  625,
+  525,
+  525,
+  525,
+  525,
+  525,
+  625,
+  625,
+  625,
+  625,
+  625,
+  625,
+  625,
+  625,
+  625,
+  625,
+  625,
+  625,
+  525,
+  625,
+  625,
+  625,
+  625,
+  625,
+  625,
+  625,
+  625,
+  625
+};
+
+cPvrSourceParam::cPvrSourceParam()
+#ifdef PVR_SOURCEPARAMS
+:cSourceParam(sSourceID, "analog (pvrinput)")
+#endif
+{
+  param = 0;
+  input = 0;
+  standard = 0;
+  card = 0;
+}
+
+cString cPvrSourceParam::ParametersToString(void) const
+{
+  if ((standard == 0) && (card == 0))
+     return cString::sprintf("%s%s", sPluginId, sInputName[input]);
+  if ((standard == 0) && (card != 0))
+     return cString::sprintf("%s%s|%s", sPluginId, sInputName[input], sCards[card]);
+  if ((standard != 0) && (card == 0))
+     return cString::sprintf("%s%s|%s", sPluginId, sInputName[input], sStandardName[standard]);
+  return cString::sprintf("%s%s|%s|%s", sPluginId, sInputName[input], sCards[card], sStandardName[standard]);
+}
+
+void cPvrSourceParam::SetData(cChannel *Channel)
+{
+#ifdef PVR_SOURCEPARAMS
+  ParseParameters(Channel->Parameters(), &input, &standard, &card);
+#endif
+  param = 0;
+}
+
+void cPvrSourceParam::GetData(cChannel *Channel)
+{
+#ifdef PVR_SOURCEPARAMS
+  Channel->SetTransponderData(Channel->Source(), Channel->Frequency(), Channel->Srate(), ParametersToString(), true);
+#endif
+}
+
+cOsdItem *cPvrSourceParam::GetOsdItem(void)
+{
+  switch (param++) {
+    case 0: return new cMenuEditStraItem(tr("SourceParam.pvrinput$Input"), &input, sNumInputs, sInputName);
+    case 1: return new cMenuEditStraItem(tr("SourceParam.pvrinput$Card"), &card, sNumCards, sCards);
+    case 2: return new cMenuEditStraItem(tr("SourceParam.pvrinput$Standard"), &standard, sNumStandards, sStandardName);
+    default: return NULL;
+  }
+  return NULL;
+}
+
+bool cPvrSourceParam::IsPvr(int Code)
+{
+  return (Code & cSource::st_Mask) == stPvr;
+}
+
+bool    cPvrSourceParam::ParseParameters(const char *Parameters, int *InputIndex, int *StandardIndex, int *CardIndex)
+{
+  char *InputArg  = NULL;
+  char *OptArg[2] = { NULL, NULL };
+#ifdef PVR_SOURCEPARAMS
+  sscanf(Parameters, "%a[^|]|%a[^|]|%a[^:\n]", &InputArg, &OptArg[0], &OptArg[1]);
+#else
+  char *PluginId  = NULL;
+  sscanf(Parameters, "%a[^|]|%a[^|]|%a[^|]|%a[^:\n]", &PluginId, &InputArg, &OptArg[0], &OptArg[1]);
+  if (strcasecmp(PluginId, "PVRINPUT"))
+     return false;
+#endif
+  if (InputIndex) {
+     *InputIndex = 0;
+     if (InputArg != NULL) {
+        for (int i = 0; i < sNumInputs; i++) {
+            if (!strcasecmp(InputArg, sInputName[i])) {
+               *InputIndex = i;
+               break;
+               }
+            }
+        }
+     }
+  if (CardIndex)
+     *CardIndex = 0;
+  if (StandardIndex)
+     *StandardIndex = 0;
+  for (int opt = 0; opt < 2; opt++) {
+      if (OptArg[opt] != NULL) {
+         bool parsed = false;
+         for (int c = 1; c < sNumCards; c++) {
+             if (!strcasecmp(OptArg[opt], sCards[c])) {
+                if (CardIndex)
+                   *CardIndex = c;
+                parsed = true;
+                break;
+                }
+             }
+         if (!parsed) {
+            for (int s = 1; s < sNumStandards; s++) {
+                if (!strcasecmp(OptArg[opt], sStandardName[s])) {
+                   if (StandardIndex)
+                      *StandardIndex = s;
+                   break;
+                   }
+                }
+            }
+         }
+      }
+  return true;
+}
+
diff --git a/sourceparams.h b/sourceparams.h
new file mode 100644
index 0000000..bdf70d1
--- /dev/null
+++ b/sourceparams.h
@@ -0,0 +1,50 @@
+#ifndef _PVRINPUT_SOURCEPARAMS_H
+#define _PVRINPUT_SOURCEPARAMS_H
+
+#include "common.h"
+
+class cPvrSourceParam
+#ifdef __SOURCEPARAMS_H
+ : public cSourceParam
+#endif
+{
+private:
+  int param;
+  int input;
+  int standard;
+  int card;
+
+public:
+  cPvrSourceParam();
+  cString ParametersToString(void) const;
+  virtual void SetData(cChannel *Channel);
+  virtual void GetData(cChannel *Channel);
+  virtual cOsdItem *GetOsdItem(void);
+
+  static bool IsPvr(int Code);
+  static bool ParseParameters(const char *Parameters, int *InputIndex, int *StandardIndex, int *CardIndex);
+
+#ifdef PVR_SOURCEPARAMS
+  static const char *sPluginId;
+  static const char  sSourceID = 'V';
+#else
+  static const char *sPluginId;
+  static const char  sSourceID = 'P';
+#endif
+  static const uint  stPvr = (sSourceID << 24);
+
+  static const int         sNumInputs = 12;
+  static const char       *sInputName[];
+  static const eInputType  sInputType[];
+
+  static const int   sNumCards = 9;
+  static const char *sCards[];
+
+  static const int       sNumStandards = 31;
+  static const char     *sStandardName[];
+  static const uint64_t  sStandardNorm[];
+  static const int       sStandardLinesPerFrame[];
+};
+
+#endif
+