Updated the APIVERSNUM requirement.

Updated the copyright year.
Merge pull request #1 from varaslt/master
2023-10-10 11:36:53 +00:00 · 2015-02-20 20:39:32 +02:00 · 2015-02-15 19:11:30 +02:00 · 2015-02-12 23:49:06 +02:00 · 2015-02-12 23:48:51 +02:00 · 2015-02-08 23:27:16 +02:00
19 changed files with 224 additions and 552 deletions
--- a/31
+++ b/31
@@ -488,3 +488,34 @@ VDR Plugin 'femon' Revision History
 2014-03-08: Version 2.0.3

 - Added support for SAT>IP devices.
+
+2014-03-15: Version 2.0.4
+
+- Refactored the SAT>IP support.
+
+
+===================================
+VDR Plugin 'femon' Revision History
+===================================
+
+2014-03-16: Version 2.1.0
+
+- Updated for vdr-2.1.6.
+
+2014-05-10: Version 2.1.1
+
+- Fixed the channel frequency value.
+
+2015-01-10: Version 2.1.2
+
+
+===================================
+VDR Plugin 'femon' Revision History
+===================================
+
+2015-02-19: Version 2.2.0
+
+- Updated for vdr-2.2.0.
+- Updated CA definitions.
+- Fixed the SVDRP service IP menu item (Thanks to Toerless Eckert).
+- Fixed the detaching of receiver during a channel switch.
--- a/femon.c
+++ b/femon.c
@@ -14,15 +14,15 @@
 #include "femonservice.h"
 #include "femontools.h"

-#if defined(APIVERSNUM) && APIVERSNUM < 20000
-#error "VDR-2.0.0 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 20200
+#error "VDR-2.2.0 API version or greater is required!"
 #endif

 #ifndef GITVERSION
 #define GITVERSION ""
 #endif

-static const char VERSION[]       = "2.0.3" GITVERSION;
+static const char VERSION[]       = "2.2.0" GITVERSION;
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");

@@ -371,7 +371,7 @@ void cMenuFemonSetup::Setup(void)
     Add(new cMenuEditIntItem(tr("SVDRP service port"), &data.svdrpport, 1, 65535));
     help.Append(tr("Define the port number of SVDRP service."));

-     Add(new cMenuEditStrItem(tr("SVDRP service IP"), data.svdrpip, MaxSvdrpIp, ".1234567890"));
+     Add(new cMenuEditStrItem(tr("SVDRP service IP"), data.svdrpip, sizeof(data.svdrpip), ".1234567890"));
     help.Append(tr("Define the IP address of SVDRP service."));
     }

--- a/femonosd.c
+++ b/femonosd.c
@@ -24,7 +24,7 @@
 #define OSDWIDTH                  m_OsdWidth              // in pixels
 #define OSDHEIGHT                 m_OsdHeight             // in pixels
 #define OSDROWHEIGHT              m_Font->Height()        // in pixels
-#define OSDINFOHEIGHT             (OSDROWHEIGHT * 13)     // in pixels (13 rows)
+#define OSDINFOHEIGHT             (OSDROWHEIGHT * 14)     // in pixels (14 rows)
 #define OSDSTATUSHEIGHT           (OSDROWHEIGHT * 6)      // in pixels (6 rows)
 #define OSDSYMBOL(id)             femonSymbols.Get(id)
 #define OSDSPACING                femonSymbols.GetSpacing()
@@ -436,6 +436,8 @@ void cFemonOsd::DrawInfoWindow(void)
                   OSDDRAWINFOLEFT( trVDR("System"),       *getSatelliteSystem(dtp.System()));
                   if (dtp.System()) {
                      OSDDRAWINFORIGHT(trVDR("RollOff"),   *getRollOff(dtp.RollOff()));
+                      offset += OSDROWHEIGHT;
+                      OSDDRAWINFOLEFT( trVDR("Pilot"),     *getPilot(dtp.Pilot()));
                      }
                   }
                   break;
@@ -474,53 +476,9 @@ void cFemonOsd::DrawInfoWindow(void)
                   OSDDRAWINFOLEFT( trVDR("System"),       *getTerrestrialSystem(dtp.System()));
                   if (dtp.System()) {
                      OSDDRAWINFORIGHT(trVDR("StreamId"),  *cString::sprintf("%d", dtp.StreamId()));
-                      }
-                   }
-                   break;
-
-              case stSatipSat: {
-                   cDvbTransponderParameters dtp(channel->Parameters());
-                   cSatipTransponderParameters stp(channel->Parameters());
-                   OSDDRAWINFOLINE(*cString::sprintf("SAT>IP %s #%d - %s", *getSatelliteSystem(dtp.System()), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), *m_FrontendName));
-                   offset += OSDROWHEIGHT;
-                   OSDDRAWINFOLEFT( trVDR("Frequency"),    *getFrequencyMHz(channel->Frequency()));
-                   OSDDRAWINFORIGHT(trVDR("Modulation"),   *getModulation(dtp.Modulation()));
-                   offset += OSDROWHEIGHT;
-                   OSDDRAWINFOLEFT( trVDR("Srate"),        *cString::sprintf("%d", channel->Srate()));
-                   OSDDRAWINFORIGHT(trVDR("Polarization"), *cString::sprintf("%c", toupper(dtp.Polarization())));
-                   offset += OSDROWHEIGHT;
-                   OSDDRAWINFOLEFT(    tr("Coderate"),     *getCoderate(dtp.CoderateH()));
-                   OSDDRAWINFORIGHT(   tr("SignalSource"), *stp.SignalSource());
-                   offset += OSDROWHEIGHT;
-                   OSDDRAWINFOLEFT( trVDR("System"),       *getSatelliteSystem(dtp.System()));
-                   if (dtp.System()) {
-                      OSDDRAWINFORIGHT(tr("PilotTones"),   *stp.PilotTones());
                      offset += OSDROWHEIGHT;
-                      OSDDRAWINFOLEFT(trVDR("RollOff"),    *getRollOff(dtp.RollOff()));
-                      }
-                   }
-                   break;
-
-              case stSatipTerr: {
-                   cDvbTransponderParameters dtp(channel->Parameters());
-                   cSatipTransponderParameters stp(channel->Parameters());
-                   OSDDRAWINFOLINE(*cString::sprintf("SAT>IP %s #%d - %s", *getTerrestrialSystem(dtp.System()), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), *m_FrontendName));
-                   offset += OSDROWHEIGHT;
-                   OSDDRAWINFOLEFT( trVDR("Frequency"),    *getFrequencyMHz(channel->Frequency()));
-                   OSDDRAWINFORIGHT(trVDR("Transmission"), *getTransmission(dtp.Transmission()));
-                   offset += OSDROWHEIGHT;
-                   OSDDRAWINFOLEFT( trVDR("Bandwidth"),    *getBandwidth(dtp.Bandwidth()));
-                   OSDDRAWINFORIGHT(trVDR("Modulation"),   *getModulation(dtp.Modulation()));
-                   offset += OSDROWHEIGHT;
-                   OSDDRAWINFOLEFT( trVDR("Guard"),        *getGuard(dtp.Guard()));
-                   OSDDRAWINFORIGHT(tr   ("Coderate"),     *getCoderate(dtp.CoderateH()));
-                   offset += OSDROWHEIGHT;
-                   OSDDRAWINFOLEFT( trVDR("System"),       *getTerrestrialSystem(dtp.System()));
-                   if (dtp.System()) {
-                      OSDDRAWINFORIGHT(trVDR("StreamId"),  *cString::sprintf("%d", dtp.StreamId()));
-                      offset += OSDROWHEIGHT;
-                      OSDDRAWINFOLEFT( tr("T2SystemId"),   stp.T2SystemId());
-                      OSDDRAWINFORIGHT(tr("SISO/MISO"),    stp.SisoMiso());
+                      OSDDRAWINFOLEFT( trVDR("T2SystemId"),*cString::sprintf("%d", dtp.T2SystemId()));
+                      OSDDRAWINFORIGHT(trVDR("SISO/MISO"), *cString::sprintf("%d", dtp.SisoMiso()));
                      }
                   }
                   break;
@@ -641,23 +599,6 @@ void cFemonOsd::Action(void)
           m_UNC = 0;
           m_UNCValid = false;
           break;
-      case DEVICESOURCE_SATIP:
-           m_Quality = cDevice::ActualDevice()->SignalQuality();
-           m_QualityValid = (m_Quality >= 0);
-           m_Strength = cDevice::ActualDevice()->SignalStrength();
-           m_StrengthValid = (m_Strength >= 0);
-           m_FrontendName = cDevice::ActualDevice()->DeviceName();
-           m_FrontendStatus = (fe_status_t)(cDevice::ActualDevice()->HasLock() ? (FE_HAS_LOCK | FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC) : 0);
-           m_FrontendStatusValid = m_StrengthValid;
-           m_Signal = uint16_t(m_Strength * 0xFFFF / 100);
-           m_SignalValid = m_StrengthValid;
-           m_SNR = uint16_t(m_Quality * 0xFFFF / 100);
-           m_SNRValid = m_QualityValid;
-           m_BER = 0;
-           m_BERValid = false;
-           m_UNC = 0;
-           m_UNCValid = false;
-           break;
      case DEVICESOURCE_IPTV:
           m_Quality = cDevice::ActualDevice()->SignalQuality();
           m_QualityValid = (m_Quality >= 0);
@@ -689,6 +630,23 @@ void cFemonOsd::Action(void)
              m_BERValid = (ioctl(m_Frontend, FE_READ_BER, &m_BER) >= 0);
              m_UNCValid = (ioctl(m_Frontend, FE_READ_UNCORRECTED_BLOCKS, &m_UNC) >= 0);
              }
+           else if (strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) {
+              m_Quality = cDevice::ActualDevice()->SignalQuality();
+              m_QualityValid = (m_Quality >= 0);
+              m_Strength = cDevice::ActualDevice()->SignalStrength();
+              m_StrengthValid = (m_Strength >= 0);
+              m_FrontendName = cDevice::ActualDevice()->DeviceName();
+              m_FrontendStatus = (fe_status_t)(cDevice::ActualDevice()->HasLock() ? (FE_HAS_LOCK | FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC) : 0);
+              m_FrontendStatusValid = m_StrengthValid;
+              m_Signal = uint16_t(m_Strength * 0xFFFF / 100);
+              m_SignalValid = m_StrengthValid;
+              m_SNR = uint16_t(m_Quality * 0xFFFF / 100);
+              m_SNRValid = m_QualityValid;
+              m_BER = 0;
+              m_BERValid = false;
+              m_UNC = 0;
+              m_UNCValid = false;
+              }
           else if (m_SvdrpConnection.handle >= 0) {
              cmd.handle = m_SvdrpConnection.handle;
              m_SvdrpPlugin->Service("SvdrpCommand-v1.0", &cmd);
@@ -760,35 +718,35 @@ void cFemonOsd::Show(void)

  m_DeviceSource = DEVICESOURCE_DVBAPI;
  if (channel) {
-     if (channel->IsSourceType('Y') || channel->IsSourceType('Z'))
-        m_DeviceSource = DEVICESOURCE_SATIP;
-     else if (channel->IsSourceType('I'))
+     if (channel->IsSourceType('I'))
        m_DeviceSource = DEVICESOURCE_IPTV;
     else if (channel->IsSourceType('V'))
        m_DeviceSource = DEVICESOURCE_PVRINPUT;
     }

  if (m_DeviceSource == DEVICESOURCE_DVBAPI) {
-     cDvbDevice *dev = getDvbDevice(cDevice::ActualDevice());
-     m_Frontend = dev ? open(*cString::sprintf(FRONTEND_DEVICE, dev->Adapter(), dev->Frontend()), O_RDONLY | O_NONBLOCK) : -1;
-     if (m_Frontend >= 0) {
-        if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0) {
-           if (!femonConfig.usesvdrp)
-              error("cFemonOsd::Show() cannot read frontend info.");
-           close(m_Frontend);
-           m_Frontend = -1;
-           memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
+     if (!strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) {
+        cDvbDevice *dev = getDvbDevice(cDevice::ActualDevice());
+        m_Frontend = dev ? open(*cString::sprintf(FRONTEND_DEVICE, dev->Adapter(), dev->Frontend()), O_RDONLY | O_NONBLOCK) : -1;
+        if (m_Frontend >= 0) {
+           if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0) {
+              if (!femonConfig.usesvdrp)
+                 error("cFemonOsd::Show() cannot read frontend info.");
+              close(m_Frontend);
+              m_Frontend = -1;
+              memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
+              return;
+              }
+           }
+        else if (femonConfig.usesvdrp) {
+           if (!SvdrpConnect() || !SvdrpTune())
+              return;
+           }
+        else {
+           error("cFemonOsd::Show() cannot open frontend device.");
           return;
           }
        }
-     else if (femonConfig.usesvdrp) {
-        if (!SvdrpConnect() || !SvdrpTune())
-           return;
-        }
-     else {
-        error("cFemonOsd::Show() cannot open frontend device.");
-        return;
-        }
     }
  else
     m_Frontend = -1;
@@ -826,54 +784,60 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber, bool li
  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
  const cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());

-  if (!liveView || !channelNumber || !channel || channel->Number() != channelNumber)
+  if (!device || !liveView)
     return;

-  m_DeviceSource = DEVICESOURCE_DVBAPI;
-  if (channel) {
-     if (channel->IsSourceType('Y') || channel->IsSourceType('Z'))
-        m_DeviceSource = DEVICESOURCE_SATIP;
-     else if (channel->IsSourceType('I'))
+  if (!channelNumber) {
+     if (m_Receiver) {
+        m_Receiver->Deactivate();
+        DELETENULL(m_Receiver);
+        }
+     return;
+     }
+
+  if (channel && femonConfig.analyzestream) {
+     m_DeviceSource = DEVICESOURCE_DVBAPI;
+     if (channel->IsSourceType('I'))
        m_DeviceSource = DEVICESOURCE_IPTV;
     else if (channel->IsSourceType('V'))
        m_DeviceSource = DEVICESOURCE_PVRINPUT;
-     }

-  if (m_Frontend >= 0) {
-     close(m_Frontend);
-     m_Frontend = -1;
-     }
-
-  if (m_DeviceSource == DEVICESOURCE_DVBAPI) {
-     cDvbDevice *dev = getDvbDevice(cDevice::ActualDevice());
-     m_Frontend = dev ? open(*cString::sprintf(FRONTEND_DEVICE, dev->Adapter(), dev->Frontend()), O_RDONLY | O_NONBLOCK) : -1;
     if (m_Frontend >= 0) {
-        if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0) {
-           if (!femonConfig.usesvdrp)
-              error("cFemonOsd::ChannelSwitch() cannot read frontend info.");
-           close(m_Frontend);
-           m_Frontend = -1;
-           memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
-           return;
-           }
+        close(m_Frontend);
+        m_Frontend = -1;
        }
-     else if (femonConfig.usesvdrp) {
-        if (!SvdrpConnect() || !SvdrpTune())
-           return;
-        }
-     else {
-        error("cFemonOsd::ChannelSwitch() cannot open frontend device.");
-        return;
-        }
-     }

-  if (m_Receiver) {
-     m_Receiver->Deactivate();
-     DELETENULL(m_Receiver);
-     }
-  if (femonConfig.analyzestream && channel) {
-     m_Receiver = new cFemonReceiver(channel, IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0, IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0);
-     cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+     if (m_DeviceSource == DEVICESOURCE_DVBAPI) {
+        if (!strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) {
+           cDvbDevice *dev = getDvbDevice(cDevice::ActualDevice());
+           m_Frontend = dev ? open(*cString::sprintf(FRONTEND_DEVICE, dev->Adapter(), dev->Frontend()), O_RDONLY | O_NONBLOCK) : -1;
+           if (m_Frontend >= 0) {
+              if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0) {
+                 if (!femonConfig.usesvdrp)
+                    error("cFemonOsd::ChannelSwitch() cannot read frontend info.");
+                 close(m_Frontend);
+                 m_Frontend = -1;
+                 memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
+                 return;
+                 }
+              }
+           else if (femonConfig.usesvdrp) {
+              if (!SvdrpConnect() || !SvdrpTune())
+                 return;
+              }
+           else {
+              error("cFemonOsd::ChannelSwitch() cannot open frontend device.");
+              return;
+              }
+           }
+
+        if (m_Receiver) {
+           m_Receiver->Deactivate();
+           DELETENULL(m_Receiver);
+           }
+        m_Receiver = new cFemonReceiver(channel, IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0, IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0);
+        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+        }
     }
 }

@@ -957,7 +921,6 @@ bool cFemonOsd::DeviceSwitch(int direction)
                }
            // Do the actual switch if valid device found
            if (d && ValidDevice) {
-               cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0, true);
               cControl::Shutdown();
               if (NeedsDetachAllReceivers)
                  d->DetachAllReceivers();
@@ -972,11 +935,8 @@ bool cFemonOsd::DeviceSwitch(int direction)
                  }
               else if (d->CamSlot() && !d->CamSlot()->IsDecrypting())
                  d->CamSlot()->Assign(NULL);
-               d->SwitchChannel(channel, true);
-               if (d == cDevice::PrimaryDevice())
-                  d->ForceTransferMode();
+               d->SwitchChannel(channel, false);
               cControl::Launch(new cTransferControl(d, channel));
-               cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number(), true);
               return (true);
               }
            }
--- a/femonosd.h
+++ b/femonosd.h
@@ -26,7 +26,6 @@ class cFemonOsd : public cOsdObject, public cThread, public cStatus {
 private:
  enum eDeviceSourceType {
    DEVICESOURCE_DVBAPI = 0,
-    DEVICESOURCE_SATIP,
    DEVICESOURCE_IPTV,
    DEVICESOURCE_PVRINPUT,
    DEVICESOURCE_COUNT
--- a/femontools.c
+++ b/femontools.c
@@ -32,35 +32,48 @@ static cString getCA(int value)
    case 0x0464:            return cString::sprintf("EuroDec (%X)",          value); // EuroDec
    case 0x0500 ... 0x05FF: return cString::sprintf("Viaccess (%X)",         value); // France Telecom
    case 0x0600 ... 0x06FF: return cString::sprintf("Irdeto (%X)",           value); // Irdeto
-    case 0x0900 ... 0x09FF: return cString::sprintf("NDS Videoguard (%X)",   value); // News Datacom
+    case 0x0700 ... 0x07FF: return cString::sprintf("DigiCipher 2 (%X)",     value); // Jerrold/GI/Motorola 4DTV
+    case 0x0900 ... 0x09FF: return cString::sprintf("NDS Videoguard (%X)",   value); // NDS
    case 0x0B00 ... 0x0BFF: return cString::sprintf("Conax (%X)",            value); // Norwegian Telekom
-    case 0x0D00 ... 0x0DFF: return cString::sprintf("CryptoWorks (%X)",      value); // Philips
+    case 0x0D00 ... 0x0DFF: return cString::sprintf("CryptoWorks (%X)",      value); // Philips CryptoTec
    case 0x0E00 ... 0x0EFF: return cString::sprintf("PowerVu (%X)",          value); // Scientific Atlanta
    case 0x1000:            return cString::sprintf("RAS (%X)",              value); // Tandberg Television
    case 0x1200 ... 0x12FF: return cString::sprintf("NagraVision (%X)",      value); // BellVu Express
-    case 0x1700 ... 0x17FF: return cString::sprintf("BetaCrypt (%X)",        value); // BetaTechnik
+    case 0x1700 ... 0x17FF: return cString::sprintf("VCAS (%X)",             value); // Verimatrix Inc. former BetaTechnik
    case 0x1800 ... 0x18FF: return cString::sprintf("NagraVision (%X)",      value); // Kudelski SA
    case 0x22F0:            return cString::sprintf("Codicrypt (%X)",        value); // Scopus Network Technologies
    case 0x2600:            return cString::sprintf("BISS (%X)",             value); // European Broadcasting Union
+    case 0x2719:            return cString::sprintf("VanyaCas (%X)",         value); // S-Curious Research & Technology Pvt. Ltd.
    case 0x4347:            return cString::sprintf("CryptOn (%X)",          value); // CryptOn
    case 0x4800:            return cString::sprintf("Accessgate (%X)",       value); // Telemann
    case 0x4900:            return cString::sprintf("China Crypt (%X)",      value); // CryptoWorks
+    case 0x4A02:            return cString::sprintf("Tongfang (%X)",         value); // Tsinghua Tongfang Company
    case 0x4A10:            return cString::sprintf("EasyCas (%X)",          value); // EasyCas
    case 0x4A20:            return cString::sprintf("AlphaCrypt (%X)",       value); // AlphaCrypt
-    case 0x4A70:            return cString::sprintf("DreamCrypt (%X)",       value); // Dream Multimedia
    case 0x4A60:            return cString::sprintf("SkyCrypt (%X)",         value); // @Sky
    case 0x4A61:            return cString::sprintf("Neotioncrypt (%X)",     value); // Neotion
    case 0x4A62:            return cString::sprintf("SkyCrypt (%X)",         value); // @Sky
    case 0x4A63:            return cString::sprintf("Neotion SHL (%X)",      value); // Neotion
    case 0x4A64 ... 0x4A6F: return cString::sprintf("SkyCrypt (%X)",         value); // @Sky
-    case 0x4A80:            return cString::sprintf("ThalesCrypt (%X)",      value); // TPS
+    case 0x4A70:            return cString::sprintf("DreamCrypt (%X)",       value); // Dream Multimedia
+    case 0x4A80:            return cString::sprintf("ThalesCrypt (%X)",      value); // Thales Broadcast & Multimedia
    case 0x4AA1:            return cString::sprintf("KeyFly (%X)",           value); // SIDSA
-    case 0x4ABF:            return cString::sprintf("DG-Crypt (%X)",         value); // Beijing Compunicate Technology Inc.
+    case 0x4ABF:            return cString::sprintf("CTI-CAS (%X)",          value); // Beijing Compunicate Technology Inc.
+    case 0x4AC1:            return cString::sprintf("Latens (%X)",           value); // Latens Systems
    case 0x4AD0 ... 0x4AD1: return cString::sprintf("X-Crypt (%X)",          value); // XCrypt Inc.
    case 0x4AD4:            return cString::sprintf("OmniCrypt (%X)",        value); // Widevine Technologies, Inc.
-    case 0x4AE0:            return cString::sprintf("RossCrypt (%X)",        value); // Digi Raum Electronics Co. Ltd.
+    case 0x4AE0 ... 0x4AE1: return cString::sprintf("Z-Crypt (%X)",          value); // Digi Raum Electronics Co. Ltd.
+    case 0x4AE4:            return cString::sprintf("CoreCrypt (%X)",        value); // CoreTrust
+    case 0x4AE5:            return cString::sprintf("PRO-Crypt (%X)",        value); // IK SATPROF
+    case 0x4AEA:            return cString::sprintf("Cryptoguard (%X)",      value); // Gryptoguard AB
+    case 0x4AEB:            return cString::sprintf("Abel Quintic (%X)",     value); // Abel DRM Systems
+    case 0x4AF0:            return cString::sprintf("ABV (%X)",              value); // Alliance Broadcast Vision
    case 0x5500:            return cString::sprintf("Z-Crypt (%X)",          value); // Digi Raum Electronics Co. Ltd.
-    case 0x5501:            return cString::sprintf("Griffin (%X)",          value); // Griffin
+    case 0x5501:            return cString::sprintf("Griffin (%X)",          value); // Nucleus Systems Ltd.
+    case 0x5581:            return cString::sprintf("Bulcrypt (%X)",         value); // Bulcrypt
+    case 0x7BE1:            return cString::sprintf("DRE-Crypt (%X)",        value); // DRE-Crypt
+    case 0xA101:            return cString::sprintf("RosCrypt-M (%X)",       value); // NIIR
+    case 0xEAD0:            return cString::sprintf("VanyaCas (%X)",         value); // S-Curious Research & Technology Pvt. Ltd.
    default:                break;
    }
  return cString::sprintf("%X", value);
@@ -378,6 +391,11 @@ cString getRollOff(int value)
  return cString::sprintf("%s", getUserString(value, RollOffValues));
 }

+cString getPilot(int value)
+{
+  return cString::sprintf("%s", getUserString(value, PilotValues));
+}
+
 cString getResolution(int width, int height, int scan)
 {
  if ((width > 0) && (height > 0)) {
@@ -519,8 +537,9 @@ cString getAC3DialogLevel(int value)

 cString getFrequencyMHz(int value)
 {
-   while (value > 20000) value /= 1000;
-   return cString::sprintf("%d %s", value, tr("MHz"));
+  double freq = value;
+  while (freq > 20000.0) freq /= 1000.0;
+  return cString::sprintf("%s %s", *dtoa(freq, "%lg"), tr("MHz"));
 }

 cString getAudioSamplingFreq(int value)
@@ -591,90 +610,3 @@ void cFemonBitStream::SkipGolomb()

  SkipBits(n);
 }
-
-// --- cSatipTransponderParameters -------------------------------------------
-
-cSatipTransponderParameters::cSatipTransponderParameters(const char *parametersP)
-: t2SystemIdM(0),
-  sisoMisoM(999),
-  pilotTonesM(0),
-  signalSourceM(1)
-{
-  Parse(parametersP);
-}
-
-const char *cSatipTransponderParameters::ParseParameter(const char *strP, int &valueP)
-{
-  if (*++strP) {
-     char *p = NULL;
-     errno = 0;
-     int n = strtol(strP, &p, 10);
-     if (!errno && p != strP) {
-        valueP = n;
-        if (valueP >= 0)
-           return p;
-        }
-     }
-  error("invalid value for parameter '%c'", *(strP - 1));
-  return NULL;
-}
-
-bool cSatipTransponderParameters::Parse(const char *strP)
-{
-  while (strP && *strP) {
-        int ignoreThis;
-        switch (toupper(*strP)) {
-          case 'H':
-          case 'L':
-          case 'V':
-          case 'R': strP++; break;
-          case 'B':
-          case 'C':
-          case 'G':
-          case 'M':
-          case 'O':
-          case 'P':
-          case 'S':
-          case 'T':
-          case 'D':
-          case 'I':
-          case 'Y': strP = ParseParameter(strP, ignoreThis);    break;
-          case 'N': strP = ParseParameter(strP, pilotTonesM);   break;
-          case 'Q': strP = ParseParameter(strP, t2SystemIdM);   break;
-          case 'X': strP = ParseParameter(strP, sisoMisoM);     break;
-          case 'Z': strP = ParseParameter(strP, signalSourceM); break;
-          default: return false;
-          }
-        }
-  return true;
-}
-
-cString cSatipTransponderParameters::T2SystemId(void)
-{
-  return cString::sprintf("%d", t2SystemIdM);
-}
-
-cString cSatipTransponderParameters::SisoMiso(void)
-{
-  switch (sisoMisoM) {
-    case 0:  return tr("SISO");
-    case 1:  return tr("MISO");
-    default: return trVDR("auto");
-    }
-  return NULL;
-}
-
-cString cSatipTransponderParameters::PilotTones(void)
-{
-  switch (pilotTonesM) {
-    case 0:  return trVDR("off");
-    case 1:  return trVDR("on");
-    default: return trVDR("auto");
-    }
-  return NULL;
-}
-
-cString cSatipTransponderParameters::SignalSource(void)
-{
-  return cString::sprintf("%d", signalSourceM);
-}
--- a/femontools.h
+++ b/femontools.h
@@ -26,8 +26,7 @@

 #define FRONTEND_DEVICE "/dev/dvb/adapter%d/frontend%d"

-#define stSatipSat  ('Z' << 24)
-#define stSatipTerr ('Y' << 24)
+#define SATIP_DEVICE "SAT>IP"

 cDvbDevice *getDvbDevice(cDevice* device);

@@ -60,6 +59,7 @@ cString getModulation(int value);
 cString getTerrestrialSystem(int value);
 cString getSatelliteSystem(int value);
 cString getRollOff(int value);
+cString getPilot(int value);
 cString getResolution(int width, int height, int scan);
 cString getAspectRatio(int value);
 cString getVideoFormat(int value);
@@ -88,20 +88,4 @@ public:
  void           SkipSeGolomb() { SkipGolomb(); }
  };

-class cSatipTransponderParameters {
-private:
-  int t2SystemIdM;
-  int sisoMisoM;
-  int pilotTonesM;
-  int signalSourceM;
-  const char *ParseParameter(const char *strP, int &valueP);
-  bool Parse(const char *strP);
-public:
-  cSatipTransponderParameters(const char *parametersP = NULL);
-  cString T2SystemId(void);
-  cString SisoMiso(void);
-  cString PilotTones(void);
-  cString SignalSource(void);
-  };
-
 #endif // __FEMONTOOLS_H
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Peter Marquardt
 # Andreas Brachold
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.0.3\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Christian Wieninger\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
 "Language: de\n"
@@ -180,18 +180,6 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"

-msgid "SignalSource"
-msgstr "Signalquelle"
-
-msgid "PilotTones"
-msgstr "Pilottöne"
-
-msgid "T2SystemId"
-msgstr "T2-Systemkennung"
-
-msgid "SISO/MISO"
-msgstr "SISO/MISO"
-
 msgid "Protocol"
 msgstr ""

@@ -401,9 +389,3 @@ msgstr "Mbit/s"

 msgid "kbit/s"
 msgstr "kbit/s"
-
-msgid "SISO"
-msgstr ""
-
-msgid "MISO"
-msgstr ""
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Luis Palacios
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.0.3\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Luis Palacios\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
 "Language: es\n"
@@ -178,18 +178,6 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"

-msgid "SignalSource"
-msgstr ""
-
-msgid "PilotTones"
-msgstr ""
-
-msgid "T2SystemId"
-msgstr ""
-
-msgid "SISO/MISO"
-msgstr ""
-
 msgid "Protocol"
 msgstr ""

@@ -399,9 +387,3 @@ msgstr "Mbit/s"

 msgid "kbit/s"
 msgstr "kbit/s"
-
-msgid "SISO"
-msgstr ""
-
-msgid "MISO"
-msgstr ""
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Arthur Konovalov
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.0.3\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Arthur Konovalov\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
 "Language: et\n"
@@ -178,18 +178,6 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"

-msgid "SignalSource"
-msgstr ""
-
-msgid "PilotTones"
-msgstr ""
-
-msgid "T2SystemId"
-msgstr ""
-
-msgid "SISO/MISO"
-msgstr ""
-
 msgid "Protocol"
 msgstr ""

@@ -399,9 +387,3 @@ msgstr "Mbit/s"

 msgid "kbit/s"
 msgstr "kbit/s"
-
-msgid "SISO"
-msgstr ""
-
-msgid "MISO"
-msgstr ""
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Rolf Ahrenberg
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.0.3\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
 "Language: fi\n"
@@ -178,18 +178,6 @@ msgstr "Radio-ID"
 msgid "Coderate"
 msgstr "Suojaustaso"

-msgid "SignalSource"
-msgstr "Signaalilähde"
-
-msgid "PilotTones"
-msgstr "Pilottiäänet"
-
-msgid "T2SystemId"
-msgstr "T2-järjestelmä"
-
-msgid "SISO/MISO"
-msgstr "SISO/MISO"
-
 msgid "Protocol"
 msgstr "Protokolla"

@@ -399,9 +387,3 @@ msgstr "Mbit/s"

 msgid "kbit/s"
 msgstr "kbit/s"
-
-msgid "SISO"
-msgstr ""
-
-msgid "MISO"
-msgstr ""
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Nicolas Huillard
 # Michaël Nival <mnival@club-internet.fr>, 2010
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.0.3\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
 "Language: fr\n"
@@ -180,18 +180,6 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"

-msgid "SignalSource"
-msgstr ""
-
-msgid "PilotTones"
-msgstr ""
-
-msgid "T2SystemId"
-msgstr ""
-
-msgid "SISO/MISO"
-msgstr ""
-
 msgid "Protocol"
 msgstr "Protocole"

@@ -401,9 +389,3 @@ msgstr "Mbit/s"

 msgid "kbit/s"
 msgstr "kbit/s"
-
-msgid "SISO"
-msgstr ""
-
-msgid "MISO"
-msgstr ""
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # F<>ley Istv<74>n <ifuley at tigercomp dot ro>, 2011
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.0.3\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: F<>ley Istv<74>n <ifuley at tigercomp dot ro>\n"
 "Language-Team: Hungarian <ifuley at tigercomp dot ro>\n"
 "Language: hu\n"
@@ -181,18 +181,6 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"

-msgid "SignalSource"
-msgstr ""
-
-msgid "PilotTones"
-msgstr ""
-
-msgid "T2SystemId"
-msgstr ""
-
-msgid "SISO/MISO"
-msgstr ""
-
 msgid "Protocol"
 msgstr ""

@@ -402,9 +390,3 @@ msgstr "Mbit/s"

 msgid "kbit/s"
 msgstr "kbit/s"
-
-msgid "SISO"
-msgstr ""
-
-msgid "MISO"
-msgstr ""
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,15 +1,15 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Sean Carlos
 # Diego Pierotto <vdr-italian@tiscali.it>
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.0.3\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -182,18 +182,6 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"

-msgid "SignalSource"
-msgstr ""
-
-msgid "PilotTones"
-msgstr ""
-
-msgid "T2SystemId"
-msgstr ""
-
-msgid "SISO/MISO"
-msgstr ""
-
 msgid "Protocol"
 msgstr ""

@@ -403,9 +391,3 @@ msgstr "Mbit/s"

 msgid "kbit/s"
 msgstr "kbit/s"
-
-msgid "SISO"
-msgstr ""
-
-msgid "MISO"
-msgstr ""
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Valdemaras Pipiras
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.0.3\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
 "Language: lt\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"

 msgid "DVB Signal Information Monitor (OSD)"
-msgstr "DVB signalo informacijos stebėjimas (OSD)"
+msgstr "DVB signalo stebėjimas (OSD)"

 msgid "Signal Information"
 msgstr "Signalo informacija"
@@ -47,7 +47,7 @@ msgid "ST:TNG"
 msgstr "ST:TNG"

 msgid "DeepBlue"
-msgstr "DeepBlue"
+msgstr "Tamsiai mėlyna"

 msgid "Moronimo"
 msgstr "Moronimo"
@@ -62,7 +62,7 @@ msgid "Duotone"
 msgstr "Duotone"

 msgid "SilverGreen"
-msgstr "SilverGreen"
+msgstr "Sidabro žalia"

 msgid "PearlHD"
 msgstr "PearlHD"
@@ -92,10 +92,10 @@ msgid "Define the position of OSD."
 msgstr "Nustatyti ekrano užsklandos poziciją."

 msgid "Downscale OSD size [%]"
-msgstr ""
+msgstr "Sumažinti ekrano užsklandos (OSD) dydį [%]"

 msgid "Define the downscale ratio for OSD size."
-msgstr ""
+msgstr "Nustatyti ekrano užsklandos (OSD) mažinimo santykį."

 msgid "Red limit [%]"
 msgstr "Raudonoji ribą [%]"
@@ -178,20 +178,8 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Kodavimo dažnis"

-msgid "SignalSource"
-msgstr ""
-
-msgid "PilotTones"
-msgstr ""
-
-msgid "T2SystemId"
-msgstr ""
-
-msgid "SISO/MISO"
-msgstr ""
-
 msgid "Protocol"
-msgstr ""
+msgstr "Protokolas"

 msgid "Bitrate"
 msgstr "Kokybė"
@@ -221,7 +209,7 @@ msgid "Audio Stream"
 msgstr "Audio srautas"

 msgid "Channel Mode"
-msgstr "kanalo būsena"
+msgstr "Kanalo būsena"

 msgid "Sampling Frequency"
 msgstr "Parodomasis dažnis"
@@ -230,13 +218,13 @@ msgid "AC-3 Stream"
 msgstr "AC-3 srautas"

 msgid "Bit Stream Mode"
-msgstr "Bitstream būsena"
+msgstr "Srauto būsena"

 msgid "Audio Coding Mode"
 msgstr "Audio kodavimas"

 msgid "Center Mix Level"
-msgstr "Centerinis Mix lygis"
+msgstr "Centrinis mikserio lygis"

 msgid "Surround Mix Level"
 msgstr "Surround Mix lygis"
@@ -251,10 +239,10 @@ msgid "Dialogue Normalization"
 msgstr "Dialogo normalizacija"

 msgid "Fixed"
-msgstr "Fest"
+msgstr "Sutvarkyta"

 msgid "Analog"
-msgstr "Analog"
+msgstr "Analoginis"

 msgid "MPEG-2"
 msgstr "MPEG-2"
@@ -305,7 +293,7 @@ msgid "progressive"
 msgstr "progresyvinis"

 msgid "reserved"
-msgstr "belegt"
+msgstr "rezervuota"

 msgid "extended"
 msgstr "išplėstas"
@@ -338,22 +326,22 @@ msgid "Music and Effects (ME)"
 msgstr "Muzika ir efektai (ME)"

 msgid "Visually Impaired (VI)"
-msgstr " (VI)"
+msgstr "Skirta silpnaregiams (VI)"

 msgid "Hearing Impaired (HI)"
-msgstr " (HI)"
+msgstr "Skirta žmoniems su klausos negalia (HI)"

 msgid "Dialogue (D)"
 msgstr "Dialogas (D)"

 msgid "Commentary (C)"
-msgstr "Komentavimas (C)"
+msgstr "Komentarai (C)"

 msgid "Emergency (E)"
 msgstr "Avarinis (E)"

 msgid "Voice Over (VO)"
-msgstr "Voice over (VO)"
+msgstr "Įgarsinta (VO)"

 msgid "Karaoke"
 msgstr "Karaoke"
@@ -368,10 +356,10 @@ msgid "C"
 msgstr "C"

 msgid "L"
-msgstr "L"
+msgstr "K"

 msgid "R"
-msgstr "R"
+msgstr "D"

 msgid "S"
 msgstr "S"
@@ -392,16 +380,10 @@ msgid "MHz"
 msgstr "MHz"

 msgid "free"
-msgstr "frei"
+msgstr "nekoduota"

 msgid "Mbit/s"
 msgstr "Mbit/s"

 msgid "kbit/s"
 msgstr "kbit/s"
-
-msgid "SISO"
-msgstr ""
-
-msgid "MISO"
-msgstr ""
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Vyacheslav Dikonov
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.0.3\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Vyacheslav Dikonov\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
 "Language: ru\n"
@@ -178,18 +178,6 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"

-msgid "SignalSource"
-msgstr ""
-
-msgid "PilotTones"
-msgstr ""
-
-msgid "T2SystemId"
-msgstr ""
-
-msgid "SISO/MISO"
-msgstr ""
-
 msgid "Protocol"
 msgstr ""

@@ -399,9 +387,3 @@ msgstr "

 msgid "kbit/s"
 msgstr "<22><><EFBFBD><EFBFBD>/<2F>"
-
-msgid "SISO"
-msgstr ""
-
-msgid "MISO"
-msgstr ""
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Milan Hrala
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.0.3\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <vdr@linuxtv.org>\n"
 "Language: sk\n"
@@ -178,18 +178,6 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "r<>chlos<6F> k<>dovania"

-msgid "SignalSource"
-msgstr ""
-
-msgid "PilotTones"
-msgstr ""
-
-msgid "T2SystemId"
-msgstr ""
-
-msgid "SISO/MISO"
-msgstr ""
-
 msgid "Protocol"
 msgstr "Protokol"

@@ -399,9 +387,3 @@ msgstr "Mbit/s"

 msgid "kbit/s"
 msgstr "kbit/s"
-
-msgid "SISO"
-msgstr ""
-
-msgid "MISO"
-msgstr ""
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -4,10 +4,10 @@
 # Yarema aka Knedlyk <yupadmin@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.0.3\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "Language: uk\n"
@@ -178,18 +178,6 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Шв. кодування"

-msgid "SignalSource"
-msgstr ""
-
-msgid "PilotTones"
-msgstr ""
-
-msgid "T2SystemId"
-msgstr ""
-
-msgid "SISO/MISO"
-msgstr ""
-
 msgid "Protocol"
 msgstr "Протокол"

@@ -399,9 +387,3 @@ msgstr "Мбіт/c"

 msgid "kbit/s"
 msgstr "кбіт/с"
-
-msgid "SISO"
-msgstr ""
-
-msgid "MISO"
-msgstr ""
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2014 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Nan Feng VDR <nfgx@21cn.com>, 2009.2
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.0.3\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: NanFeng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
 "Language: zh_CN\n"
@@ -178,18 +178,6 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "码速率"

-msgid "SignalSource"
-msgstr ""
-
-msgid "PilotTones"
-msgstr ""
-
-msgid "T2SystemId"
-msgstr ""
-
-msgid "SISO/MISO"
-msgstr ""
-
 msgid "Protocol"
 msgstr ""

@@ -399,9 +387,3 @@ msgstr "兆位/秒"

 msgid "kbit/s"
 msgstr "千字节/秒"
-
-msgid "SISO"
-msgstr ""
-
-msgid "MISO"
-msgstr ""
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file. 
-# Copyright (C) 2007-2014 Rolf Ahrenberg 
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package. 
 # Nan Feng VDR <nfgx@21cn.com>, 2009.2 
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.0.3\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-03-08 03:08+0200\n"
-"PO-Revision-Date: 2014-03-08 03:08+0200\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: NanFeng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (traditional) <vdr@linuxtv.org>\n"
 "Language: zh_TW\n"
@@ -178,18 +178,6 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "碼速率"

-msgid "SignalSource"
-msgstr ""
-
-msgid "PilotTones"
-msgstr ""
-
-msgid "T2SystemId"
-msgstr ""
-
-msgid "SISO/MISO"
-msgstr ""
-
 msgid "Protocol"
 msgstr ""

@@ -399,9 +387,3 @@ msgstr "兆位/秒"

 msgid "kbit/s"
 msgstr "千字節/秒"
-
-msgid "SISO"
-msgstr ""
-
-msgid "MISO"
-msgstr ""
Author	SHA1	Message	Date
Rolf Ahrenberg	9420ab95e3	Updated the APIVERSNUM requirement.	2015-02-20 20:39:32 +02:00
Rolf Ahrenberg	89b7befce4	Updated the copyright year.	2015-02-15 19:11:30 +02:00
Rolf Ahrenberg	5b0f1e2572	Merge pull request #1 from varaslt/master Added missing lithuanian translations	2015-02-12 23:49:06 +02:00
Valdemaras Pipiras	e38047eab0	Added missing lithuanian translations	2015-02-12 23:48:51 +02:00
Rolf Ahrenberg	377e73dfe1	Simplified ChannelSwitch().	2015-02-08 23:27:16 +02:00
Rolf Ahrenberg	749e3e3238	Fixed the detaching of receiver during a channel switch.	2015-02-08 20:07:11 +02:00
Rolf Ahrenberg	7f1e5130a6	Updated for vdr-2.1.8.	2015-02-08 15:34:01 +02:00
Rolf Ahrenberg	667da1f5fe	Check for SAT>IP devices first.	2015-02-07 18:51:35 +02:00
Rolf Ahrenberg	e043190855	Updated CA definitions.	2015-01-10 14:42:21 +02:00
Rolf Ahrenberg	3a2af94f74	Fixed the SVDRP service IP menu item (Thanks to Toerless Eckert).	2015-01-05 22:16:12 +02:00
Rolf Ahrenberg	bd23a0793b	Updated HISTORY and incremented the version number.	2014-05-10 15:48:58 +03:00
Rolf Ahrenberg	91a1360e09	Fixed the channel frequency value.	2014-04-12 23:01:46 +03:00
Rolf Ahrenberg	2e5dad9ec5	Updated for vdr-2.1.6.	2014-03-16 17:04:28 +02:00
Rolf Ahrenberg	136c9fb73c	Refactored the SAT>IP support.	2014-03-15 12:35:49 +02:00