Added missing MINFONTSIZE and MAXFONTSIZE defines.

Cleaned up compilation warnings.
2023-10-10 11:36:53 +00:00 · 2009-06-18 23:08:25 +03:00 · 2009-06-18 17:38:27 +03:00 · 2009-06-18 17:35:35 +03:00 · 2009-06-18 12:16:11 +03:00 · 2009-03-24 12:51:51 +02:00
11 changed files with 65 additions and 97 deletions
--- a/femon.c
+++ b/femon.c
@@ -14,11 +14,11 @@
 #include "femonservice.h"
 #include "femontools.h"

-#if defined(APIVERSNUM) && APIVERSNUM < 10600
-#error "VDR-1.6.0 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10700
+#error "VDR-1.7.0 API version or greater is required!"
 #endif

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

--- a/femonosd.c
+++ b/femonosd.c
@@ -338,7 +338,7 @@ void cFemonOsd::DrawInfoWindow(void)
            offset += OSDROWHEIGHT;
            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));
+                   OSDDRAWINFOLINE(*cString::sprintf("DVB-S%s #%d - %s", (m_FrontendInfo.caps & 0x10000000) ? "2" : "", (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()));
@@ -348,6 +348,9 @@ 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 cSource::stCable:
--- a/femontools.c
+++ b/femontools.c
@@ -60,6 +60,17 @@ static cString getCA(int value)
  return cString::sprintf("%X", value);
 }

+static const char *getUserString(int Value, const tChannelParameterMap *Map)
+{
+  const tChannelParameterMap *map = Map;
+  while (map && map->userValue != -1) {
+        if (map->driverValue == Value)
+           return map->userString ? tr(map->userString) : "---";
+        map++;
+        }
+  return "---";
+}
+
 cString getFrontendInfo(int cardIndex)
 {
  cString info;
@@ -288,95 +299,47 @@ cString getAudioChannelMode(int value)

 cString getCoderate(int value)
 {
-  switch (value) {
-    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");
-    case FEC_4_5:  return cString::sprintf("4/5");
-    case FEC_5_6:  return cString::sprintf("5/6");
-    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", trVDR("auto"));
-    default:       break;
-    }
-  return cString::sprintf("---");
+  return cString::sprintf("%s", getUserString(value, CoderateValues));
 }

 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", trVDR("auto"));
-    default:                     break;
-    }
-  return cString::sprintf("---");
+  return cString::sprintf("%s", getUserString(value, TransmissionValues));
 }
 
 cString getBandwidth(int value)
 {
-  switch (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", trVDR("auto"));
-    default:              break;
-    }
-  return cString::sprintf("---");
+  return cString::sprintf("%s", getUserString(value, BandwidthValues));
 }

 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", trVDR("auto"));
-    default:             break;
-    }
-  return cString::sprintf("---");
+  return cString::sprintf("%s", getUserString(value, InversionValues));
 }

 cString getHierarchy(int value)
 {
-  switch (value) {
-    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: return cString::sprintf("%s", trVDR("auto"));
-    default:             break;
-    }
-  return cString::sprintf("---");
+  return cString::sprintf("%s", getUserString(value, HierarchyValues));
 }

 cString getGuard(int value)
 {
-  switch (value) {
-    case GUARD_INTERVAL_1_32: return cString::sprintf("1/32");
-    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: return cString::sprintf("%s", trVDR("auto"));
-    default:                  break;
-    }
-  return cString::sprintf("---");
+  return cString::sprintf("%s", getUserString(value, GuardValues));
 }

 cString getModulation(int value)
 {
-  switch (value) {
-    case QPSK:     return cString::sprintf("QPSK");
-    case QAM_16:   return cString::sprintf("QAM 16");
-    case QAM_32:   return cString::sprintf("QAM 32");
-    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", trVDR("auto"));
-    default:       break;
-    }
-  return cString::sprintf("---");
+  return cString::sprintf("%s", getUserString(value, ModulationValues));
+}
+
+cString getSystem(int value)
+{
+  return cString::sprintf("%s", getUserString(value, SystemValues));
+}
+
+cString getRollOff(int value)
+{
+  return cString::sprintf("%s", getUserString(value, RollOffValues));
 }

 cString getResolution(int width, int height, int scan)
--- a/femontools.h
+++ b/femontools.h
@@ -48,6 +48,8 @@ cString getInversion(int value);
 cString getHierarchy(int value);
 cString getGuard(int value);
 cString getModulation(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);
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.6.5\n"
+"Project-Id-Version: femon 1.7.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
 "POT-Creation-Date: 2008-12-16 12:08+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
@@ -287,9 +287,6 @@ msgstr ""
 msgid "mono"
 msgstr ""

-msgid "MHz"
-msgstr "MHz"
-
 msgid "interlaced"
 msgstr ""

@@ -380,6 +377,9 @@ msgstr "dB"
 msgid "not indicated"
 msgstr "nicht angegeben"

+msgid "MHz"
+msgstr "MHz"
+
 msgid "free"
 msgstr "frei"

--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.6.5\n"
+"Project-Id-Version: femon 1.7.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
 "POT-Creation-Date: 2008-12-16 12:08+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
@@ -285,9 +285,6 @@ msgstr ""
 msgid "mono"
 msgstr "o"

-msgid "MHz"
-msgstr "MHz"
-
 msgid "interlaced"
 msgstr ""

@@ -378,6 +375,9 @@ msgstr "dB"
 msgid "not indicated"
 msgstr "no indicado"

+msgid "MHz"
+msgstr "MHz"
+
 msgid "free"
 msgstr "libre"

--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.6.5\n"
+"Project-Id-Version: femon 1.7.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
 "POT-Creation-Date: 2008-12-16 12:08+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
@@ -285,9 +285,6 @@ msgstr ""
 msgid "mono"
 msgstr ""

-msgid "MHz"
-msgstr "MHz"
-
 msgid "interlaced"
 msgstr ""

@@ -378,6 +375,9 @@ msgstr "dB"
 msgid "not indicated"
 msgstr "m<>rkimata"

+msgid "MHz"
+msgstr "MHz"
+
 msgid "free"
 msgstr "vaba"

--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.6.5\n"
+"Project-Id-Version: femon 1.7.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
 "POT-Creation-Date: 2008-12-16 12:08+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
@@ -285,9 +285,6 @@ msgstr "kaksikanavainen"
 msgid "mono"
 msgstr "mono"

-msgid "MHz"
-msgstr "MHz"
-
 msgid "interlaced"
 msgstr "lomiteltu"

@@ -378,6 +375,9 @@ msgstr "dB"
 msgid "not indicated"
 msgstr "ei ilmaistu"

+msgid "MHz"
+msgstr "MHz"
+
 msgid "free"
 msgstr "vapaa"

--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.6.5\n"
+"Project-Id-Version: femon 1.7.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
 "POT-Creation-Date: 2008-12-16 12:08+0200\n"
 "PO-Revision-Date: 2008-01-26 09:59+0100\n"
@@ -285,9 +285,6 @@ msgstr ""
 msgid "mono"
 msgstr ""

-msgid "MHz"
-msgstr "MHz"
-
 msgid "interlaced"
 msgstr ""

@@ -378,6 +375,9 @@ msgstr "dB"
 msgid "not indicated"
 msgstr "non indiqu<71>"

+msgid "MHz"
+msgstr "MHz"
+
 msgid "free"
 msgstr "libre"

--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.6.5\n"
+"Project-Id-Version: femon 1.7.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
 "POT-Creation-Date: 2008-12-16 12:08+0200\n"
 "PO-Revision-Date: 2008-11-10 23:37+0100\n"
@@ -286,9 +286,6 @@ msgstr "dual"
 msgid "mono"
 msgstr "mono"

-msgid "MHz"
-msgstr "MHz"
-
 msgid "interlaced"
 msgstr "interlacciato"

@@ -379,6 +376,9 @@ msgstr "dB"
 msgid "not indicated"
 msgstr "non indicato"

+msgid "MHz"
+msgstr "MHz"
+
 msgid "free"
 msgstr "libero"

--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.6.5\n"
+"Project-Id-Version: femon 1.7.0\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
 "POT-Creation-Date: 2008-12-16 12:08+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
@@ -285,9 +285,6 @@ msgstr ""
 msgid "mono"
 msgstr ""

-msgid "MHz"
-msgstr "<22><><EFBFBD>"
-
 msgid "interlaced"
 msgstr ""

@@ -378,6 +375,9 @@ msgstr "dB"
 msgid "not indicated"
 msgstr ""

+msgid "MHz"
+msgstr "<22><><EFBFBD>"
+
 msgid "free"
 msgstr ""
Author	SHA1	Message	Date
Rolf Ahrenberg	6086c135c7	Added missing MINFONTSIZE and MAXFONTSIZE defines.	2009-06-18 23:08:25 +03:00
Rolf Ahrenberg	db9735b80b	Cleaned up compilation warnings.	2009-06-18 17:38:27 +03:00
Rolf Ahrenberg	84878bd1b9	Cleaned up compilation warnings.	2009-06-18 17:35:35 +03:00
Rolf Ahrenberg	afd72642e9	Fixed font handling to be thread-safe.	2009-06-18 12:16:11 +03:00
Rolf Ahrenberg	0a162a9a8c	Cleaned up compilation warnings.	2009-03-24 12:51:51 +02:00
Rolf Ahrenberg	2e2aacd573	Fixed end of sequence NAL unit.	2009-02-11 14:51:55 +02:00
Rolf Ahrenberg	4e8fdaf99f	Fixed closing of frontend file handles.	2009-01-06 23:10:02 +02:00
Rolf Ahrenberg	eb2da4721c	Added whitespace cleanups.	2008-12-16 12:51:59 +02:00
Rolf Ahrenberg	5cf9b4af0b	Updated for vdr-1.7.2. Removed the "Show CA system" setup option.	2008-12-16 12:26:46 +02:00
Rolf Ahrenberg	83556bf2d3	Added whitespace cleanups. Changed info window to use the channel source instead of the frontend type.	2008-12-13 22:25:26 +02:00