Updated for a new release version.

Updated for vdr-1.7.26.
Updated for vdr-1.7.25.
2023-10-10 11:36:53 +00:00 · 2012-03-10 23:07:03 +02:00 · 2012-03-10 23:05:38 +02:00 · 2012-03-03 15:19:18 +02:00 · 2012-02-26 22:54:18 +02:00 · 2012-02-19 18:54:19 +02:00
18 changed files with 231 additions and 144 deletions
--- a/9
+++ b/9
@@ -427,3 +427,12 @@ VDR Plugin 'femon' Revision History
 - Updated for vdr-1.7.23.
 - Updated SVDRP interface.
 - Added Hungarian translation (Thanks to Fuley Istvan).
+
+2012-02-05: Version 1.7.13
+
+- Added initial support for PVRINPUT devices (Thanks to Winfried Köhler).
+- Added initial support for IPTV devices.
+
+2012-03-10: Version 1.7.14
+
+- Updated for vdr-1.7.26.
--- a/11
+++ b/11
@@ -19,6 +19,7 @@ PLUGIN = femon
 ### The version number of this plugin (taken from the main source file):

 VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+GITTAG  = $(shell git describe --always 2>/dev/null)

 ### The C++ compiler and options:

@@ -28,9 +29,9 @@ LDFLAGS  ?= -Wl,--as-needed

 ### The directory environment:

-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp

 ### Make sure that necessary options are included:

@@ -59,6 +60,10 @@ ifdef FEMON_DEBUG
 DEFINES += -DDEBUG
 endif

+ifneq ($(strip $(GITTAG)),)
+DEFINES += -DGITVERSION='"-GIT-$(GITTAG)"'
+endif
+
 .PHONY: all all-redirect
 all-redirect: all

--- a/femon.c
+++ b/femon.c
@@ -14,11 +14,15 @@
 #include "femonservice.h"
 #include "femontools.h"

-#if defined(APIVERSNUM) && APIVERSNUM < 10723
-#error "VDR-1.7.23 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10726
+#error "VDR-1.7.26 API version or greater is required!"
 #endif

-static const char VERSION[]       = "1.7.12";
+#ifndef GITVERSION
+#define GITVERSION ""
+#endif
+
+static const char VERSION[]       = "1.7.14" GITVERSION;
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");

@@ -196,7 +200,7 @@ cString cPluginFemon::SVDRPCommand(const char *Command, const char *Option, int
 {
  cDvbDevice *dev = dynamic_cast<cDvbDevice*>(cDevice::ActualDevice());
  if (*Option && isnumber(Option)) {
-     cDvbDevice *dev2 = dynamic_cast<cDvbDevice*>(cDevice::GetDevice(strtol(Option, NULL, 10)));
+     cDvbDevice *dev2 = dynamic_cast<cDvbDevice*>(cDevice::GetDevice(int(strtol(Option, NULL, 10))));
     if (dev2)
        dev = dev2;
     }
--- a/femonosd.c
+++ b/femonosd.c
@@ -184,6 +184,7 @@ cFemonOsd::cFemonOsd()
  m_UNC(0),
  m_UNCValid(false),
  m_FrontendStatusValid(false),
+  m_DeviceSource(DEVICESOURCE_DVBAPI),
  m_DisplayMode(femonConfig.displaymode),
  m_OsdWidth(cOsd::OsdWidth() * (100 - femonConfig.downscale) / 100),
  m_OsdHeight(cOsd::OsdHeight() * (100 - femonConfig.downscale) / 100),
@@ -199,7 +200,7 @@ cFemonOsd::cFemonOsd()
  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));
+  m_Font = cFont::CreateFont(Setup.FontSml, constrain(Setup.FontSmlSize, MINFONTSIZE, MAXFONTSIZE));
  if (!m_Font || !m_Font->Height()) {
     m_Font = new cFemonDummyFont;
     error("cFemonOsd::cFemonOsd() cannot create required font.");
@@ -549,76 +550,111 @@ void cFemonOsd::Action(void)
    m_SvdrpFrontend = -1;
    m_SvdrpVideoBitrate = -1.0;
    m_SvdrpAudioBitrate = -1.0;
-    if (m_Frontend != -1) {
-       m_Quality = cDevice::ActualDevice()->SignalQuality();
-       m_QualityValid = (m_Quality >= 0);
-       m_Strength = cDevice::ActualDevice()->SignalStrength();
-       m_StrengthValid = (m_Strength >= 0);
-       m_FrontendStatusValid = (ioctl(m_Frontend, FE_READ_STATUS, &m_FrontendStatus) >= 0);
-       m_SignalValid = (ioctl(m_Frontend, FE_READ_SIGNAL_STRENGTH, &m_Signal) >= 0);
-       m_SNRValid = (ioctl(m_Frontend, FE_READ_SNR, &m_SNR) >= 0);
-       m_BERValid = (ioctl(m_Frontend, FE_READ_BER, &m_BER) >= 0);
-       m_UNCValid = (ioctl(m_Frontend, FE_READ_UNCORRECTED_BLOCKS, &m_UNC) >= 0);
-       DrawInfoWindow();
-       DrawStatusWindow();
-       }
-    else if (m_SvdrpConnection.handle >= 0) {
-       cmd.handle = m_SvdrpConnection.handle;
-       m_SvdrpPlugin->Service("SvdrpCommand-v1.0", &cmd);
-       if (cmd.responseCode == 900) {
-          m_StrengthValid = false;
-          m_QualityValid = false;
-          m_FrontendStatusValid = false;
-          m_SignalValid = false;
-          m_SNRValid = false;
-          m_BERValid = false;
-          m_UNCValid = false;
-          for (cLine *line = cmd.reply.First(); line; line = cmd.reply.Next(line)) {
-              const char *s = line->Text();
-	      if (!strncasecmp(s, "CARD:", 5))
-                 m_SvdrpFrontend = (int)strtol(s + 5, NULL, 10);
-              else if (!strncasecmp(s, "STRG:", 5)) {
-                 m_Strength = (int)strtol(s + 5, NULL, 10);
-                 m_StrengthValid = (m_Strength >= 0);
-                 }
-              else if (!strncasecmp(s, "QUAL:", 5)) {
-                 m_Quality = (int)strtol(s + 5, NULL, 10);
-                 m_QualityValid = (m_Quality >= 0);
-                 }
-              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);
-                 m_FrontendStatusValid = true;
-                 }
-              else if (!strncasecmp(s, "SGNL:", 5)) {
-                 m_Signal = (uint16_t)strtol(s + 5, NULL, 16);
-                 m_SignalValid = true;
-                 }
-              else if (!strncasecmp(s, "SNRA:", 5)) {
-                 m_SNR = (uint16_t)strtol(s + 5, NULL, 16);
-                 m_SNRValid = true;
-                 }
-              else if (!strncasecmp(s, "BERA:", 5)) {
-                 m_BER = (uint32_t)strtol(s + 5, NULL, 16);
-                 m_BERValid = true;
-                 }
-              else if (!strncasecmp(s, "UNCB:", 5)) {
-                 m_UNC = (uint32_t)strtol(s + 5, NULL, 16);
-                 m_UNCValid = true;
-                 }
-              else if (!strncasecmp(s, "VIBR:", 5))
-                 m_SvdrpVideoBitrate = (double)strtol(s + 5, NULL, 10);
-              else if (!strncasecmp(s, "AUBR:", 5))
-                 m_SvdrpAudioBitrate = (double)strtol(s + 5, NULL, 10);
+    switch (m_DeviceSource) {
+      case DEVICESOURCE_PVRINPUT:
+           m_Quality = cDevice::ActualDevice()->SignalStrength();
+           m_QualityValid = (m_Quality >= 0);
+           m_Strength = cDevice::ActualDevice()->SignalStrength();
+           m_StrengthValid = (m_Strength >= 0);
+           m_FrontendStatus = (fe_status_t)(m_StrengthValid ? (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 = 0;
+           m_SNRValid = false;
+           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);
+           m_Strength = cDevice::ActualDevice()->SignalStrength();
+           m_StrengthValid = (m_Strength >= 0);
+           m_FrontendStatus = (fe_status_t)(m_StrengthValid ? (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;
+      default:
+      case DEVICESOURCE_DVBAPI:
+           if (m_Frontend != -1) {
+              m_Quality = cDevice::ActualDevice()->SignalQuality();
+              m_QualityValid = (m_Quality >= 0);
+              m_Strength = cDevice::ActualDevice()->SignalStrength();
+              m_StrengthValid = (m_Strength >= 0);
+              m_FrontendStatusValid = (ioctl(m_Frontend, FE_READ_STATUS, &m_FrontendStatus) >= 0);
+              m_SignalValid = (ioctl(m_Frontend, FE_READ_SIGNAL_STRENGTH, &m_Signal) >= 0);
+              m_SNRValid = (ioctl(m_Frontend, FE_READ_SNR, &m_SNR) >= 0);
+              m_BERValid = (ioctl(m_Frontend, FE_READ_BER, &m_BER) >= 0);
+              m_UNCValid = (ioctl(m_Frontend, FE_READ_UNCORRECTED_BLOCKS, &m_UNC) >= 0);
              }
-          }
-       DrawInfoWindow();
-       DrawStatusWindow();
-       }
+           else if (m_SvdrpConnection.handle >= 0) {
+              cmd.handle = m_SvdrpConnection.handle;
+              m_SvdrpPlugin->Service("SvdrpCommand-v1.0", &cmd);
+              if (cmd.responseCode == 900) {
+                 m_StrengthValid = false;
+                 m_QualityValid = false;
+                 m_FrontendStatusValid = false;
+                 m_SignalValid = false;
+                 m_SNRValid = false;
+                 m_BERValid = false;
+                 m_UNCValid = false;
+                 for (cLine *line = cmd.reply.First(); line; line = cmd.reply.Next(line)) {
+                     const char *s = line->Text();
+	             if (!strncasecmp(s, "CARD:", 5))
+                        m_SvdrpFrontend = (int)strtol(s + 5, NULL, 10);
+                     else if (!strncasecmp(s, "STRG:", 5)) {
+                        m_Strength = (int)strtol(s + 5, NULL, 10);
+                        m_StrengthValid = (m_Strength >= 0);
+                        }
+                     else if (!strncasecmp(s, "QUAL:", 5)) {
+                        m_Quality = (int)strtol(s + 5, NULL, 10);
+                        m_QualityValid = (m_Quality >= 0);
+                        }
+                     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);
+                        m_FrontendStatusValid = true;
+                        }
+                     else if (!strncasecmp(s, "SGNL:", 5)) {
+                        m_Signal = (uint16_t)strtol(s + 5, NULL, 16);
+                        m_SignalValid = true;
+                        }
+                     else if (!strncasecmp(s, "SNRA:", 5)) {
+                        m_SNR = (uint16_t)strtol(s + 5, NULL, 16);
+                        m_SNRValid = true;
+                        }
+                     else if (!strncasecmp(s, "BERA:", 5)) {
+                        m_BER = (uint32_t)strtol(s + 5, NULL, 16);
+                        m_BERValid = true;
+                        }
+                     else if (!strncasecmp(s, "UNCB:", 5)) {
+                        m_UNC = (uint32_t)strtol(s + 5, NULL, 16);
+                        m_UNCValid = true;
+                        }
+                     else if (!strncasecmp(s, "VIBR:", 5))
+                        m_SvdrpVideoBitrate = (double)strtol(s + 5, NULL, 10);
+                     else if (!strncasecmp(s, "AUBR:", 5))
+                        m_SvdrpAudioBitrate = (double)strtol(s + 5, NULL, 10);
+                     }
+                 }
+              }
+           break;
+      }
+    DrawInfoWindow();
+    DrawStatusWindow();
    m_Sleep.Wait(max((int)(100 * femonConfig.updateinterval - t.Elapsed()), 3));
    }
 }
@@ -627,26 +663,40 @@ void cFemonOsd::Show(void)
 {
  debug("%s()\n", __PRETTY_FUNCTION__);
  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
-  cDvbDevice *dev = dynamic_cast<cDvbDevice*>(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));
+  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+
+  m_DeviceSource = DEVICESOURCE_DVBAPI;
+  if (channel) {
+     if (channel->IsSourceType('I'))
+        m_DeviceSource = DEVICESOURCE_IPTV;
+     else if (channel->IsSourceType('V'))
+        m_DeviceSource = DEVICESOURCE_PVRINPUT;
+     }
+
+  if (m_DeviceSource == DEVICESOURCE_DVBAPI) {
+     cDvbDevice *dev = dynamic_cast<cDvbDevice*>(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;

  m_Osd = cOsdProvider::NewOsd(m_OsdLeft, m_OsdTop);
  if (m_Osd) {
@@ -667,55 +717,66 @@ void cFemonOsd::Show(void)
        m_Receiver->Deactivate();
        DELETENULL(m_Receiver);
        }
-     if (femonConfig.analyzestream) {
-        cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-        if (channel) {
-           m_Receiver = new cFemonReceiver(channel->Vtype(), channel->Vpid(), channel->Apid(IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0), channel->Dpid(IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0));
-           cDevice::ActualDevice()->AttachReceiver(m_Receiver);
-           }
+     if (femonConfig.analyzestream && channel) {
+        m_Receiver = new cFemonReceiver(channel->Vtype(), channel->Vpid(), channel->Apid(IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0), channel->Dpid(IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0));
+        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
        }
     Start();
     }
 }

-void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
+void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber, bool liveView)
 {
  debug("%s(%d,%d)\n", __PRETTY_FUNCTION__, device->DeviceNumber(), channelNumber);
  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
-  if (!device->IsPrimaryDevice() || !channelNumber || cDevice::PrimaryDevice()->CurrentChannel() != channelNumber)
+  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+
+  if (!liveView || !device->IsPrimaryDevice() || !channelNumber || !channel || channel->Number() != channelNumber)
     return;
-  close(m_Frontend);
-  cDvbDevice *dev = dynamic_cast<cDvbDevice*>(cDevice::ActualDevice());
-  m_Frontend = dev ? open(*cString::sprintf(FRONTEND_DEVICE, dev->Adapter(), dev->Frontend()), O_RDONLY | O_NONBLOCK) : -1;
+
+  m_DeviceSource = DEVICESOURCE_DVBAPI;
+  if (channel) {
+     if (channel->IsSourceType('I'))
+        m_DeviceSource = DEVICESOURCE_IPTV;
+     else if (channel->IsSourceType('V'))
+        m_DeviceSource = DEVICESOURCE_PVRINPUT;
+     }
+
  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));
+     close(m_Frontend);
+     m_Frontend = -1;
+     }
+
+  if (m_DeviceSource == DEVICESOURCE_DVBAPI) {
+     cDvbDevice *dev = dynamic_cast<cDvbDevice*>(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;
        }
     }
-  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) {
-     cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-     if (channel) {
-        m_Receiver = new cFemonReceiver(channel->Vtype(), channel->Vpid(), channel->Apid(IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0), channel->Dpid(IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0));
-        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
-        }
+  if (femonConfig.analyzestream && channel) {
+     m_Receiver = new cFemonReceiver(channel->Vtype(), channel->Vpid(), channel->Apid(IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0), channel->Dpid(IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0));
+     cDevice::ActualDevice()->AttachReceiver(m_Receiver);
     }
 }

@@ -755,13 +816,13 @@ bool cFemonOsd::DeviceSwitch(int direction)
              }
           if (cDevice::GetDevice(device)->ProvidesChannel(channel, 0)) {
              debug("%s(%d) device(%d)\n", __PRETTY_FUNCTION__, direction, device);
-              cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0);
+              cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0, true);
              cControl::Shutdown();
              cDevice::GetDevice(device)->SwitchChannel(channel, true);
              if (cDevice::GetDevice(device) == cDevice::PrimaryDevice())
                 cDevice::GetDevice(device)->ForceTransferMode();
              cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel));
-              cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number());
+              cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number(), true);
              return (true);
              }
           }
--- a/femonosd.h
+++ b/femonosd.h
@@ -24,6 +24,13 @@

 class cFemonOsd : public cOsdObject, public cThread, public cStatus {
 private:
+  enum eDeviceSourceType {
+    DEVICESOURCE_DVBAPI = 0,
+    DEVICESOURCE_IPTV,
+    DEVICESOURCE_PVRINPUT,
+    DEVICESOURCE_COUNT
+    };
+
  static cFemonOsd *pInstance;

  cOsd             *m_Osd;
@@ -51,6 +58,7 @@ private:
  fe_status_t       m_FrontendStatus;
  bool              m_FrontendStatusValid;
  dvb_frontend_info m_FrontendInfo;
+  eDeviceSourceType m_DeviceSource;
  int               m_DisplayMode;
  int               m_OsdWidth;
  int               m_OsdHeight;
@@ -71,7 +79,7 @@ protected:
  cFemonOsd(const cFemonOsd&);
  cFemonOsd& operator= (const cFemonOsd&);
  virtual void Action(void);
-  virtual void ChannelSwitch(const cDevice * device, int channelNumber);
+  virtual void ChannelSwitch(const cDevice *device, int channelNumber, bool liveView);
  virtual void SetAudioTrack(int Index, const char * const *Tracks);

 public:
--- a/femonreceiver.c
+++ b/femonreceiver.c
@@ -142,7 +142,7 @@ void cFemonReceiver::Action(void)
    bool processed = false;

    // process available video data
-    while (Data = m_VideoBuffer.Get(Length)) {
+    while ((Data = m_VideoBuffer.Get(Length))) {
      if (!m_Active || (Length < TS_SIZE))
         break;
      Length = TS_SIZE;
@@ -179,7 +179,7 @@ void cFemonReceiver::Action(void)
      }

    // process available audio data
-    while (Data = m_AudioBuffer.Get(Length)) {
+    while ((Data = m_AudioBuffer.Get(Length))) {
      if (!m_Active || (Length < TS_SIZE))
         break;
      Length = TS_SIZE;
@@ -204,7 +204,7 @@ void cFemonReceiver::Action(void)
      }

    // process available dolby data
-    while (Data = m_AC3Buffer.Get(Length)) {
+    while ((Data = m_AC3Buffer.Get(Length))) {
      if (!m_Active || (Length < TS_SIZE))
         break;
      Length = TS_SIZE;
--- a/femonsymbol.h
+++ b/femonsymbol.h
@@ -77,8 +77,8 @@ public:
  ~cFemonSymbolCache();
  void Refresh();
  cBitmap& Get(eSymbols symbolP);
-  int GetSpacing()  { return yFactorM * DEFAULT_SPACING; }
-  int GetRounding() { return yFactorM * DEFAULT_ROUNDING; }
+  int GetSpacing()  { return int(yFactorM * DEFAULT_SPACING);  }
+  int GetRounding() { return int(yFactorM * DEFAULT_ROUNDING); }
 };

 extern cFemonSymbolCache femonSymbols;
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.14\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"
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.14\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"
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.14\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"
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.14\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"
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.14\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"
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.14\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2010-10-10 10:10+0200\n"
 "PO-Revision-Date: 2010-10-10 10:10+0200\n"
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.14\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"
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.14\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"
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.14\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"
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.14\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"
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.14\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"
Author	SHA1	Message	Date
Rolf Ahrenberg	905b7c0870	Updated for a new release version.	2012-03-10 23:07:03 +02:00
Rolf Ahrenberg	597425a271	Updated for vdr-1.7.26.	2012-03-10 23:05:38 +02:00
Rolf Ahrenberg	86210928b8	Updated for vdr-1.7.25.	2012-03-03 15:19:18 +02:00
Rolf Ahrenberg	c98fe8ca87	Added a GIT tag into the version string.	2012-02-26 22:54:18 +02:00
Rolf Ahrenberg	5598f7cc43	Silenced compilation warnings.	2012-02-19 18:54:19 +02:00
Rolf Ahrenberg	62f1f5f776	Updated Makefile.	2012-02-19 17:48:21 +02:00
Rolf Ahrenberg	8ba74bf5c4	Silenced compilation warnings - again.	2012-02-05 18:21:07 +02:00
Rolf Ahrenberg	38fbb2d47d	Updated translation files.	2012-02-05 14:08:01 +02:00
Rolf Ahrenberg	09cf40f215	Added initial support for PVRINPUT devices (Thanks to Winfried Köhler). Added initial support for IPTV devices.	2012-02-05 14:04:04 +02:00
Rolf Ahrenberg	d809e98052	Silenced a compilation warning.	2012-02-05 11:39:14 +02:00