diff --git a/HISTORY b/HISTORY index 2273045..90b03af 100644 --- a/HISTORY +++ b/HISTORY @@ -320,3 +320,14 @@ VDR Plugin 'femon' Revision History - Replaced "Use single area (8bpp)" option with VDR's "Setup/OSD/Anti-alias". - Removed the FEMON_NTSC option. - Fixed a deadlock in cFemonReceiver (Thanks to Antti Seppälä for reporting this one). + +2008-12-16: Version 1.6.5 + +- Backported from 1.7.0. + +2008-12-16: Version 1.7.0 + +- Updated for vdr-1.7.2. +- Added whitespace cleanups. +- Changed info window to use the channel source instead of the frontend type. +- Removed the "Show CA system" setup option. diff --git a/femon.c b/femon.c index af56705..911064a 100644 --- a/femon.c +++ b/femon.c @@ -18,7 +18,7 @@ #error "VDR-1.6.0 API version or greater is required!" #endif -static const char VERSION[] = "1.6.4"; +static const char VERSION[] = "1.6.5"; static const char DESCRIPTION[] = trNOOP("DVB Signal Information Monitor (OSD)"); static const char MAINMENUENTRY[] = trNOOP("Signal Information"); @@ -114,7 +114,6 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value) else if (!strcasecmp(Name, "OSDOffset")) femonConfig.osdoffset = atoi(Value); else if (!strcasecmp(Name, "Skin")) femonConfig.skin = atoi(Value); else if (!strcasecmp(Name, "Theme")) femonConfig.theme = atoi(Value); - else if (!strcasecmp(Name, "ShowCASystem")) femonConfig.showcasystem = atoi(Value); else if (!strcasecmp(Name, "RedLimit")) femonConfig.redlimit = atoi(Value); else if (!strcasecmp(Name, "GreenLimit")) femonConfig.greenlimit = atoi(Value); else if (!strcasecmp(Name, "UpdateInterval")) femonConfig.updateinterval = atoi(Value); @@ -328,9 +327,6 @@ void cMenuFemonSetup::Setup(void) Add(new cMenuEditIntItem(tr("Horizontal offset"), &data.osdoffset, -50, 50)); help.Append(tr("Define the horizontal offset of OSD.")); - Add(new cMenuEditBoolItem(tr("Show CA system"), &data.showcasystem)); - help.Append(tr("Define whether the CA system is shown as text.")); - Add(new cMenuEditIntItem(tr("Red limit [%]"), &data.redlimit, 1, 50)); help.Append(tr("Define a limit for red bar, which is used to indicate a bad signal.")); @@ -374,7 +370,6 @@ void cMenuFemonSetup::Store(void) SetupStore("Position", femonConfig.position); SetupStore("OSDHeight", femonConfig.osdheight); SetupStore("OSDOffset", femonConfig.osdoffset); - SetupStore("ShowCASystem", femonConfig.showcasystem); SetupStore("RedLimit", femonConfig.redlimit); SetupStore("GreenLimit", femonConfig.greenlimit); SetupStore("UpdateInterval", femonConfig.updateinterval); diff --git a/femoncfg.c b/femoncfg.c index 2b4d171..9c629af 100644 --- a/femoncfg.c +++ b/femoncfg.c @@ -22,7 +22,6 @@ cFemonConfig::cFemonConfig(void) updateinterval = 5; analyzestream = 1; calcinterval = 20; - showcasystem = 0; osdheight = 480; osdoffset = 0; usesvdrp = 0; diff --git a/femoncfg.h b/femoncfg.h index 08b1380..b90cf09 100644 --- a/femoncfg.h +++ b/femoncfg.h @@ -33,7 +33,6 @@ public: int updateinterval; int analyzestream; int calcinterval; - int showcasystem; int osdheight; int osdoffset; int usesvdrp; diff --git a/femonosd.c b/femonosd.c index 9faa5a9..33991ef 100644 --- a/femonosd.c +++ b/femonosd.c @@ -315,11 +315,11 @@ void cFemonOsd::DrawInfoWindow(void) OSDDRAWINFOLEFT( tr("Tid"), *cString::sprintf("%d", channel->Tid())); OSDDRAWINFORIGHT( tr("Rid"), *cString::sprintf("%d", channel->Rid())); offset += OSDROWHEIGHT; - OSDDRAWINFOLEFT( trVDR("CA"), *getCAids(channel, femonConfig.showcasystem)); + OSDDRAWINFOLEFT( trVDR("CA"), *getCAids(channel)); offset += OSDROWHEIGHT; - switch (m_FrontendInfo.type) { - case FE_QPSK: - OSDDRAWINFOLINE(*cString::sprintf("%s #%d - %s", tr("Satellite Card"), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name)); + switch (channel->Source() & cSource::st_Mask) { + case cSource::stSat: + OSDDRAWINFOLINE(*cString::sprintf("DVB-S #%d - %s", (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name)); offset += OSDROWHEIGHT; OSDDRAWINFOLEFT( trVDR("Frequency"), *getFrequencyMHz(channel->Frequency())); OSDDRAWINFORIGHT(trVDR("Source"), *cSource::ToString(channel->Source())); @@ -329,13 +329,10 @@ void cFemonOsd::DrawInfoWindow(void) offset += OSDROWHEIGHT; OSDDRAWINFOLEFT( trVDR("Inversion"), *getInversion(channel->Inversion())); OSDDRAWINFORIGHT(trVDR("CoderateH"), *getCoderate(channel->CoderateH())); - //offset += OSDROWHEIGHT; - //OSDDRAWINFOLEFT( trVDR("System"), *getSystem(channel->System())); - //OSDDRAWINFORIGHT(trVDR("RollOff"), *getRollOff(channel->RollOff())); break; - case FE_QAM: - OSDDRAWINFOLINE(*cString::sprintf("%s #%d - %s", tr("Cable Card"), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name)); + case cSource::stCable: + OSDDRAWINFOLINE(*cString::sprintf("DVB-C #%d - %s", (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name)); offset += OSDROWHEIGHT; OSDDRAWINFOLEFT( trVDR("Frequency"), *getFrequencyMHz(channel->Frequency())); OSDDRAWINFORIGHT(trVDR("Source"), *cSource::ToString(channel->Source())); @@ -347,8 +344,8 @@ void cFemonOsd::DrawInfoWindow(void) OSDDRAWINFORIGHT(trVDR("CoderateH"), *getCoderate(channel->CoderateH())); break; - case FE_OFDM: - OSDDRAWINFOLINE(*cString::sprintf("%s #%d - %s", tr("Terrestrial Card"), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name)); + case cSource::stTerr: + OSDDRAWINFOLINE(*cString::sprintf("DVB-T #%d - %s", (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name)); offset += OSDROWHEIGHT; OSDDRAWINFOLEFT( trVDR("Frequency"), *getFrequencyMHz(channel->Frequency())); OSDDRAWINFORIGHT(trVDR("Transmission"), *getTransmission(channel->Transmission())); @@ -361,9 +358,6 @@ void cFemonOsd::DrawInfoWindow(void) offset += OSDROWHEIGHT; OSDDRAWINFOLEFT( trVDR("Hierarchy"), *getHierarchy(channel->Hierarchy())); OSDDRAWINFORIGHT(trVDR("Guard"), *getGuard(channel->Guard())); - //offset += OSDROWHEIGHT; - //OSDDRAWINFOLEFT( trVDR("Alpha"), *getAlpha(channel->Alpha())); - //OSDDRAWINFORIGHT(trVDR("Priority"), *getPriority(channel->Priority())); break; default: @@ -461,28 +455,28 @@ void cFemonOsd::Action(void) m_SvdrpPlugin->Service("SvdrpCommand-v1.0", &cmd); if (cmd.responseCode == 900) { for (cLine *line = cmd.reply.First(); line; line = cmd.reply.Next(line)) { - const char *s = line->Text(); - if (strncasecmp(s, "CARD:", 5) == 0) - m_SvdrpFrontend = strtol(s + 5, NULL, 10); - else if (strncasecmp(s, "TYPE:", 5) == 0) - m_FrontendInfo.type = (fe_type_t) strtol(s + 5, NULL, 10); - else if (strncasecmp(s, "NAME:", 5) == 0) - strn0cpy(m_FrontendInfo.name, s + 5, sizeof(m_FrontendInfo.name)); - else if (strncasecmp(s, "STAT:", 5) == 0) - m_FrontendStatus = (fe_status_t) strtol(s + 5, NULL, 16); - else if (strncasecmp(s, "SGNL:", 5) == 0) - m_Signal = strtol(s + 5, NULL, 16); - else if (strncasecmp(s, "SNRA:", 5) == 0) - m_SNR = strtol(s + 5, NULL, 16); - else if (strncasecmp(s, "BERA:", 5) == 0) - m_BER = strtol(s + 5, NULL, 16); - else if (strncasecmp(s, "UNCB:", 5) == 0) - m_UNC = strtol(s + 5, NULL, 16); - else if (strncasecmp(s, "VIBR:", 5) == 0) - m_SvdrpVideoBitrate = strtol(s + 5, NULL, 10); - else if (strncasecmp(s, "AUBR:", 5) == 0) - m_SvdrpAudioBitrate = strtol(s + 5, NULL, 10); - } + const char *s = line->Text(); + if (!strncasecmp(s, "CARD:", 5)) + m_SvdrpFrontend = strtol(s + 5, NULL, 10); + else if (!strncasecmp(s, "TYPE:", 5)) + m_FrontendInfo.type = (fe_type_t) strtol(s + 5, NULL, 10); + else if (!strncasecmp(s, "NAME:", 5)) + strn0cpy(m_FrontendInfo.name, s + 5, sizeof(m_FrontendInfo.name)); + else if (!strncasecmp(s, "STAT:", 5)) + m_FrontendStatus = (fe_status_t) strtol(s + 5, NULL, 16); + else if (!strncasecmp(s, "SGNL:", 5)) + m_Signal = strtol(s + 5, NULL, 16); + else if (!strncasecmp(s, "SNRA:", 5)) + m_SNR = strtol(s + 5, NULL, 16); + else if (!strncasecmp(s, "BERA:", 5)) + m_BER = strtol(s + 5, NULL, 16); + else if (!strncasecmp(s, "UNCB:", 5)) + m_UNC = strtol(s + 5, NULL, 16); + else if (!strncasecmp(s, "VIBR:", 5)) + m_SvdrpVideoBitrate = strtol(s + 5, NULL, 10); + else if (!strncasecmp(s, "AUBR:", 5)) + m_SvdrpAudioBitrate = strtol(s + 5, NULL, 10); + } } DrawInfoWindow(); DrawStatusWindow(); diff --git a/femonosd.h b/femonosd.h index a8e1f7f..3c088df 100644 --- a/femonosd.h +++ b/femonosd.h @@ -34,7 +34,7 @@ private: double m_SvdrpAudioBitrate; SvdrpConnection_v1_0 m_SvdrpConnection; cPlugin *m_SvdrpPlugin; - struct dvb_frontend_info m_FrontendInfo; + dvb_frontend_info m_FrontendInfo; int m_Number; int m_OldNumber; uint16_t m_SNR; diff --git a/femontools.c b/femontools.c index 028159a..0baab40 100644 --- a/femontools.c +++ b/femontools.c @@ -13,6 +13,52 @@ #include "femonosd.h" #include "femontools.h" +static cString getCA(int value) +{ + // http://www.dvb.org/index.php?id=174 + // http://en.wikipedia.org/wiki/Conditional_access_system + switch (value) { + case 0x0000: return cString::sprintf("%s (%X)", trVDR("Free To Air"), value); // Reserved + case 0x0001 ... 0x009F: + case 0x00A2 ... 0x00FF: return cString::sprintf("%s (%X)", tr("Fixed"), value); // Standardized systems + case 0x00A0 ... 0x00A1: return cString::sprintf("%s (%X)", tr("Analog"), value); // Analog signals + case 0x0100 ... 0x01FF: return cString::sprintf("%s (%X)", "SECA Mediaguard", value); // Canal Plus + case 0x0464: return cString::sprintf("%s (%X)", "EuroDec", value); // EuroDec + case 0x0500 ... 0x05FF: return cString::sprintf("%s (%X)", "Viaccess", value); // France Telecom + case 0x0600 ... 0x06FF: return cString::sprintf("%s (%X)", "Irdeto", value); // Irdeto + case 0x0900 ... 0x09FF: return cString::sprintf("%s (%X)", "NDS Videoguard", value); // News Datacom + case 0x0B00 ... 0x0BFF: return cString::sprintf("%s (%X)", "Conax", value); // Norwegian Telekom + case 0x0D00 ... 0x0DFF: return cString::sprintf("%s (%X)", "CryptoWorks", value); // Philips + case 0x0E00 ... 0x0EFF: return cString::sprintf("%s (%X)", "PowerVu", value); // Scientific Atlanta + case 0x1000: return cString::sprintf("%s (%X)", "RAS", value); // Tandberg Television + case 0x1200 ... 0x12FF: return cString::sprintf("%s (%X)", "NagraVision", value); // BellVu Express + case 0x1700 ... 0x17FF: return cString::sprintf("%s (%X)", "BetaCrypt", value); // BetaTechnik + case 0x1800 ... 0x18FF: return cString::sprintf("%s (%X)", "NagraVision", value); // Kudelski SA + case 0x22F0: return cString::sprintf("%s (%X)", "Codicrypt", value); // Scopus Network Technologies + case 0x2600: return cString::sprintf("%s (%X)", "BISS", value); // European Broadcasting Union + case 0x4347: return cString::sprintf("%s (%X)", "CryptOn", value); // CryptOn + case 0x4800: return cString::sprintf("%s (%X)", "Accessgate", value); // Telemann + case 0x4900: return cString::sprintf("%s (%X)", "China Crypt", value); // CryptoWorks + case 0x4A10: return cString::sprintf("%s (%X)", "EasyCas", value); // EasyCas + case 0x4A20: return cString::sprintf("%s (%X)", "AlphaCrypt", value); // AlphaCrypt + case 0x4A70: return cString::sprintf("%s (%X)", "DreamCrypt", value); // Dream Multimedia + case 0x4A60: return cString::sprintf("%s (%X)", "SkyCrypt", value); // @Sky + case 0x4A61: return cString::sprintf("%s (%X)", "Neotioncrypt", value); // Neotion + case 0x4A62: return cString::sprintf("%s (%X)", "SkyCrypt", value); // @Sky + case 0x4A63: return cString::sprintf("%s (%X)", "Neotion SHL", value); // Neotion + case 0x4A64 ... 0x4A6F: return cString::sprintf("%s (%X)", "SkyCrypt", value); // @Sky + case 0x4A80: return cString::sprintf("%s (%X)", "ThalesCrypt", value); // TPS + case 0x4AA1: return cString::sprintf("%s (%X)", "KeyFly", value); // SIDSA + case 0x4ABF: return cString::sprintf("%s (%X)", "DG-Crypt", value); // Beijing Compunicate Technology Inc. + case 0x4AD0 ... 0x4AD1: return cString::sprintf("%s (%X)", "X-Crypt", value); // XCrypt Inc. + case 0x4AD4: return cString::sprintf("%s (%X)", "OmniCrypt", value); // Widevine Technologies, Inc. + case 0x4AE0: return cString::sprintf("%s (%X)", "RossCrypt", value); // Digi Raum Electronics Co. Ltd. + case 0x5500: return cString::sprintf("%s (%X)", "Z-Crypt", value); // Digi Raum Electronics Co. Ltd. + case 0x5501: return cString::sprintf("%s (%X)", "Griffin", value); // Griffin + } + return cString::sprintf("%X", value); +} + cString getFrontendInfo(int cardIndex) { cString info; @@ -42,7 +88,7 @@ cString getFrontendInfo(int cardIndex) info = cString::sprintf("%s\nVIBR:%.0f\nAUBR:%.0f\nDDBR:%.0f", *info, cFemonOsd::Instance()->GetVideoBitrate(), cFemonOsd::Instance()->GetAudioBitrate(), cFemonOsd::Instance()->GetDolbyBitrate()); if (channel) - info = cString::sprintf("%s\nCHAN:%s", *info, *channel->ToText()); + info = cString::sprintf("%s\nCHAN:%s", *info, *channel->ToText()); return info; } @@ -158,47 +204,15 @@ cString getSpids(const cChannel *channel) return spids; } -cString getCAids(const cChannel *channel, bool identify) +cString getCAids(const cChannel *channel) { - cString caids; int value = 0; - - if (identify) { - caids = cString::sprintf("%s", *getCA(channel->Ca(value))); - while (channel->Ca(++value) && (value < MAXCAIDS)) - caids = cString::sprintf("%s, %s", *caids, *getCA(channel->Ca(value))); - } - else { - caids = cString::sprintf("%04x", channel->Ca(value)); - while (channel->Ca(++value) && (value < MAXCAIDS)) - caids = cString::sprintf("%s, %04x", *caids, channel->Ca(value)); - } + cString caids = cString::sprintf("%s", *getCA(channel->Ca(value))); + while (channel->Ca(++value) && (value < MAXCAIDS)) + caids = cString::sprintf("%s, %s", *caids, *getCA(channel->Ca(value))); return caids; } -cString getCA(int value) -{ - /* http://www.dvb.org/index.php?id=174 */ - switch (value) { - case 0x0000: return cString::sprintf("%s", trVDR("Free To Air")); // Reserved - case 0x0001 ... 0x009F: - case 0x00A2 ... 0x00FF: return cString::sprintf("%s", tr("Fixed")); // Standardized systems - case 0x00A0 ... 0x00A1: return cString::sprintf("%s", tr("Analog")); // Analog signals - case 0x0100 ... 0x01FF: return cString::sprintf("%s", tr("SECA/Mediaguard")); // Canal Plus - case 0x0500 ... 0x05FF: return cString::sprintf("%s", tr("Viaccess")); // France Telecom - case 0x0600 ... 0x06FF: return cString::sprintf("%s", tr("Irdeto")); // Irdeto - case 0x0900 ... 0x09FF: return cString::sprintf("%s", tr("NDS/Videoguard")); // News Datacom - case 0x0B00 ... 0x0BFF: return cString::sprintf("%s", tr("Conax")); // Norwegian Telekom - case 0x0D00 ... 0x0DFF: return cString::sprintf("%s", tr("CryptoWorks")); // Philips - case 0x0E00 ... 0x0EFF: return cString::sprintf("%s", tr("PowerVu")); // Scientific Atlanta - case 0x1200 ... 0x12FF: return cString::sprintf("%s", tr("NagraVision")); // BellVu Express - case 0x1700 ... 0x17FF: return cString::sprintf("%s", tr("BetaCrypt")); // BetaTechnik - case 0x1800 ... 0x18FF: return cString::sprintf("%s", tr("NagraVision")); // Kudelski SA - case 0x4A60 ... 0x4A6F: return cString::sprintf("%s", tr("SkyCrypt")); // @Sky - } - return cString::sprintf("%X", value); -} - cString getVideoStream(int value) { if (value != 0) @@ -271,7 +285,7 @@ cString getAudioChannelMode(int value) cString getCoderate(int value) { switch (value) { - case FEC_NONE: return cString::sprintf("%s", tr("none")); + case FEC_NONE: return cString::sprintf("%s", trVDR("none")); case FEC_1_2: return cString::sprintf("1/2"); case FEC_2_3: return cString::sprintf("2/3"); case FEC_3_4: return cString::sprintf("3/4"); @@ -280,7 +294,7 @@ cString getCoderate(int value) case FEC_6_7: return cString::sprintf("6/7"); case FEC_7_8: return cString::sprintf("7/8"); case FEC_8_9: return cString::sprintf("8/9"); - case FEC_AUTO: return cString::sprintf("%s", tr("auto")); + case FEC_AUTO: return cString::sprintf("%s", trVDR("auto")); } return cString::sprintf("---"); } @@ -290,7 +304,7 @@ cString getTransmission(int value) switch (value) { case TRANSMISSION_MODE_2K: return cString::sprintf("2K"); case TRANSMISSION_MODE_8K: return cString::sprintf("8K"); - case TRANSMISSION_MODE_AUTO: return cString::sprintf("%s", tr("auto")); + case TRANSMISSION_MODE_AUTO: return cString::sprintf("%s", trVDR("auto")); } return cString::sprintf("---"); } @@ -301,7 +315,7 @@ cString getBandwidth(int value) case BANDWIDTH_8_MHZ: return cString::sprintf("8 %s", tr("MHz")); case BANDWIDTH_7_MHZ: return cString::sprintf("7 %s", tr("MHz")); case BANDWIDTH_6_MHZ: return cString::sprintf("6 %s", tr("MHz")); - case BANDWIDTH_AUTO: return cString::sprintf("%s", tr("auto")); + case BANDWIDTH_AUTO: return cString::sprintf("%s", trVDR("auto")); } return cString::sprintf("---"); } @@ -311,7 +325,7 @@ cString getInversion(int value) switch (value) { case INVERSION_OFF: return cString::sprintf("%s", tr("off")); case INVERSION_ON: return cString::sprintf("%s", tr("on")); - case INVERSION_AUTO: return cString::sprintf("%s", tr("auto")); + case INVERSION_AUTO: return cString::sprintf("%s", trVDR("auto")); } return cString::sprintf("---"); } @@ -319,11 +333,11 @@ cString getInversion(int value) cString getHierarchy(int value) { switch (value) { - case HIERARCHY_NONE: return cString::sprintf("%s", tr("none")); + case HIERARCHY_NONE: return cString::sprintf("%s", trVDR("none")); case HIERARCHY_1: return cString::sprintf("1"); case HIERARCHY_2: return cString::sprintf("2"); case HIERARCHY_4: return cString::sprintf("4"); - case HIERARCHY_AUTO: cString::sprintf("%s", tr("auto")); + case HIERARCHY_AUTO: return cString::sprintf("%s", trVDR("auto")); } return cString::sprintf("---"); } @@ -335,7 +349,7 @@ cString getGuard(int value) case GUARD_INTERVAL_1_16: return cString::sprintf("1/16"); case GUARD_INTERVAL_1_8: return cString::sprintf("1/8"); case GUARD_INTERVAL_1_4: return cString::sprintf("1/4"); - case GUARD_INTERVAL_AUTO: cString::sprintf("%s", tr("auto")); + case GUARD_INTERVAL_AUTO: return cString::sprintf("%s", trVDR("auto")); } return cString::sprintf("---"); } @@ -349,31 +363,11 @@ cString getModulation(int value) case QAM_64: return cString::sprintf("QAM 64"); case QAM_128: return cString::sprintf("QAM 128"); case QAM_256: return cString::sprintf("QAM 256"); - case QAM_AUTO: return cString::sprintf("QAM %s", tr("auto")); + case QAM_AUTO: return cString::sprintf("QAM %s", trVDR("auto")); } return cString::sprintf("---"); } -cString getAlpha(int value) -{ - return cString::sprintf("---"); -} - -cString getPriority(int value) -{ - return cString::sprintf("---"); -} - -cString getSystem(int value) -{ - return cString::sprintf("---"); -} - -cString getRollOff(int value) -{ - return cString::sprintf("---"); -} - cString getResolution(int width, int height, int scan) { if ((width > 0) && (height > 0)) { diff --git a/femontools.h b/femontools.h index 537c121..aa1cb40 100644 --- a/femontools.h +++ b/femontools.h @@ -35,8 +35,7 @@ uint32_t getUNC(int cardIndex = 0); cString getApids(const cChannel *channel); cString getDpids(const cChannel *channel); cString getSpids(const cChannel *channel); -cString getCAids(const cChannel *channel, bool identify = false); -cString getCA(int value); +cString getCAids(const cChannel *channel); cString getVideoStream(int value); cString getVideoCodec(int value); cString getAudioStream(int value, const cChannel *channel); @@ -49,10 +48,6 @@ cString getInversion(int value); cString getHierarchy(int value); cString getGuard(int value); cString getModulation(int value); -cString getAlpha(int value); -cString getPriority(int value); -cString getSystem(int value); -cString getRollOff(int value); cString getResolution(int width, int height, int scan); cString getAspectRatio(int value); cString getVideoFormat(int value); diff --git a/po/de_DE.po b/po/de_DE.po index 2918267..97536e7 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,9 +7,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.6.4\n" +"Project-Id-Version: femon 1.6.5\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2008-11-09 13:31+0200\n" +"POT-Creation-Date: 2008-12-16 12:08+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" "Last-Translator: Christian Wieninger\n" "Language-Team: \n" @@ -98,12 +98,6 @@ msgstr "Horizontaler Offset" msgid "Define the horizontal offset of OSD." msgstr "" -msgid "Show CA system" -msgstr "CA System anzeigen" - -msgid "Define whether the CA system is shown as text." -msgstr "" - msgid "Red limit [%]" msgstr "Grenze Rot [%]" @@ -182,15 +176,6 @@ msgstr "Tid" msgid "Rid" msgstr "Rid" -msgid "Satellite Card" -msgstr "Satellitenkarte" - -msgid "Cable Card" -msgstr "Kabelkarte" - -msgid "Terrestrial Card" -msgstr "Terrestrische Karte" - msgid "Coderate" msgstr "Coderate" @@ -263,36 +248,6 @@ msgstr "Fest" msgid "Analog" msgstr "Analog" -msgid "SECA/Mediaguard" -msgstr "SECA/Mediaguard" - -msgid "Viaccess" -msgstr "Viaccess" - -msgid "Irdeto" -msgstr "Irdeto" - -msgid "NDS/Videoguard" -msgstr "NDS/Videoguard" - -msgid "Conax" -msgstr "Conax" - -msgid "CryptoWorks" -msgstr "CryptoWorks" - -msgid "PowerVu" -msgstr "PowerVu" - -msgid "NagraVision" -msgstr "NagraVision" - -msgid "BetaCrypt" -msgstr "BetaCrypt" - -msgid "SkyCrypt" -msgstr "SkyCrypt" - msgid "MPEG-2" msgstr "" @@ -332,12 +287,6 @@ msgstr "" msgid "mono" msgstr "" -msgid "none" -msgstr "Nichts" - -msgid "auto" -msgstr "Auto" - msgid "MHz" msgstr "MHz" diff --git a/po/es_ES.po b/po/es_ES.po index 312a30e..e762dd9 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.6.4\n" +"Project-Id-Version: femon 1.6.5\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2008-11-09 13:31+0200\n" +"POT-Creation-Date: 2008-12-16 12:08+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" "Last-Translator: Luis Palacios\n" "Language-Team: \n" @@ -96,12 +96,6 @@ msgstr "Desplazamiento horizontal" msgid "Define the horizontal offset of OSD." msgstr "" -msgid "Show CA system" -msgstr "Mostrar sistema CA" - -msgid "Define whether the CA system is shown as text." -msgstr "" - msgid "Red limit [%]" msgstr "Límite de rojo [%s]" @@ -180,15 +174,6 @@ msgstr "Tid" msgid "Rid" msgstr "Rid" -msgid "Satellite Card" -msgstr "Tarjeta Satélite" - -msgid "Cable Card" -msgstr "Tarjeta Cable" - -msgid "Terrestrial Card" -msgstr "Tarjeta TDT" - msgid "Coderate" msgstr "Coderate" @@ -261,36 +246,6 @@ msgstr "Fijo" msgid "Analog" msgstr "Analógico" -msgid "SECA/Mediaguard" -msgstr "SECA/Mediguard" - -msgid "Viaccess" -msgstr "Viaccess" - -msgid "Irdeto" -msgstr "Irdeto" - -msgid "NDS/Videoguard" -msgstr "NDS/Videoguard" - -msgid "Conax" -msgstr "Conax" - -msgid "CryptoWorks" -msgstr "CryptoWorks" - -msgid "PowerVu" -msgstr "PowerVu" - -msgid "NagraVision" -msgstr "NagraVision" - -msgid "BetaCrypt" -msgstr "BetaCrypt" - -msgid "SkyCrypt" -msgstr "SkyCrypt" - msgid "MPEG-2" msgstr "" @@ -330,12 +285,6 @@ msgstr "" msgid "mono" msgstr "o" -msgid "none" -msgstr "ninguno" - -msgid "auto" -msgstr "auto" - msgid "MHz" msgstr "MHz" diff --git a/po/et_EE.po b/po/et_EE.po index fcfe26f..59f098b 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.6.4\n" +"Project-Id-Version: femon 1.6.5\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2008-11-09 13:31+0200\n" +"POT-Creation-Date: 2008-12-16 12:08+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" "Last-Translator: Arthur Konovalov\n" "Language-Team: \n" @@ -96,12 +96,6 @@ msgstr "Horisontaalne nihe" msgid "Define the horizontal offset of OSD." msgstr "" -msgid "Show CA system" -msgstr "Näita CA süsteemi" - -msgid "Define whether the CA system is shown as text." -msgstr "" - msgid "Red limit [%]" msgstr "Punase limiit [%]" @@ -180,15 +174,6 @@ msgstr "Tid" msgid "Rid" msgstr "Rid" -msgid "Satellite Card" -msgstr "Satelliidikaart" - -msgid "Cable Card" -msgstr "Kaablikaart" - -msgid "Terrestrial Card" -msgstr "Terrestiaalkaart" - msgid "Coderate" msgstr "Coderate" @@ -261,36 +246,6 @@ msgstr "Fikseeritud" msgid "Analog" msgstr "" -msgid "SECA/Mediaguard" -msgstr "SECA/Mediaguard" - -msgid "Viaccess" -msgstr "Viaccess" - -msgid "Irdeto" -msgstr "Irdeto" - -msgid "NDS/Videoguard" -msgstr "NDS/Videoguard" - -msgid "Conax" -msgstr "Conax" - -msgid "CryptoWorks" -msgstr "CryptoWorks" - -msgid "PowerVu" -msgstr "PowerVu" - -msgid "NagraVision" -msgstr "NagraVision" - -msgid "BetaCrypt" -msgstr "BetaCrypt" - -msgid "SkyCrypt" -msgstr "SkyCrypt" - msgid "MPEG-2" msgstr "" @@ -330,12 +285,6 @@ msgstr "" msgid "mono" msgstr "" -msgid "none" -msgstr "ei" - -msgid "auto" -msgstr "auto" - msgid "MHz" msgstr "MHz" diff --git a/po/fi_FI.po b/po/fi_FI.po index 1367f96..1c6763b 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.6.4\n" +"Project-Id-Version: femon 1.6.5\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2008-11-09 13:31+0200\n" +"POT-Creation-Date: 2008-12-16 12:08+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" "Last-Translator: Rolf Ahrenberg\n" "Language-Team: \n" @@ -96,12 +96,6 @@ msgstr "Vaakakeskitys" msgid "Define the horizontal offset of OSD." msgstr "Määrittele näytön vaakakeskitys." -msgid "Show CA system" -msgstr "Näytä salausjärjestelmä" - -msgid "Define whether the CA system is shown as text." -msgstr "Määrittele, näytetään salausjärjestelmä tekstinä." - msgid "Red limit [%]" msgstr "Punaisen taso [%]" @@ -180,15 +174,6 @@ msgstr "Lähete-ID" msgid "Rid" msgstr "Radio-ID" -msgid "Satellite Card" -msgstr "Satelliittikortti" - -msgid "Cable Card" -msgstr "Kaapelikortti" - -msgid "Terrestrial Card" -msgstr "Terrestriaalikortti" - msgid "Coderate" msgstr "Suojaustaso" @@ -261,36 +246,6 @@ msgstr "kiinteä" msgid "Analog" msgstr "analoginen" -msgid "SECA/Mediaguard" -msgstr "SECA/Mediaguard" - -msgid "Viaccess" -msgstr "Viaccess" - -msgid "Irdeto" -msgstr "Irdeto" - -msgid "NDS/Videoguard" -msgstr "NDS/Videoguard" - -msgid "Conax" -msgstr "Conax" - -msgid "CryptoWorks" -msgstr "CryptoWorks" - -msgid "PowerVu" -msgstr "PowerVu" - -msgid "NagraVision" -msgstr "NagraVision" - -msgid "BetaCrypt" -msgstr "BetaCrypt" - -msgid "SkyCrypt" -msgstr "SkyCrypt" - msgid "MPEG-2" msgstr "MPEG-2" @@ -330,12 +285,6 @@ msgstr "kaksikanavainen" msgid "mono" msgstr "mono" -msgid "none" -msgstr "ei" - -msgid "auto" -msgstr "auto" - msgid "MHz" msgstr "MHz" diff --git a/po/fr_FR.po b/po/fr_FR.po index c3ac623..aaa4eac 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.6.4\n" +"Project-Id-Version: femon 1.6.5\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2008-11-09 13:31+0200\n" +"POT-Creation-Date: 2008-12-16 12:08+0200\n" "PO-Revision-Date: 2008-01-26 09:59+0100\n" "Last-Translator: NIVAL Michaël \n" "Language-Team: \n" @@ -96,12 +96,6 @@ msgstr "D msgid "Define the horizontal offset of OSD." msgstr "Définit le déplacement horizontal de l'OSD." -msgid "Show CA system" -msgstr "Afficher système CA" - -msgid "Define whether the CA system is shown as text." -msgstr "Définit si le système CA doit être affiché." - msgid "Red limit [%]" msgstr "Limite du rouge (%)" @@ -180,15 +174,6 @@ msgstr "Tid" msgid "Rid" msgstr "Rid" -msgid "Satellite Card" -msgstr "Carte Satellite" - -msgid "Cable Card" -msgstr "Carte Câble" - -msgid "Terrestrial Card" -msgstr "Carte TNT" - msgid "Coderate" msgstr "Coderate" @@ -261,36 +246,6 @@ msgstr "Fixe" msgid "Analog" msgstr "Analogique" -msgid "SECA/Mediaguard" -msgstr "SECA/Mediaguard" - -msgid "Viaccess" -msgstr "Viaccess" - -msgid "Irdeto" -msgstr "Irdeto" - -msgid "NDS/Videoguard" -msgstr "NDS/Videoguard" - -msgid "Conax" -msgstr "Conax" - -msgid "CryptoWorks" -msgstr "CryptoWorks" - -msgid "PowerVu" -msgstr "PowerVu" - -msgid "NagraVision" -msgstr "NagraVision" - -msgid "BetaCrypt" -msgstr "BetaCrypt" - -msgid "SkyCrypt" -msgstr "SkyCrypt" - msgid "MPEG-2" msgstr "" @@ -330,12 +285,6 @@ msgstr "" msgid "mono" msgstr "" -msgid "none" -msgstr "Aucun" - -msgid "auto" -msgstr "Auto" - msgid "MHz" msgstr "MHz" diff --git a/po/it_IT.po b/po/it_IT.po index bc673d5..997de9a 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.6.4\n" +"Project-Id-Version: femon 1.6.5\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2008-11-09 13:31+0200\n" +"POT-Creation-Date: 2008-12-16 12:08+0200\n" "PO-Revision-Date: 2008-11-10 23:37+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: \n" @@ -97,12 +97,6 @@ msgstr "Limite orizzontale" msgid "Define the horizontal offset of OSD." msgstr "Definisci il limite orizzontale dell'OSD." -msgid "Show CA system" -msgstr "Mostra sistema CA" - -msgid "Define whether the CA system is shown as text." -msgstr "Definisci se il sistema CA viene mostrato come testo." - msgid "Red limit [%]" msgstr "Limite rosso [%]" @@ -181,15 +175,6 @@ msgstr "Tid" msgid "Rid" msgstr "Rid" -msgid "Satellite Card" -msgstr "Scheda satellite" - -msgid "Cable Card" -msgstr "Scheda via cavo" - -msgid "Terrestrial Card" -msgstr "Scheda terrestre" - msgid "Coderate" msgstr "Coderate" @@ -262,36 +247,6 @@ msgstr "Fisso" msgid "Analog" msgstr "Analogico" -msgid "SECA/Mediaguard" -msgstr "SECA/Mediaguard" - -msgid "Viaccess" -msgstr "Viaccess" - -msgid "Irdeto" -msgstr "Irdeto" - -msgid "NDS/Videoguard" -msgstr "NDS/Videoguard" - -msgid "Conax" -msgstr "Conax" - -msgid "CryptoWorks" -msgstr "CryptoWorks" - -msgid "PowerVu" -msgstr "PowerVu" - -msgid "NagraVision" -msgstr "NagraVision" - -msgid "BetaCrypt" -msgstr "BetaCrypt" - -msgid "SkyCrypt" -msgstr "SkyCrypt" - msgid "MPEG-2" msgstr "MPEG-2" @@ -331,12 +286,6 @@ msgstr "dual" msgid "mono" msgstr "mono" -msgid "none" -msgstr "nessuna" - -msgid "auto" -msgstr "auto" - msgid "MHz" msgstr "MHz" diff --git a/po/ru_RU.po b/po/ru_RU.po index 9b72eb0..8070f29 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.6.4\n" +"Project-Id-Version: femon 1.6.5\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2008-11-09 13:31+0200\n" +"POT-Creation-Date: 2008-12-16 12:08+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" "Last-Translator: Vyacheslav Dikonov\n" "Language-Team: \n" @@ -96,12 +96,6 @@ msgstr "" msgid "Define the horizontal offset of OSD." msgstr "" -msgid "Show CA system" -msgstr "" - -msgid "Define whether the CA system is shown as text." -msgstr "" - msgid "Red limit [%]" msgstr "ºàÐáÝÐï ×ÞÝÐ áÛÐÑÞÓÞ áØÓÝÐÛÐ ÔÞ (%)" @@ -180,15 +174,6 @@ msgstr "Tid" msgid "Rid" msgstr "Rid" -msgid "Satellite Card" -msgstr "¿ÛÐâÐ áßãâÝØÚÞÒÞÓÞ ßàØñÜÐ" - -msgid "Cable Card" -msgstr "¿ÛÐâÐ ÚÐÑÕÛìÝÞÓÞ ßàØñÜÐ" - -msgid "Terrestrial Card" -msgstr "¿ÛÐâÐ íäØàÝÞÓÞ ßàØñÜÐ" - msgid "Coderate" msgstr "Coderate" @@ -261,36 +246,6 @@ msgstr "" msgid "Analog" msgstr "" -msgid "SECA/Mediaguard" -msgstr "" - -msgid "Viaccess" -msgstr "" - -msgid "Irdeto" -msgstr "" - -msgid "NDS/Videoguard" -msgstr "" - -msgid "Conax" -msgstr "" - -msgid "CryptoWorks" -msgstr "" - -msgid "PowerVu" -msgstr "" - -msgid "NagraVision" -msgstr "" - -msgid "BetaCrypt" -msgstr "" - -msgid "SkyCrypt" -msgstr "" - msgid "MPEG-2" msgstr "" @@ -330,12 +285,6 @@ msgstr "" msgid "mono" msgstr "" -msgid "none" -msgstr "ÝÕâ" - -msgid "auto" -msgstr "ÐÒâÞ" - msgid "MHz" msgstr "¼³æ"