Updated HISTORY.

Updated for vdr-1.7.18.

HISTORY

@@ -395,3 +395,22 @@ VDR Plugin 'femon' Revision History
 - Updated for vdr-1.7.13.
 - Added a setup option to downscale the OSD size.
 - Updated Estonian translation (Thanks to Arthur Konovalov).
+
+2010-06-23: Version 1.7.8
+
+- Fixed device switching.
+- Added preliminary support for LATM.
+- Updated Italian translation (Thanks to Diego Pierotto).
+- Fixed a crash in femon service (Thanks to Wolfgang Astleitner).
+
+2010-12-27: Version 1.7.9
+
+- Updated for vdr-1.7.16.
+- Added Makefile depencency for objects.
+- Fixed detection of replaying.
+- Added support for LDFLAGS.
+
+2011-05-15: Version 1.7.10
+
+- Updated for vdr-1.7.18.
+- Added scaling for symbols.

Makefile

@@ -23,7 +23,8 @@ VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ p
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Wextra -Wswitch-default -Wfloat-equal -Wundef -Wpointer-arith -Wconversion -Wcast-align -Wredundant-decls -Wno-unused-parameter -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -fPIC -g -O3 -Wall -Wextra -Wswitch-default -Wfloat-equal -Wundef -Wpointer-arith -Wconversion -Wcast-align -Wredundant-decls -Wno-unused-parameter -Woverloaded-virtual -Wno-parentheses
+LDFLAGS  ?= -Wl,--as-needed
 
 ### The directory environment:
 
@@ -33,7 +34,7 @@ TMPDIR = /tmp
 
 ### Make sure that necessary options are included:
 
-include $(VDRDIR)/Make.global
+-include $(VDRDIR)/Make.global
 
 ### Allow user defined options to overwrite defaults:
 
@@ -63,7 +64,7 @@ all-redirect: all
 
 ### The object files (add further files here):
 
-OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femontools.o femonmpeg.o femonac3.o femonaac.o femonh264.o femonsymbol.o
+OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femontools.o femonmpeg.o femonac3.o femonaac.o femonlatm.o femonh264.o femonsymbol.o
 
 ### The main target:
 
@@ -71,7 +72,7 @@ all: libvdr-$(PLUGIN).so i18n
 
 ### Implicit rules:
 
-%.o: %.c
+%.o: %.c Makefile
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
 ### Dependencies:
@@ -95,7 +96,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='Rolf Ahrenberg' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name='vdr-$(PLUGIN)' --package-version='$(VERSION)' --msgid-bugs-address='<see README>' -o $@ $^
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
@@ -111,13 +112,13 @@ i18n: $(I18Nmsgs) $(I18Npot)
 ### Targets:
 
 libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 ifndef FEMON_DEBUG
 	@$(STRIP) $@
 endif
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
-dist: clean
+dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)

femon.c

@@ -7,18 +7,18 @@
 
 #include <vdr/menu.h>
 #include <vdr/remote.h>
-#include <vdr/menu.h>
+#include <vdr/player.h>
 #include "femoncfg.h"
 #include "femonreceiver.h"
 #include "femonosd.h"
 #include "femonservice.h"
 #include "femontools.h"
 
-#if defined(APIVERSNUM) && APIVERSNUM < 10713
-#error "VDR-1.7.13 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10718
+#error "VDR-1.7.18 API version or greater is required!"
 #endif
 
-static const char VERSION[]       = "1.7.7";
+static const char VERSION[]       = "1.7.10";
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");
 
@@ -97,7 +97,7 @@ cOsdObject *cPluginFemon::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
   debug("%s()\n", __PRETTY_FUNCTION__);
-  if (cReplayControl::NowReplaying() || (Channels.Count() <= 0))
+  if (cControl::Control() || (Channels.Count() <= 0))
      Skins.Message(mtInfo, tr("Femon not available"));
   else
      return cFemonOsd::Instance(true);
@@ -133,6 +133,8 @@ bool cPluginFemon::Service(const char *Id, void *Data)
   if (strcmp(Id,"FemonService-v1.0") == 0) {
      if (Data) {
         FemonService_v1_0 *data = (FemonService_v1_0*)Data;
+        if (!cDevice::ActualDevice())
+           return false; 
         int ndx = cDevice::ActualDevice()->CardIndex();
         data->fe_name = getFrontendName(ndx);
         data->fe_status = getFrontendStatus(ndx);
@@ -194,7 +196,7 @@ cString cPluginFemon::SVDRPCommand(const char *Command, const char *Option, int
         return cString("Cannot open femon plugin while replaying");
         }
      if (!cFemonOsd::Instance())
-        cRemote::CallPlugin("femon");
+        cRemote::CallPlugin(Name());
      return cString("Opening femon plugin");
      }
   else if (strcasecmp(Command, "QUIT") == 0) {

femonaudio.h

@@ -17,7 +17,8 @@ enum eAudioCodec {
   AUDIO_CODEC_MPEG2_I,
   AUDIO_CODEC_MPEG2_II,
   AUDIO_CODEC_MPEG2_III,
-  AUDIO_CODEC_HEAAC
+  AUDIO_CODEC_HEAAC,
+  AUDIO_CODEC_LATM
   };
 
 enum eAudioChannelMode {

femoncfg.c

@@ -24,7 +24,7 @@ cFemonConfig::cFemonConfig(void)
   analyzestream  = 1;
   calcinterval   = 20;
   usesvdrp       = 0;
-  svdrpport      = 2001;
+  svdrpport      = 6419;
   strncpy(svdrpip, "0.0.0.0", sizeof(svdrpip));
 }
 

femonh264.c

@@ -142,7 +142,7 @@ bool cFemonH264::processVideo(const uint8_t *buf, int len)
 
         case NAL_SEI:
              if (!sei_found) {
-               //debug("H.264: Found NAL SEI at offset %d/%d\n", iny(buf - start), len);
+               //debug("H.264: Found NAL SEI at offset %d/%d\n", int(buf - start), len);
                int nal_len = nalUnescape(nal_data, buf + 4, int(end - buf - 4));
                consumed = parseSEI(nal_data, nal_len);
                if (consumed > 0)

femonlatm.c

@@ -0,0 +1,112 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#include "femontools.h"
+#include "femonlatm.h"
+
+unsigned int cFemonLATM::s_Bitrates[3][16] =
+{
+  {0,  32,  48,  56,  64,  80,  96, 112, 128, 144, 160, 176, 192, 224, 256, -1}, // MPEG-2 Layer I
+  {0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1}, // MPEG-2 Layer II/III
+  {0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1}  // MPEG-2 Layer II/III
+};
+
+unsigned int cFemonLATM::s_Samplerates[4] =
+{
+  22050, 24000, 16000, -1
+};
+
+cFemonLATM::cFemonLATM(cFemonAudioIf *audiohandler)
+: m_AudioHandler(audiohandler)
+{
+}
+
+cFemonLATM::~cFemonLATM()
+{
+}
+
+bool cFemonLATM::processAudio(const uint8_t *buf, int len)
+{
+  cBitStream bs(buf, len * 8);
+
+  if (!m_AudioHandler)
+     return false;
+
+  // skip PES header
+  if (!PesLongEnough(len))
+      return false;
+  bs.skipBits(8 * PesPayloadOffset(buf));
+
+  // MPEG audio detection
+  if (bs.getBits(12) != 0x56E)              // syncword
+     return false;
+
+  m_AudioHandler->SetAudioCodec(AUDIO_CODEC_LATM);
+
+  if (bs.getBit() == 0)                     // id: MPEG-1=1, extension to lower sampling frequencies=0
+     return true;                           // @todo: lower sampling frequencies support
+  int layer = 3 - bs.getBits(2);            // layer: I=11, II=10, III=01
+  bs.skipBit();                             // protection bit
+  int bit_rate_index = bs.getBits(4);       // bitrate index
+  int sampling_frequency = bs.getBits(2);   // sampling frequency
+  bs.skipBit();                             // padding bit
+  bs.skipBit();                             // private pid
+  int mode = bs.getBits(2);                 // mode
+
+  switch (mode) {
+    case 0:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_STEREO);
+         break;
+
+    case 1:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_JOINT_STEREO);
+         break;
+
+    case 2:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_DUAL);
+         break;
+
+    case 3:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_SINGLE);
+         break;
+
+    default:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_INVALID);
+         break;
+  }
+
+  if (layer == 3) {
+      m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_FREE);
+  }
+  else {
+     switch (bit_rate_index) {
+       case 0:
+            m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_FREE);
+            break;
+
+       case 0xF:
+            m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_RESERVED);
+            break;
+
+       default:
+            m_AudioHandler->SetAudioBitrate(1000 * s_Bitrates[layer][bit_rate_index]);
+            break;
+     }
+  }
+
+  switch (sampling_frequency) {
+    case 3:
+         m_AudioHandler->SetAudioSamplingFrequency(AUDIO_SAMPLING_FREQUENCY_RESERVED);
+         break;
+
+    default:
+         m_AudioHandler->SetAudioSamplingFrequency(s_Samplerates[sampling_frequency]);
+         break;
+  }
+
+  return true;
+}

femonlatm.h

@@ -0,0 +1,27 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __FEMONLATM_H
+#define __FEMONLATM_H
+
+#include "femonaudio.h"
+
+class cFemonLATM {
+private:
+  cFemonAudioIf *m_AudioHandler;
+
+  static unsigned int s_Bitrates[3][16];
+  static unsigned int s_Samplerates[4];
+
+public:
+  cFemonLATM(cFemonAudioIf *audiohandler);
+  virtual ~cFemonLATM();
+
+  bool processAudio(const uint8_t *buf, int len);
+  };
+
+#endif //__FEMONLATM_H

femonosd.c

@@ -25,8 +25,9 @@
 #define OSDROWHEIGHT              m_Font->Height()        // in pixels
 #define OSDINFOHEIGHT             (OSDROWHEIGHT * 13)     // in pixels (13 rows)
 #define OSDSTATUSHEIGHT           (OSDROWHEIGHT * 6)      // in pixels (6 rows)
-#define OSDSPACING                5
-#define OSDROUNDING               10
+#define OSDSYMBOL(id)             femonSymbols.Get(id)
+#define OSDSPACING                femonSymbols.GetSpacing()
+#define OSDROUNDING               femonSymbols.GetRounding()
 #define IS_OSDROUNDING            (femonConfig.skin == eFemonSkinElchi)
 #define IS_OSDRESOLUTION(r1, r2)  (abs(r1 - r2) < 20)
 #define OSDINFOWIN_Y(offset)      (femonConfig.position ? (OSDHEIGHT - OSDINFOHEIGHT + offset) : offset)
@@ -144,6 +145,7 @@ public:
   virtual int Width(const char *s) const { return 50; }
   virtual int Height(void) const { return 20; }
   virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {}
+  virtual void DrawText(cPixmap *Pixmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {}
 };
 
 cFemonOsd *cFemonOsd::pInstance = NULL;
@@ -192,12 +194,13 @@ cFemonOsd::cFemonOsd()
   memset(&m_FrontendStatus, 0, sizeof(m_FrontendStatus));
   memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
   m_SvdrpConnection.handle = -1;
+  femonSymbols.Refresh();
   m_Font = cFont::CreateFont(Setup.FontSml, min(max(Setup.FontSmlSize, MINFONTSIZE), MAXFONTSIZE));
   if (!m_Font || !m_Font->Height()) {
      m_Font = new cFemonDummyFont;
      error("cFemonOsd::cFemonOsd() cannot create required font.");
      }
-  tmp = 5 * bmSymbol[SYMBOL_LOCK].Width() + 6 * OSDSPACING;
+  tmp = 5 * OSDSYMBOL(SYMBOL_LOCK).Width() + 6 * OSDSPACING;
   if (OSDWIDTH < tmp) {
      error("cFemonOsd::cFemonOsd() OSD width (%d) smaller than required (%d).", OSDWIDTH, tmp);
      OSDWIDTH = tmp;
@@ -248,84 +251,84 @@ void cFemonOsd::DrawStatusWindow(void)
   if (m_Osd && channel) {
      OSDDRAWSTATUSTITLEBAR(*cString::sprintf("%d%s %s", m_Number ? m_Number : channel->Number(), m_Number ? "-" : "", channel->ShortName(true)));
      if (m_SvdrpFrontend >= 0) {
-        bm = &bmSymbol[SYMBOL_SVDRP];
+        bm = &OSDSYMBOL(SYMBOL_SVDRP);
         OSDDRAWSTATUSBM(OSDSPACING);
         }
      switch (cDevice::ActualDevice()->CardIndex()) {
-       case 1:  bm = &bmSymbol[SYMBOL_ONE];   break;
-       case 2:  bm = &bmSymbol[SYMBOL_TWO];   break;
-       case 3:  bm = &bmSymbol[SYMBOL_THREE]; break;
-       case 4:  bm = &bmSymbol[SYMBOL_FOUR];  break;
-       case 5:  bm = &bmSymbol[SYMBOL_FIVE];  break;
-       case 6:  bm = &bmSymbol[SYMBOL_SIX];   break;
-       case 7:  bm = &bmSymbol[SYMBOL_SEVEN]; break;
-       case 8:  bm = &bmSymbol[SYMBOL_EIGHT]; break;
-       default: bm = &bmSymbol[SYMBOL_ZERO];  break;
+       case 1:  bm = &OSDSYMBOL(SYMBOL_ONE);   break;
+       case 2:  bm = &OSDSYMBOL(SYMBOL_TWO);   break;
+       case 3:  bm = &OSDSYMBOL(SYMBOL_THREE); break;
+       case 4:  bm = &OSDSYMBOL(SYMBOL_FOUR);  break;
+       case 5:  bm = &OSDSYMBOL(SYMBOL_FIVE);  break;
+       case 6:  bm = &OSDSYMBOL(SYMBOL_SIX);   break;
+       case 7:  bm = &OSDSYMBOL(SYMBOL_SEVEN); break;
+       case 8:  bm = &OSDSYMBOL(SYMBOL_EIGHT); break;
+       default: bm = &OSDSYMBOL(SYMBOL_ZERO);  break;
        }
      OSDDRAWSTATUSBM(OSDSPACING);
-     bm = &bmSymbol[SYMBOL_DEVICE];
+     bm = &OSDSYMBOL(SYMBOL_DEVICE);
      OSDDRAWSTATUSBM(0);
      if (IS_AUDIO_TRACK(track)) {
         switch (int(track - ttAudioFirst)) {
-           case 1:  bm = &bmSymbol[SYMBOL_ONE];   break;
-           case 2:  bm = &bmSymbol[SYMBOL_TWO];   break;
-           case 3:  bm = &bmSymbol[SYMBOL_THREE]; break;
-           case 4:  bm = &bmSymbol[SYMBOL_FOUR];  break;
-           case 5:  bm = &bmSymbol[SYMBOL_FIVE];  break;
-           case 6:  bm = &bmSymbol[SYMBOL_SIX];   break;
-           case 7:  bm = &bmSymbol[SYMBOL_SEVEN]; break;
-           case 8:  bm = &bmSymbol[SYMBOL_EIGHT]; break;
-           default: bm = &bmSymbol[SYMBOL_ZERO];  break;
+           case 1:  bm = &OSDSYMBOL(SYMBOL_ONE);   break;
+           case 2:  bm = &OSDSYMBOL(SYMBOL_TWO);   break;
+           case 3:  bm = &OSDSYMBOL(SYMBOL_THREE); break;
+           case 4:  bm = &OSDSYMBOL(SYMBOL_FOUR);  break;
+           case 5:  bm = &OSDSYMBOL(SYMBOL_FIVE);  break;
+           case 6:  bm = &OSDSYMBOL(SYMBOL_SIX);   break;
+           case 7:  bm = &OSDSYMBOL(SYMBOL_SEVEN); break;
+           case 8:  bm = &OSDSYMBOL(SYMBOL_EIGHT); break;
+           default: bm = &OSDSYMBOL(SYMBOL_ZERO);  break;
            }
         OSDDRAWSTATUSBM(OSDSPACING);
         switch (cDevice::PrimaryDevice()->GetAudioChannel()) {
-           case 1:  bm = &bmSymbol[SYMBOL_MONO_LEFT];  break;
-           case 2:  bm = &bmSymbol[SYMBOL_MONO_RIGHT]; break;
-           default: bm = &bmSymbol[SYMBOL_STEREO];     break;
+           case 1:  bm = &OSDSYMBOL(SYMBOL_MONO_LEFT);  break;
+           case 2:  bm = &OSDSYMBOL(SYMBOL_MONO_RIGHT); break;
+           default: bm = &OSDSYMBOL(SYMBOL_STEREO);     break;
            }
         OSDDRAWSTATUSBM(0);
         }
      else if (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) {
-        if      (m_Receiver->AC3_5_1()) bm = &bmSymbol[SYMBOL_DD51];
-        else if (m_Receiver->AC3_2_0()) bm = &bmSymbol[SYMBOL_DD20];
-        else                            bm = &bmSymbol[SYMBOL_DD];
+        if      (m_Receiver->AC3_5_1()) bm = &OSDSYMBOL(SYMBOL_DD51);
+        else if (m_Receiver->AC3_2_0()) bm = &OSDSYMBOL(SYMBOL_DD20);
+        else                            bm = &OSDSYMBOL(SYMBOL_DD);
         OSDDRAWSTATUSBM(OSDSPACING);
         }
      if (m_Receiver) {
         if (IS_OSDRESOLUTION(m_Receiver->VideoVerticalSize(), 1080))
-           bm = &bmSymbol[SYMBOL_FORMAT_1080];
+           bm = &OSDSYMBOL(SYMBOL_FORMAT_1080);
         else if (IS_OSDRESOLUTION(m_Receiver->VideoVerticalSize(), 720))
-           bm = &bmSymbol[SYMBOL_FORMAT_720];
+           bm = &OSDSYMBOL(SYMBOL_FORMAT_720);
         else if (IS_OSDRESOLUTION(m_Receiver->VideoVerticalSize(), 576))
-           bm = &bmSymbol[SYMBOL_FORMAT_576];
+           bm = &OSDSYMBOL(SYMBOL_FORMAT_576);
         else if (IS_OSDRESOLUTION(m_Receiver->VideoVerticalSize(), 480))
-           bm = &bmSymbol[SYMBOL_FORMAT_480];
+           bm = &OSDSYMBOL(SYMBOL_FORMAT_480);
         else
            bm = NULL;
         OSDDRAWSTATUSBM(OSDSPACING);
         switch (m_Receiver->VideoCodec()) {
-           case VIDEO_CODEC_MPEG2: bm = &bmSymbol[SYMBOL_MPEG2]; break;
-           case VIDEO_CODEC_H264:  bm = &bmSymbol[SYMBOL_H264];  break;
-           default:                bm = NULL;                    break;
+           case VIDEO_CODEC_MPEG2: bm = &OSDSYMBOL(SYMBOL_MPEG2); break;
+           case VIDEO_CODEC_H264:  bm = &OSDSYMBOL(SYMBOL_H264);  break;
+           default:                bm = NULL;                     break;
            }
         OSDDRAWSTATUSBM(OSDSPACING);
         switch (m_Receiver->VideoFormat()) {
-           case VIDEO_FORMAT_PAL:  bm = &bmSymbol[SYMBOL_PAL];  break;
-           case VIDEO_FORMAT_NTSC: bm = &bmSymbol[SYMBOL_NTSC]; break;
-           default:                bm = NULL;                   break;
+           case VIDEO_FORMAT_PAL:  bm = &OSDSYMBOL(SYMBOL_PAL);  break;
+           case VIDEO_FORMAT_NTSC: bm = &OSDSYMBOL(SYMBOL_NTSC); break;
+           default:                bm = NULL;                    break;
            }
         OSDDRAWSTATUSBM(OSDSPACING);
         switch (m_Receiver->VideoAspectRatio()) {
-           case VIDEO_ASPECT_RATIO_1_1:    bm = &bmSymbol[SYMBOL_AR_1_1];    break;
-           case VIDEO_ASPECT_RATIO_4_3:    bm = &bmSymbol[SYMBOL_AR_4_3];    break;
-           case VIDEO_ASPECT_RATIO_16_9:   bm = &bmSymbol[SYMBOL_AR_16_9];   break;
-           case VIDEO_ASPECT_RATIO_2_21_1: bm = &bmSymbol[SYMBOL_AR_2_21_1]; break;
-           default:                        bm = NULL;                        break;
+           case VIDEO_ASPECT_RATIO_1_1:    bm = &OSDSYMBOL(SYMBOL_AR_1_1);    break;
+           case VIDEO_ASPECT_RATIO_4_3:    bm = &OSDSYMBOL(SYMBOL_AR_4_3);    break;
+           case VIDEO_ASPECT_RATIO_16_9:   bm = &OSDSYMBOL(SYMBOL_AR_16_9);   break;
+           case VIDEO_ASPECT_RATIO_2_21_1: bm = &OSDSYMBOL(SYMBOL_AR_2_21_1); break;
+           default:                        bm = NULL;                         break;
            }
         OSDDRAWSTATUSBM(OSDSPACING);
         }
      if (channel->Ca() > 0xFF) {
-        bm = &bmSymbol[SYMBOL_ENCRYPTED];
+        bm = &OSDSYMBOL(SYMBOL_ENCRYPTED);
         OSDDRAWSTATUSBM(OSDSPACING);
         }
      offset += OSDROWHEIGHT;
@@ -344,14 +347,14 @@ void cFemonOsd::DrawStatusWindow(void)
                          *cString::sprintf("%s:", (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) ? tr("AC-3") : tr("Audio")),
                          *getBitrateKbits(m_Receiver ? ((m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) ? m_Receiver->AC3Bitrate() : m_Receiver->AudioBitrate()) : (m_SvdrpFrontend >= 0 ? m_SvdrpAudioBitrate : -1.0)));
      offset += OSDROWHEIGHT;
-     x = bmSymbol[SYMBOL_LOCK].Width();
-     y = (OSDROWHEIGHT - bmSymbol[SYMBOL_LOCK].Height()) / 2;
+     x = OSDSYMBOL(SYMBOL_LOCK).Width();
+     y = (OSDROWHEIGHT - OSDSYMBOL(SYMBOL_LOCK).Height()) / 2;
      if (m_FrontendStatusValid) {
-        OSDDRAWSTATUSFRONTEND(1, bmSymbol[SYMBOL_LOCK],    FE_HAS_LOCK);
-        OSDDRAWSTATUSFRONTEND(2, bmSymbol[SYMBOL_SIGNAL],  FE_HAS_SIGNAL);
-        OSDDRAWSTATUSFRONTEND(3, bmSymbol[SYMBOL_CARRIER], FE_HAS_CARRIER);
-        OSDDRAWSTATUSFRONTEND(4, bmSymbol[SYMBOL_VITERBI], FE_HAS_VITERBI);
-        OSDDRAWSTATUSFRONTEND(5, bmSymbol[SYMBOL_SYNC],    FE_HAS_SYNC);
+        OSDDRAWSTATUSFRONTEND(1, OSDSYMBOL(SYMBOL_LOCK),    FE_HAS_LOCK);
+        OSDDRAWSTATUSFRONTEND(2, OSDSYMBOL(SYMBOL_SIGNAL),  FE_HAS_SIGNAL);
+        OSDDRAWSTATUSFRONTEND(3, OSDSYMBOL(SYMBOL_CARRIER), FE_HAS_CARRIER);
+        OSDDRAWSTATUSFRONTEND(4, OSDSYMBOL(SYMBOL_VITERBI), FE_HAS_VITERBI);
+        OSDDRAWSTATUSFRONTEND(5, OSDSYMBOL(SYMBOL_SYNC),    FE_HAS_SYNC);
         }
      OSDDRAWSTATUSBOTTOMBAR();
      m_Osd->Flush();
@@ -697,7 +700,7 @@ bool cFemonOsd::DeviceSwitch(int direction)
      cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
      if (channel) {
         for (int i = 0; i < cDevice::NumDevices() - 1; i++) {
-           if (direction) {
+           if (direction >= 0) {
               if (++device >= cDevice::NumDevices())
                  device = 0;
               }

femonreceiver.c

@@ -18,6 +18,7 @@ cFemonReceiver::cFemonReceiver(int Vtype, int Vpid, int Apid, int Dpid)
   m_DetectH264(this),
   m_DetectMPEG(this, this),
   m_DetectAAC(this),
+  m_DetectLATM(this),
   m_DetectAC3(this),
   m_VideoBuffer(KILOBYTE(512), TS_SIZE, false, "Femon video"),
   m_VideoType(Vtype),
@@ -144,7 +145,7 @@ void cFemonReceiver::Action(void)
     while (Data = m_VideoBuffer.Get(Length)) {
       if (!m_Active || (Length < TS_SIZE))
          break;
-      Length = TS_SIZE;      
+      Length = TS_SIZE;
       if (*Data != TS_SYNC_BYTE) {
          for (int i = 1; i < Length; ++i) {
              if (Data[i] == TS_SYNC_BYTE) {
@@ -181,7 +182,7 @@ void cFemonReceiver::Action(void)
     while (Data = m_AudioBuffer.Get(Length)) {
       if (!m_Active || (Length < TS_SIZE))
          break;
-      Length = TS_SIZE;      
+      Length = TS_SIZE;
       if (*Data != TS_SYNC_BYTE) {
          for (int i = 1; i < Length; ++i) {
              if (Data[i] == TS_SYNC_BYTE) {
@@ -194,7 +195,7 @@ void cFemonReceiver::Action(void)
          }
       processed = true;
       if (const uint8_t *p = m_AudioAssembler.GetPes(len)) {
-         if (m_DetectAAC.processAudio(p, len) || m_DetectMPEG.processAudio(p, len))
+         if (m_DetectAAC.processAudio(p, len) || m_DetectLATM.processAudio(p, len) || m_DetectMPEG.processAudio(p, len))
             m_AudioValid = true;
          m_AudioAssembler.Reset();
          }
@@ -206,7 +207,7 @@ void cFemonReceiver::Action(void)
     while (Data = m_AC3Buffer.Get(Length)) {
       if (!m_Active || (Length < TS_SIZE))
          break;
-      Length = TS_SIZE;      
+      Length = TS_SIZE;
       if (*Data != TS_SYNC_BYTE) {
          for (int i = 1; i < Length; ++i) {
              if (Data[i] == TS_SYNC_BYTE) {

femonreceiver.h

@@ -14,6 +14,7 @@
 #include "femonh264.h"
 #include "femonmpeg.h"
 #include "femonaac.h"
+#include "femonlatm.h"
 #include "femonac3.h"
 #include "femonaudio.h"
 #include "femonvideo.h"
@@ -28,6 +29,7 @@ private:
   cFemonH264        m_DetectH264;
   cFemonMPEG        m_DetectMPEG;
   cFemonAAC         m_DetectAAC;
+  cFemonLATM        m_DetectLATM;
   cFemonAC3         m_DetectAC3;
 
   cRingBufferLinear m_VideoBuffer;

femonsymbol.c

@@ -5,6 +5,8 @@
  *
  */
 
+#include <vdr/device.h>
+#include "femontools.h"
 #include "femonsymbol.h"
 
 #include "symbols/stereo.xpm"
@@ -43,41 +45,140 @@
 #include "symbols/format576.xpm"
 #include "symbols/format480.xpm"
 
-cBitmap bmSymbol[SYMBOL_MAX_COUNT] =
+static cBitmap bmStereo(stereo_xpm);
+static cBitmap bmMonoLeft(monoleft_xpm);
+static cBitmap bmMonoRight(monoright_xpm);
+static cBitmap bmDolbyDigital(dolbydigital_xpm);
+static cBitmap bmDolbyDigital20(dolbydigital20_xpm);
+static cBitmap bmDolbyDigital51(dolbydigital51_xpm);
+static cBitmap bmMpeg2(mpeg2_xpm);
+static cBitmap bmH264(h264_xpm);
+static cBitmap bmPal(pal_xpm);
+static cBitmap bmNtsc(ntsc_xpm);
+static cBitmap bmEncrypted(encrypted_xpm);
+static cBitmap bmSvdrp(svdrp_xpm);
+static cBitmap bmLock(lock_xpm);
+static cBitmap bmSignal(signal_xpm);
+static cBitmap bmCarrier(carrier_xpm);
+static cBitmap bmViterbi(viterbi_xpm);
+static cBitmap bmSync(sync_xpm);
+static cBitmap bmAspectRatio11(ar11_xpm);
+static cBitmap bmAspectRatio169(ar169_xpm);
+static cBitmap bmAspectRatio2211(ar2211_xpm);
+static cBitmap bmAspectRatio43(ar43_xpm);
+static cBitmap bmDevice(device_xpm);
+static cBitmap bmZero(zero_xpm);
+static cBitmap bmOne(one_xpm);
+static cBitmap bmTwo(two_xpm);
+static cBitmap bmThree(three_xpm);
+static cBitmap bmFour(four_xpm);
+static cBitmap bmFive(five_xpm);
+static cBitmap bmSix(six_xpm);
+static cBitmap bmSeven(seven_xpm);
+static cBitmap bmEight(eight_xpm);
+static cBitmap bmFormat1080(format1080_xpm);
+static cBitmap bmFormat720(format720_xpm);
+static cBitmap bmFormat576(format576_xpm);
+static cBitmap bmFormat480(format480_xpm);
+
+cFemonSymbolCache femonSymbols;
+
+cFemonSymbolCache::cFemonSymbolCache()
+: xFactorM(1.0),
+  yFactorM(1.0),
+  antiAliasM(false)
 {
-  cBitmap(stereo_xpm),         // SYMBOL_STEREO
-  cBitmap(monoleft_xpm),       // SYMBOL_MONO_LEFT
-  cBitmap(monoright_xpm),      // SYMBOL_MONO_RIGHT
-  cBitmap(dolbydigital_xpm),   // SYMBOL_DD
-  cBitmap(dolbydigital20_xpm), // SYMBOL_DD20
-  cBitmap(dolbydigital51_xpm), // SYMBOL_DD51
-  cBitmap(mpeg2_xpm),          // SYMBOL_MPEG2
-  cBitmap(h264_xpm),           // SYMBOL_H264
-  cBitmap(pal_xpm),            // SYMBOL_PAL
-  cBitmap(ntsc_xpm),           // SYMBOL_NTSC
-  cBitmap(encrypted_xpm),      // SYMBOL_ENCRYPTED
-  cBitmap(svdrp_xpm),          // SYMBOL_SVDRP
-  cBitmap(lock_xpm),           // SYMBOL_LOCK
-  cBitmap(signal_xpm),         // SYMBOL_SIGNAL
-  cBitmap(carrier_xpm),        // SYMBOL_CARRIER
-  cBitmap(viterbi_xpm),        // SYMBOL_VITERBI
-  cBitmap(sync_xpm),           // SYMBOL_SYNC
-  cBitmap(ar11_xpm),           // SYMBOL_AR_1_1
-  cBitmap(ar169_xpm),          // SYMBOL_AR_16_9
-  cBitmap(ar2211_xpm),         // SYMBOL_AR_2_21_1
-  cBitmap(ar43_xpm),           // SYMBOL_AR_4_3
-  cBitmap(device_xpm),         // SYMBOL_DEVICE
-  cBitmap(zero_xpm),           // SYMBOL_ZERO
-  cBitmap(one_xpm),            // SYMBOL_ONE
-  cBitmap(two_xpm),            // SYMBOL_TWO
-  cBitmap(three_xpm),          // SYMBOL_THREE
-  cBitmap(four_xpm),           // SYMBOL_FOUR
-  cBitmap(five_xpm),           // SYMBOL_FIVE
-  cBitmap(six_xpm),            // SYMBOL_SIX
-  cBitmap(seven_xpm),          // SYMBOL_SEVEN
-  cBitmap(eight_xpm),          // SYMBOL_EIGHT
-  cBitmap(format1080_xpm),     // SYMBOL_FORMAT_1080
-  cBitmap(format720_xpm),      // SYMBOL_FORMAT_720
-  cBitmap(format576_xpm),      // SYMBOL_FORMAT_576
-  cBitmap(format480_xpm)       // SYMBOL_FORMAT_480
-};
+  Populate();
+}
+
+cFemonSymbolCache::~cFemonSymbolCache()
+{
+  Flush();
+}
+
+void cFemonSymbolCache::Refresh()
+{
+  int width, height;
+  double aspect, xfactor, yfactor;
+  cDevice::PrimaryDevice()->GetOsdSize(width, height, aspect);
+  debug("%s(): %dx%d\n", __PRETTY_FUNCTION__, width, height);
+  xfactor = (double)width / DEFAULT_WIDTH;
+  yfactor = (double)height / DEFAULT_HEIGHT;
+  if (!DoubleEqual(xfactor, xFactorM) || !DoubleEqual(yfactor, yFactorM)) {
+     xFactorM = xfactor;
+     yFactorM = yfactor;
+     Populate();
+     }
+}
+
+bool cFemonSymbolCache::Populate(void)
+{
+  debug("%s(): %.02fx%.02f\n", __PRETTY_FUNCTION__, xFactorM, yFactorM);
+  if (!DoubleEqual(0.0, xFactorM) || !DoubleEqual(0.0, yFactorM)) {
+     Flush();
+
+     // pushing order must follow the enumeration - keep original proportions except for frontend status ones
+     cacheM.Append(bmStereo.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_STEREO
+     cacheM.Append(bmMonoLeft.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_MONO_LEFT
+     cacheM.Append(bmMonoRight.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_MONO_RIGHT
+     cacheM.Append(bmDolbyDigital.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_DD
+     cacheM.Append(bmDolbyDigital20.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_DD20
+     cacheM.Append(bmDolbyDigital51.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_DD51
+     cacheM.Append(bmMpeg2.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_MPEG2
+     cacheM.Append(bmH264.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_H264
+     cacheM.Append(bmPal.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_PAL
+     cacheM.Append(bmNtsc.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_NTSC
+     cacheM.Append(bmEncrypted.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_ENCRYPTED
+     cacheM.Append(bmSvdrp.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_SVDRP
+     cacheM.Append(bmLock.Scaled(xFactorM, yFactorM, antiAliasM)); // SYMBOL_LOCK
+     cacheM.Append(bmSignal.Scaled(xFactorM, yFactorM, antiAliasM)); // SYMBOL_SIGNAL
+     cacheM.Append(bmCarrier.Scaled(xFactorM, yFactorM, antiAliasM)); // SYMBOL_CARRIER
+     cacheM.Append(bmViterbi.Scaled(xFactorM, yFactorM, antiAliasM)); // SYMBOL_VITERBI
+     cacheM.Append(bmSync.Scaled(xFactorM, yFactorM, antiAliasM)); // SYMBOL_SYNC
+     cacheM.Append(bmAspectRatio11.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_AR_1_1
+     cacheM.Append(bmAspectRatio169.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_AR_16_9
+     cacheM.Append(bmAspectRatio2211.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_AR_2_21_1
+     cacheM.Append(bmAspectRatio43.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_AR_4_3
+     cacheM.Append(bmDevice.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_DEVICE
+     cacheM.Append(bmZero.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_ZERO
+     cacheM.Append(bmOne.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_ONE
+     cacheM.Append(bmTwo.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_TWO
+     cacheM.Append(bmThree.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_THREE
+     cacheM.Append(bmFour.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FOUR
+     cacheM.Append(bmFive.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FIVE
+     cacheM.Append(bmSix.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_SIX
+     cacheM.Append(bmSeven.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_SEVEN
+     cacheM.Append(bmEight.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_EIGHT
+     cacheM.Append(bmFormat1080.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_1080
+     cacheM.Append(bmFormat720.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_720
+     cacheM.Append(bmFormat576.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_576
+     cacheM.Append(bmFormat480.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_480
+
+     return true;
+     }
+
+  return false;
+}
+
+bool cFemonSymbolCache::Flush(void)
+{
+  debug("%s()\n", __PRETTY_FUNCTION__);
+  for (int i = 0; i < cacheM.Size(); ++i) {
+      cBitmap *bmp = cacheM[i];
+      DELETENULL(bmp);
+      }
+  cacheM.Clear();
+  return true;
+}
+
+cBitmap& cFemonSymbolCache::Get(eSymbols symbolP)
+{
+  cBitmap *bitmapM = NULL;
+
+  if (symbolP < cacheM.Size())
+     bitmapM = cacheM[symbolP];
+  else
+    error("%s(): Invalid symbol %d\n", __PRETTY_FUNCTION__, symbolP);
+
+  return *bitmapM;
+}

femonsymbol.h

@@ -8,6 +8,7 @@
 #ifndef __FEMONSYMBOL_H
 #define __FEMONSYMBOL_H
 
+#include <vdr/tools.h>
 #include <vdr/osd.h>
 
 enum eSymbols {
@@ -49,6 +50,29 @@ enum eSymbols {
   SYMBOL_MAX_COUNT
   };
 
-extern cBitmap bmSymbol[SYMBOL_MAX_COUNT];
+class cFemonSymbolCache {
+private:
+  enum {
+    DEFAULT_SPACING  = 5,
+    DEFAULT_ROUNDING = 10,
+    DEFAULT_HEIGHT   = 576,
+    DEFAULT_WIDTH    = 720
+    };
+  double xFactorM;
+  double yFactorM;
+  bool antiAliasM;
+  cVector<cBitmap*> cacheM;
+  bool Populate(void);
+  bool Flush(void);
+public:
+  cFemonSymbolCache();
+  ~cFemonSymbolCache();
+  void Refresh();
+  cBitmap& Get(eSymbols symbolP);
+  int GetSpacing()  { return yFactorM * DEFAULT_SPACING; }
+  int GetRounding() { return yFactorM * DEFAULT_ROUNDING; }
+};
+
+extern cFemonSymbolCache femonSymbols;
 
 #endif // __FEMONSYMBOL_H

femontools.c

@@ -294,6 +294,7 @@ cString getAudioCodec(int value)
     case AUDIO_CODEC_MPEG2_II:  return cString::sprintf("%s", tr("MPEG-2 Layer II"));
     case AUDIO_CODEC_MPEG2_III: return cString::sprintf("%s", tr("MPEG-2 Layer III"));
     case AUDIO_CODEC_HEAAC:     return cString::sprintf("%s", tr("HE-AAC"));
+    case AUDIO_CODEC_LATM:      return cString::sprintf("%s", tr("LATM"));
     default:                    break;
     }
   return cString::sprintf("---");

po/de_DE.po

@@ -7,12 +7,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.7\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-02-25 20:31+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Project-Id-Version: vdr-femon 1.7.10\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: Christian Wieninger\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: German <vdr@linuxtv.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -266,6 +267,9 @@ msgstr ""
 msgid "HE-AAC"
 msgstr ""
 
+msgid "LATM"
+msgstr ""
+
 msgid "stereo"
 msgstr ""
 

po/es_ES.po

@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.7\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-02-25 20:31+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Project-Id-Version: vdr-femon 1.7.10\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: Luis Palacios\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Spanish <vdr@linuxtv.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -264,6 +265,9 @@ msgstr ""
 msgid "HE-AAC"
 msgstr ""
 
+msgid "LATM"
+msgstr ""
+
 msgid "stereo"
 msgstr ""
 

po/et_EE.po

@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.7\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-02-25 20:31+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Project-Id-Version: vdr-femon 1.7.10\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: Arthur Konovalov\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Estonian <vdr@linuxtv.org>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -264,6 +265,9 @@ msgstr "MPEG-2 Layer III"
 msgid "HE-AAC"
 msgstr "HE-AAC"
 
+msgid "LATM"
+msgstr "LATM"
+
 msgid "stereo"
 msgstr "stereo"
 

po/fi_FI.po

@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.7\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-02-25 20:31+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Project-Id-Version: vdr-femon 1.7.10\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: Rolf Ahrenberg\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Finnish <vdr@linuxtv.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -264,6 +265,9 @@ msgstr "MPEG-2 kerros III"
 msgid "HE-AAC"
 msgstr "HE-AAC"
 
+msgid "LATM"
+msgstr "LATM"
+
 msgid "stereo"
 msgstr "stereo"
 

po/fr_FR.po

@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.7\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-02-25 20:31+0200\n"
-"PO-Revision-Date: 2008-01-26 09:59+0100\n"
+"Project-Id-Version: vdr-femon 1.7.10\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: NIVAL Micha<68>l <mnival@club-internet.fr>\n"
-"Language-Team:  <vdr@linuxtv.org>\n"
+"Language-Team: French <vdr@linuxtv.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -264,6 +265,9 @@ msgstr ""
 msgid "HE-AAC"
 msgstr ""
 
+msgid "LATM"
+msgstr ""
+
 msgid "stereo"
 msgstr ""
 

po/it_IT.po

@@ -6,15 +6,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.7\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-02-25 20:31+0200\n"
-"PO-Revision-Date: 2008-11-10 23:37+0100\n"
+"Project-Id-Version: vdr-femon 1.7.10\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
-"Language-Team:  <vdr@linuxtv.org>\n"
+"Language-Team: Italian <vdr@linuxtv.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Italian\n"
+"X-Poedit-Country: ITALY\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "Mostra info segnale DVB (OSD)"
@@ -68,13 +72,13 @@ msgid "Hide main menu entry"
 msgstr "Nascondi voce menu principale"
 
 msgid "Define whether the main menu entry is hidden."
-msgstr "Definisci se la voce del menu principale <EFBFBD> nascosta."
+msgstr "Definisci se la voce del menu principale è nascosta."
 
 msgid "Default display mode"
-msgstr "Modalit<EFBFBD> visualizz. predefinita"
+msgstr "Modalità visualizz. predefinita"
 
 msgid "Define the default display mode at startup."
-msgstr "Definisci la modalit<EFBFBD> di visualizz. predefinita all'avvio."
+msgstr "Definisci la modalità di visualizz. predefinita all'avvio."
 
 msgid "Define the used OSD skin."
 msgstr "Definisci lo stile interfaccia OSD utilizzato."
@@ -89,10 +93,10 @@ msgid "Define the position of OSD."
 msgstr "Definisci la posizione dell'OSD."
 
 msgid "Downscale OSD size [%]"
-msgstr ""
+msgstr "Riduci dimensione OSD [%]"
 
 msgid "Define the downscale ratio for OSD size."
-msgstr ""
+msgstr "Definisci il rapporto di riduzione della dimensione OSD."
 
 msgid "Red limit [%]"
 msgstr "Limite rosso [%]"
@@ -110,19 +114,19 @@ msgid "OSD update interval [0.1s]"
 msgstr "Intervallo agg. OSD [0.1s]"
 
 msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-msgstr "Definisci un intervallo per gli agg. OSD. Pi<EFBFBD> piccolo <EFBFBD> l'intervallo maggiore sar<EFBFBD> l'uso di CPU."
+msgstr "Definisci un intervallo per gli agg. OSD. Più piccolo è l'intervallo maggiore sarà l'uso di CPU."
 
 msgid "Analyze stream"
 msgstr "Analizza flusso"
 
 msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr "Definisci se il flusso DVB <EFBFBD> analizzato e i bitrate calcolati."
+msgstr "Definisci se il flusso DVB è analizzato e i bitrate calcolati."
 
 msgid "Calculation interval [0.1s]"
 msgstr "Intervallo di calcolo [0.1s]"
 
 msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr "Definisci un intervallo di calcolo. L'intervallo pi<EFBFBD> grande genera valori pi<EFBFBD> stabili."
+msgstr "Definisci un intervallo di calcolo. L'intervallo più grande genera valori più stabili."
 
 msgid "Use SVDRP service"
 msgstr "Utilizza servizio SVDRP"
@@ -203,7 +207,7 @@ msgid "Audio Stream"
 msgstr "Flusso audio"
 
 msgid "Channel Mode"
-msgstr "Modalit<EFBFBD> canale"
+msgstr "Modalità canale"
 
 msgid "Sampling Frequency"
 msgstr "Frequenza campionamento"
@@ -212,10 +216,10 @@ msgid "AC-3 Stream"
 msgstr "Flusso AC-3"
 
 msgid "Bit Stream Mode"
-msgstr "Modalit<EFBFBD> bitstream"
+msgstr "Modalità bitstream"
 
 msgid "Audio Coding Mode"
-msgstr "Modalit<EFBFBD> codifica audio"
+msgstr "Modalità codifica audio"
 
 msgid "Center Mix Level"
 msgstr "Livello sonoro centrale"
@@ -224,7 +228,7 @@ msgid "Surround Mix Level"
 msgstr "Livello sonoro surround"
 
 msgid "Dolby Surround Mode"
-msgstr "Modalit<EFBFBD> Dolby Surround"
+msgstr "Modalità Dolby Surround"
 
 msgid "Low Frequency Effects"
 msgstr "Effetti bassa frequenza"
@@ -265,6 +269,9 @@ msgstr "MPEG-2 Layer III"
 msgid "HE-AAC"
 msgstr "HE-AAC"
 
+msgid "LATM"
+msgstr "LATM"
+
 msgid "stereo"
 msgstr "stereo"
 

po/lt_LT.po

@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.7\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-02-25 20:31+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
-"Last-Translator: Valdemaras Pipiras\n"
-"Language-Team: <varas@ambernet.lt>\n"
+"Project-Id-Version: vdr-femon 1.7.10\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
+"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
+"Language-Team: Lithuanian <vdr@linuxtv.org>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -264,6 +265,9 @@ msgstr "MPEG-2 Layer III"
 msgid "HE-AAC"
 msgstr "HE-AAC"
 
+msgid "LATM"
+msgstr "LATM"
+
 msgid "stereo"
 msgstr "stereo"
 

po/ru_RU.po

@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.7\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-02-25 20:31+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Project-Id-Version: vdr-femon 1.7.10\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: Vyacheslav Dikonov\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Russian <vdr@linuxtv.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -264,6 +265,9 @@ msgstr ""
 msgid "HE-AAC"
 msgstr ""
 
+msgid "LATM"
+msgstr ""
+
 msgid "stereo"
 msgstr ""
 

po/zh_CN.po

@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.7\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-02-25 20:31+0200\n"
-"PO-Revision-Date: 2009-09-21 21:36+0800\n"
+"Project-Id-Version: vdr-femon 1.7.10\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: NanFeng <nfgx@21cn.com>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -264,6 +265,9 @@ msgstr "MPEG-2 Layer III"
 msgid "HE-AAC"
 msgstr "HE-AAC"
 
+msgid "LATM"
+msgstr "LATM"
+
 msgid "stereo"
 msgstr "立体声"
 

po/zh_TW.po

@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.7\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2010-02-25 20:31+0200\n"
-"PO-Revision-Date: 2009-09-21 21:36+0800\n"
+"Project-Id-Version: vdr-femon 1.7.10\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: NanFeng <nfgx@21cn.com>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Chinese (traditional) <vdr@linuxtv.org>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -264,6 +265,9 @@ msgstr "MPEG-2 Layer III"
 msgid "HE-AAC"
 msgstr "HE-AAC"
 
+msgid "LATM"
+msgstr "LATM"
+
 msgid "stereo"
 msgstr "立體聲"