Added Estonian translations (Thanks to Arthur Konovalov).

Updated for vdr-1.3.19.
Some minor cosmetic fixes.
2023-10-10 11:36:53 +00:00 · 2005-01-24 04:20:00 +02:00 · 2005-01-23 04:20:00 +02:00 · 2005-01-23 04:20:00 +02:00 · 2005-01-15 04:20:00 +02:00 · 2004-11-28 04:20:00 +02:00
31 changed files with 3115 additions and 162 deletions
--- a/87
+++ b/87
@@ -1,5 +1,6 @@
+===================================
 VDR Plugin 'femon' Revision History
-----------------------------------
+===================================

 2004-02-15: Version 0.0.1

@@ -43,9 +44,89 @@ VDR Plugin 'femon' Revision History

 2004-04-04: Version 0.0.3c

- Fixed minor bitrate calculation errors
- Added russian translation (Thanks to Vyacheslav Dikonov)
+- Fixed minor bitrate calculation errors.
+- Added russian translation (Thanks to Vyacheslav Dikonov).
+
+2004-05-31: Version 0.0.4
+
+- Backported "stream information" feature (from version 0.1.1).
+
+2004-06-06: Version 0.0.5
+
+- Backported changes and fixes from version 0.1.2.
+
+2004-06-11: Version 0.0.6
+
+- Backported the "AC3 Stream Information" feature from version 0.1.3.
+
+2004-09-11: Version 0.0.7
+
+-  Backported changes and fixes from version 0.1.6.
+
+===================================
+VDR Plugin 'femon' Revision History
+===================================

 2004-05-18: Version 0.1.0

 - Updated for vdr-1.3.7 and removed compability with older versions.
+
+2004-05-30: Version 0.1.1
+
+- Added "Stream Information" display mode.
+  Toggle between different modes with 'OK' key:
+  .-> basic -> transponder -> stream -.
+  `-----------------------------------<2D>
+- Added missing german translations (Thanks to Peter Marquardt).
+
+2004-06-06: Version 0.1.2
+
+- Fixed the channel switch bug (reported by Stefan Lucke).
+- Nid/Tid/Rid are now included in translations.
+- Added video format and aspect ratio symbols into status window.
+
+2004-06-11: Version 0.1.3
+
+- Added "AC-3 Stream Information" display mode (Thanks to Lothar Englisch).
+
+2004-06-24: Version 0.1.4
+
+- Added some new symbols and beautified the old ones.
+- Added audio track selection feature.
+- Added preliminary device switching feature (disabled at the moment).
+
+2004-08-18: Version 0.1.5
+
+- Fixed OSDSTATUSWIN_XC define.
+- Added preliminary NTSC support (make NTSC_SYSTEM=1 plugins).
+- Fixed "Setup/OSD/Use Small Fonts" bug (Thanks to Winni for reporting this one).
+- Added patches directory: CA system names by Lauri Tischler.
+
+2004-09-11: Version 0.1.6
+
+- Yet Another Minor Release.
+- Integrated the CA system names patch: "Setup / Show CA System".
+
+2004-11-28: Version 0.1.7
+
+- Updated for vdr-1.3.17.
+- Fixed receiver related crash (Thanks to Marco Schluessler).
+
+2005-01-15: Version 0.7.7
+
+- Updated for vdr-1.3.18.
+- Added DEBUG mode (make DEBUG=1 plugins).
+- OSD height is now user configurable.
+- Added audio channel selection into Yellow key.
+
+2005-01-23: Version 0.7.9
+
+- Some minor cosmetic fixes.
+
+2005-01-23: Version 0.8.0
+
+- Updated for vdr-1.3.19.
+
+2005-01-24: Version 0.8.1
+
+- Added Estonian translations (Thanks to Arthur Konovalov).
--- a/8
+++ b/8
@@ -11,12 +11,12 @@ 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')
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).h | awk '{ print $$6 }' | sed -e 's/[";]//g')

 ### The C++ compiler and options:

 CXX      ?= g++
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -fPIC

 ### The directory environment:

@@ -44,6 +44,10 @@ INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include

 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'

+ifdef NTSC_SYSTEM
+DEFINES += -DNTSC_SYSTEM
+endif
+
 ### The object files (add further files here):

 OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femoni18n.o
--- a/92
+++ b/92
@@ -10,36 +10,86 @@ See the file COPYING for license information.

 Requirements:

-Ph.D. in Astro Physics and preferably a six-pack waiting in a fridge.
-Never trust a Klingon. "Qu'vaD lI' De'vam". Beam me up, Scotty!
-You're number six!
+VDR & DVB. BMW & Ph.D.. BEER. YARRR!

 Description:

 DVB Frontend Status Monitor is a plugin that displays some signal information
 parameters of the current tuned channel on OSD. You can zap through all your
 channels and the plugin should be monitoring always the right frontend. The
-transponder information is also available in advanced display mode. User can
-switch between simple and advanced display modes by pressing 'OK' key.
+transponder and stream information are also available in advanced display modes.

-The plugin is based on a neat console frontend status monitor application called 
-'femon' by Johannes Stezenbach <js@convergence.de> (see DVB-apps/szap/femon.c
-for further information). The other parts of plugin code are borrowed from the 
-excellent 'OSD Picture-In-Picture' plugin by Sascha Volkenandt <sascha@akv-soft.de>
-and Andreas Regel <andreas.regel@powarman.de>. The bitrate calculation algorithm
-originates from the 'dvbstream' application by Dave Chapman <dave@dchapman.com>.
+The plugin is based on a neat console frontend status monitor application
+called 'femon' by Johannes Stezenbach (see DVB-apps/szap/femon.c for further
+information). The other parts of plugin code are borrowed from the excellent
+'OSD Picture-In-Picture' plugin by Sascha Volkenandt and Andreas Regel. The
+bitrate calculation algorithm originates from the 'dvbstream' application by
+Dave Chapman and the stream information routines from the 'libdvb' library by
+Metzler Brothers.

-Shortcomings / Todo list / Notes:
+Terminology:
+
+--------------------------------------------------------------
+|## Channel Name ########################## [AR][VF][A/DD][D]|
+|[=====Signal Strength in % ==============|=================]|
+|[=====Signal-to-Noise Ratio in % ========|=================]|
+| STR: #0000 (0%)       BER: #00000000       Video: 0 Mbit/s |
+| SNR: #0000 (0%)       UNC: #00000000       Audio: 0 kbit/s |
+| [LOCK]     [SIGNAL]     [CARRIER]     [VITERBI]     [SYNC] |
+--------------------------------------------------------------
+
+STR     - Signal strength
+SNR     - Signal-to-noise ratio
+BER     - Bit error rate
+UNC     - Uncorrected blocks
+Video   - Calculated video bitrate in Mbit/s
+Audio   - Calculated audio / AC-3 bitrate in kbit/s
+
+LOCK    - Everything's working...
+SIGNAL  - Found something above the noise level
+CARRIER - Found a DVB signal
+VITERBI - FEC (forward error correction) is stable
+SYNC    - Found sync bytes
+
+AR      - Aspect Ratio: 1:1/4:3/16:9/2.21:1 (optional)
+VF      - Video format: PAL/NTSC (optional)
+A/DD    - Audio (0..5) / AC-3 track (optional)
+D       - Device number: 0..3 (optional)
+
+Controls:
+
+ChanUp/ChanDn - Switch channel up/down
+Up/Down       - Switch channel up/down
+0-9           - Select channel
+Ok            - Switch between display modes: basic, transponder, stream, AC-3
+Green         - Select next audio track
+Yellow        - Select audio channel: stereo, mono left, mono right
+Back          - Exit plugin
+(Left/Right   - Switch to next/previous device that provides the current channel)
+
+Installation:
+
+cd /put/your/path/here/VDR/PLUGINS/src
+tar -xzf /put/your/path/here/vdr-femon-X.Y.Z.tgz
+ln -s femon-X.Y.Z femon
+cd /put/your/path/here/VDR
+make
+make plugins
+./vdr -P femon
+
+Notes:

- The current version is a kind of Proof In Concept to replace the old 'tech
-  patch', and it's now eating many unnecessary cpu clock cycles - this will be
-  fixed later...
 - The plugin supports only those DVB cards with _one_ frontend (do any cards
  with multiple frontends even exist?), because I haven't yet figured howto do
  it without patching the VDR core.
- Sometimes (read always) ttxtsubs plugin messes up the OSD - user should disable
-  ttxtsubs, but closing and reopening the femon plugin might help temporarily as
-  well. Btw., this same thing happens with OSDTeletext plugin too :)
- The stream information is still missing.
- Disable bitrate calculation to speed up heavy zapping sessions.
- If you're using VDR version 1.3.6 or older, you'll have to stick with femon-0.0.3c.
+- Disable the stream analyze to speed up heavy zapping sessions.
+- The signal strength and signal-to-noise ratio values are comparable only
+  between the same brand/model frontends. Due to the lack of proper frontend
+  specifications those values cannot be calculated into any real units.
+- If the OSD isn't visible, you've configured the OSD height too big or too
+  small. Please, try to adjust the variable on the setup page before writing
+  any bug reports.
+- There's a shrinked default OSD height for NTSC users: make NTSC_SYSTEM=1
+- The device switching feature is still non-functional.
+
+"Femon - A real womon who lives according to her natural feminine inclinations."
--- a/femon.c
+++ b/femon.c
@@ -12,7 +12,7 @@
 #include "femonosd.h"
 #include "femon.h"

-#if (VDRVERSNUM < 10307)
+#if VDRVERSNUM && VDRVERSNUM < 10319
 #error "You don't exist! Go away!"
 #endif

@@ -71,19 +71,26 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value)
  else if (!strcasecmp(Name, "SyslogOutput"))   femonConfig.syslogoutput   = atoi(Value);
  else if (!strcasecmp(Name, "DisplayMode"))    femonConfig.displaymode    = atoi(Value);
  else if (!strcasecmp(Name, "Position"))       femonConfig.position       = atoi(Value);
+  else if (!strcasecmp(Name, "OSDHeight"))      femonConfig.osdheight      = 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);
-  else if (!strcasecmp(Name, "ShowBitRate"))    femonConfig.showbitrate    = atoi(Value);
+  else if (!strcasecmp(Name, "AnalStream"))     femonConfig.analyzestream  = atoi(Value);
  else if (!strcasecmp(Name, "CalcInterval"))   femonConfig.calcinterval   = atoi(Value);
  else
    return false;
+  if (femonConfig.displaymode < 0 || femonConfig.displaymode >= modeMaxNumber) femonConfig.displaymode = 0;

  return true;
 }

 cMenuFemonSetup::cMenuFemonSetup(void)
 {
+  dispmodes[modeBasic]       = tr("basic");
+  dispmodes[modeTransponder] = tr("transponder");
+  dispmodes[modeStream]      = tr("stream");
+  dispmodes[modeAC3]         = tr("AC-3");
  Setup();
 }

@@ -92,16 +99,18 @@ void cMenuFemonSetup::Setup(void)
  int current = Current();

  Clear();
-  Add(new cMenuEditBoolItem(  tr("Hide Mainmenu Entry"),         &femonConfig.hidemenu,       tr("no"),     tr("yes")));
-  Add(new cMenuEditBoolItem(  tr("Use Syslog Output"),           &femonConfig.syslogoutput,   tr("no"),     tr("yes")));
-  Add(new cMenuEditBoolItem(  tr("Default Display Mode"),        &femonConfig.displaymode,    tr("simple"), tr("advanced")));
-  Add(new cMenuEditBoolItem(  tr("Position"),                    &femonConfig.position,       tr("bottom"), tr("top")));
-  Add(new cMenuEditIntItem(   tr("Red Limit [%]"),               &femonConfig.redlimit,       1,            50));
-  Add(new cMenuEditIntItem(   tr("Green Limit [%]"),             &femonConfig.greenlimit,     51,           100));
-  Add(new cMenuEditIntItem(   tr("OSD Update Interval [0.1s]"),  &femonConfig.updateinterval, 1,            100));
-  Add(new cMenuEditBoolItem(  tr("Bitrate Calculation"),         &femonConfig.showbitrate,    tr("no"),     tr("yes")));
-  if (femonConfig.showbitrate)
-     Add(new cMenuEditIntItem(tr("Calculation Interval [0.1s]"), &femonConfig.calcinterval,   1,            100));
+  Add(new cMenuEditBoolItem(  tr("Hide Mainmenu Entry"),         &femonConfig.hidemenu,       tr("no"),      tr("yes")));
+  Add(new cMenuEditBoolItem(  tr("Use Syslog Output"),           &femonConfig.syslogoutput,   tr("no"),      tr("yes")));
+  Add(new cMenuEditStraItem(  tr("Default Display Mode"),        &femonConfig.displaymode,    modeMaxNumber, dispmodes));
+  Add(new cMenuEditBoolItem(  tr("Position"),                    &femonConfig.position,       tr("bottom"),  tr("top")));
+  Add(new cMenuEditIntItem(   tr("Height"),                      &femonConfig.osdheight,      400,           500));
+  Add(new cMenuEditBoolItem(  tr("Show CA System"),              &femonConfig.showcasystem,   tr("no"),      tr("yes")));
+  Add(new cMenuEditIntItem(   tr("Red Limit [%]"),               &femonConfig.redlimit,       1,             50));
+  Add(new cMenuEditIntItem(   tr("Green Limit [%]"),             &femonConfig.greenlimit,     51,            100));
+  Add(new cMenuEditIntItem(   tr("OSD Update Interval [0.1s]"),  &femonConfig.updateinterval, 1,             100));
+  Add(new cMenuEditBoolItem(  tr("Analyze Stream"),              &femonConfig.analyzestream,  tr("no"),      tr("yes")));
+  if (femonConfig.analyzestream)
+     Add(new cMenuEditIntItem(tr("Calculation Interval [0.1s]"), &femonConfig.calcinterval,   1,             100));

  SetCurrent(Get(current));
  Display();
@@ -111,22 +120,24 @@ void cMenuFemonSetup::Store(void)
 {
  SetupStore("HideMenu",       femonConfig.hidemenu);
  SetupStore("SyslogOutput",   femonConfig.syslogoutput);
-  SetupStore("Position",       femonConfig.position);
  SetupStore("DisplayMode",    femonConfig.displaymode);
+  SetupStore("Position",       femonConfig.position);
+  SetupStore("OSDHeight",      femonConfig.osdheight);
+  SetupStore("ShowCASystem",   femonConfig.showcasystem);
  SetupStore("RedLimit",       femonConfig.redlimit);
  SetupStore("GreenLimit",     femonConfig.greenlimit);
  SetupStore("UpdateInterval", femonConfig.updateinterval);
-  SetupStore("ShowBitRate",    femonConfig.showbitrate);
+  SetupStore("AnalStream",     femonConfig.analyzestream);
  SetupStore("CalcInterval",   femonConfig.calcinterval);
 }

 eOSState cMenuFemonSetup::ProcessKey(eKeys Key)
 {
-  int oldShowbitrate = femonConfig.showbitrate;
+  int oldAnalyzestream = femonConfig.analyzestream;

  eOSState state = cMenuSetupPage::ProcessKey(Key);

-  if (Key != kNone && (femonConfig.showbitrate != oldShowbitrate)) {
+  if (Key != kNone && (femonConfig.analyzestream != oldAnalyzestream)) {
     Setup();
     }

--- a/femon.h
+++ b/femon.h
@@ -11,7 +11,7 @@

 #include <vdr/plugin.h>

-static const char *VERSION        = "0.1.0";
+static const char *VERSION        = "0.8.1";
 static const char *DESCRIPTION    = "DVB Signal Information Monitor (OSD)";
 static const char *MAINMENUENTRY  = "Signal Information";

@@ -36,6 +36,7 @@ public:

 class cMenuFemonSetup : public cMenuSetupPage {
  private:
+    const char *dispmodes[modeMaxNumber];
    virtual void Setup(void);
  protected:
    virtual eOSState ProcessKey(eKeys Key);
--- a/femoncfg.c
+++ b/femoncfg.c
@@ -18,7 +18,13 @@ cFemonConfig::cFemonConfig(void)
  redlimit       = 33;
  greenlimit     = 66;
  updateinterval = 5;
-  showbitrate    = 1;
+  analyzestream  = 1;
  calcinterval   = 20;
  syslogoutput   = 0;
+  showcasystem   = 0;
+#ifdef NTSC_SYSTEM
+  osdheight      = 420;
+#else
+  osdheight      = 480;
+#endif
 }
--- a/femoncfg.h
+++ b/femoncfg.h
@@ -9,6 +9,20 @@
 #ifndef __FEMONCFG_H
 #define __FEMONCFG_H

+#ifdef DEBUG
+#define debug(x) (x);
+#else
+#define debug(x) ;
+#endif
+
+enum dispModes {
+  modeBasic,
+  modeTransponder,
+  modeStream,
+  modeAC3,
+  modeMaxNumber
+  };
+
 struct cFemonConfig
 {
 public:
@@ -19,9 +33,11 @@ public:
  int redlimit;
  int greenlimit;
  int updateinterval;
-  int showbitrate;
+  int analyzestream;
  int calcinterval;
  int syslogoutput;
+  int showcasystem;
+  int osdheight;
 };

 extern cFemonConfig femonConfig;
--- a/femoni18n.c
+++ b/femoni18n.c
--- a/femonosd.c
+++ b/femonosd.c
@@ -12,48 +12,94 @@
 #include "femonreceiver.h"
 #include "femonosd.h"

-#define FRONTEND_DEVICE        "/dev/dvb/adapter%d/frontend%d"
-#define CHANNELINPUT_TIMEOUT   1000
+#include "symbols/device.xpm"
+#include "symbols/stereo.xpm"
+#include "symbols/monoleft.xpm"
+#include "symbols/monoright.xpm"
+#include "symbols/zero.xpm"
+#include "symbols/one.xpm"
+#include "symbols/two.xpm"
+#include "symbols/three.xpm"
+#include "symbols/four.xpm"
+#include "symbols/five.xpm"
+#include "symbols/ar11.xpm"
+#include "symbols/ar169.xpm"
+#include "symbols/ar2211.xpm"
+#include "symbols/ar43.xpm"
+#include "symbols/ntsc.xpm"
+#include "symbols/pal.xpm"
+#include "symbols/dolbydigital.xpm"
+#include "symbols/dolbydigital20.xpm"
+#include "symbols/dolbydigital51.xpm"

-#define SCREENWIDTH            720 // in pixels
-#define SCREENHEIGHT           576 // in pixels
-#define OSDWIDTH               600 // in pixels
-#define OSDHEIGHT              480 // in pixels
-#define OSDINFOHEIGHT          (m_Font->Height() * 11) // in pixels (11 rows)
-#define OSDSTATUSHEIGHT        (m_Font->Height() * 6)  // in pixels (6 rows)
+#define FRONTEND_DEVICE          "/dev/dvb/adapter%d/frontend%d"
+#define CHANNELINPUT_TIMEOUT     1000

-#define OSDINFOWIN_Y(offset)   (femonConfig.position ? (OSDHEIGHT - OSDINFOHEIGHT + offset) : offset)
-#define OSDINFOWIN_X(col)      ((col == 4) ? 470 : (col == 3) ? 300 : (col==2) ? 180 : 15)
-#define OSDSTATUSWIN_Y(offset) (femonConfig.position ? offset : (OSDHEIGHT - OSDSTATUSHEIGHT + offset))
-#define OSDSTATUSWIN_X(col)    ((col == 4) ? 410 : (col == 3) ? 220 : (col==2) ? 125 : 15)
-#define OSDSTATUSWIN_X2(col)   ((col == 5) ? 520 : (col == 4) ? 390 : (col==3) ? 250 : (col==2) ? 115 : 15)
-#define BARWIDTH(x)            (OSDWIDTH * x / 100)
+#define OSDHEIGHT                femonConfig.osdheight   // in pixels
+#define OSDWIDTH                 600                     // in pixels
+#define OSDINFOHEIGHT            (m_Font->Height() * 11) // in pixels (11 rows)
+#define OSDSTATUSHEIGHT          (m_Font->Height() * 6)  // in pixels (6 rows)

-#define clrBackground          clrGray50 // this should be tied somehow into current theme
+#define OSDINFOWIN_Y(offset)     (femonConfig.position ? (OSDHEIGHT - OSDINFOHEIGHT + offset) : offset)
+#define OSDINFOWIN_X(col)        ((col == 4) ? 455 : (col == 3) ? 305 : (col == 2) ? 155 : 15)
+#define OSDSTATUSWIN_Y(offset)   (femonConfig.position ? offset : (OSDHEIGHT - OSDSTATUSHEIGHT + offset))
+#define OSDSTATUSWIN_X(col)      ((col == 7) ? 475 : (col == 6) ? 410 : (col == 5) ? 275 : (col == 4) ? 220 : (col == 3) ? 125 : (col == 2) ? 70 : 15)
+#define OSDSTATUSWIN_XC(col,txt) (((col - 1) * OSDWIDTH / 5) + ((OSDWIDTH / 5 - m_Font->Width(txt)) / 2))
+#define BARWIDTH(x)              (OSDWIDTH * x / 100)
+#define SPACING                  5
+
+#define clrBackground            clrGray50 // this should be tied somehow into current theme
+
+cBitmap cFemonOsd::bmDevice(device_xpm);
+cBitmap cFemonOsd::bmStereo(stereo_xpm);
+cBitmap cFemonOsd::bmMonoLeft(monoleft_xpm);
+cBitmap cFemonOsd::bmMonoRight(monoright_xpm);
+cBitmap cFemonOsd::bmZero(zero_xpm);
+cBitmap cFemonOsd::bmOne(one_xpm);
+cBitmap cFemonOsd::bmTwo(two_xpm);
+cBitmap cFemonOsd::bmThree(three_xpm);
+cBitmap cFemonOsd::bmFour(four_xpm);
+cBitmap cFemonOsd::bmFive(five_xpm);
+cBitmap cFemonOsd::bmAspectRatio_1_1(ar11_xpm);
+cBitmap cFemonOsd::bmAspectRatio_16_9(ar169_xpm);
+cBitmap cFemonOsd::bmAspectRatio_2_21_1(ar2211_xpm);
+cBitmap cFemonOsd::bmAspectRatio_4_3(ar43_xpm);
+cBitmap cFemonOsd::bmPAL(pal_xpm);
+cBitmap cFemonOsd::bmNTSC(ntsc_xpm);
+cBitmap cFemonOsd::bmDD(dolbydigital_xpm);
+cBitmap cFemonOsd::bmDD20(dolbydigital20_xpm);
+cBitmap cFemonOsd::bmDD51(dolbydigital51_xpm);

 cFemonOsd::cFemonOsd(void)
 :cOsdObject(true), cThread("femon osd")
 {
-  //printf("cFemonOsd::cFemonOsd()\n");
+  debug(printf("cFemonOsd::cFemonOsd()\n"));
  m_Osd = NULL;
  m_Receiver = NULL;
  m_Frontend = -1;
  m_Active = false;
  m_Number = 0;
  m_OldNumber = 0;
-  m_InputTime = 0;
  m_Signal = 0;
  m_SNR = 0;
  m_BER = 0;
  m_UNC = 0;
  m_DisplayMode = femonConfig.displaymode;
-  m_Font = cFont::GetFont(fontSml);
+  m_InputTime.Set(0);
  m_Mutex = new cMutex();
+  if (Setup.UseSmallFont == 0) {
+     // Dirty hack to force the small fonts...
+     Setup.UseSmallFont = 1;
+     m_Font = cFont::GetFont(fontSml);
+     Setup.UseSmallFont = 0;
+     }
+  else
+     m_Font = cFont::GetFont(fontSml);
 }

 cFemonOsd::~cFemonOsd(void)
 {
-  //printf("cFemonOsd::~cFemonOsd()\n");
+  debug(printf("cFemonOsd::~cFemonOsd()\n"));
  if (m_Active) {
     m_Active = false;
     Cancel(3);
@@ -67,18 +113,169 @@ cFemonOsd::~cFemonOsd(void)
 void cFemonOsd::DrawStatusWindow(void)
 {
  cMutexLock lock(m_Mutex);
-  //printf("cFemonOsd::DrawStatusWindow()\n");
+  debug(printf("cFemonOsd::DrawStatusWindow()\n"));
  char buf[128];
  int snr = m_SNR / 655;
  int signal = m_Signal / 655;
  int offset = 0;
+  int x = OSDWIDTH;
+  int y = 0;
+  int value = 0;
+  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());

  if (m_Osd) {
     m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrBackground);
-     snprintf(buf, sizeof(buf), "%d%s %s", m_Number ? m_Number : channel->Number(), m_Number ? "-" : "", channel->Name());
+     snprintf(buf, sizeof(buf), "%d%s %s (%s)", m_Number ? m_Number : channel->Number(), m_Number ? "-" : "", channel->ShortName(true), channel->Provider());
     m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset), OSDWIDTH, OSDSTATUSWIN_Y(offset+m_Font->Height()-1), clrWhite);
     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrBlack, clrWhite, m_Font);
+     if (m_Receiver) {
+        value = cDevice::ActualDevice()->CardIndex();
+        if (value == 1) {
+           x -= bmOne.Width() + SPACING;
+           y = (m_Font->Height() - bmOne.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmOne, clrBlack, clrWhite);
+           }
+        else if (value == 2) {
+           x -= bmTwo.Width() + SPACING;
+           y = (m_Font->Height() - bmTwo.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmTwo, clrBlack, clrWhite);
+           }
+        else if (value == 3) {
+           x -= bmThree.Width() + SPACING;
+           y = (m_Font->Height() - bmThree.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmThree, clrBlack, clrWhite);
+           }
+        else {
+           x -= bmZero.Width() + SPACING;
+           y = (m_Font->Height() - bmZero.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmZero, clrBlack, clrWhite);
+           }
+        x -= bmDevice.Width();
+        y = (m_Font->Height() - bmDevice.Height()) / 2;
+        if (y < 0) y = 0;
+        m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDevice, clrBlack, clrWhite);
+        if (IS_AUDIO_TRACK(track)) {
+           value = int(track - ttAudioFirst);
+           if (value == 1) {
+              x -= bmOne.Width() + SPACING;
+              y = (m_Font->Height() - bmOne.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmOne, clrBlack, clrWhite);
+              }
+           else if (value == 2) {
+              x -= bmTwo.Width() + SPACING;
+              y = (m_Font->Height() - bmTwo.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmTwo, clrBlack, clrWhite);
+              }
+           else if (value == 3) {
+              x -= bmThree.Width() + SPACING;
+              y = (m_Font->Height() - bmThree.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmThree, clrBlack, clrWhite);
+              }
+           else if (value == 4) {
+              x -= bmFour.Width() + SPACING;
+              y = (m_Font->Height() - bmFour.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmFour, clrBlack, clrWhite);
+              }
+           else if (value == 5) {
+              x -= bmFive.Width() + SPACING;
+              y = (m_Font->Height() - bmFive.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmFive, clrBlack, clrWhite);
+              }
+           else {
+              x -= bmZero.Width() + SPACING;
+              y = (m_Font->Height() - bmZero.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmZero, clrBlack, clrWhite);
+              }
+           value = cDevice::PrimaryDevice()->GetAudioChannel();
+           if (value == 1) {
+              x -= bmMonoLeft.Width();
+              y = (m_Font->Height() - bmMonoLeft.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmMonoLeft, clrBlack, clrWhite);
+              }
+           else if (value == 2) {
+              x -= bmMonoRight.Width();
+              y = (m_Font->Height() - bmMonoRight.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmMonoRight, clrBlack, clrWhite);
+              }
+           else {
+              x -= bmStereo.Width();
+              y = (m_Font->Height() - bmStereo.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmStereo, clrBlack, clrWhite);
+              }
+           }
+        else if (m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) {
+           if (m_Receiver->AC3_5_1()) {
+              x -= bmDD51.Width() + SPACING;
+              y = (m_Font->Height() - bmDD51.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDD51, clrBlack, clrWhite);
+              }
+           else if (m_Receiver->AC3_2_0()) {
+              x -= bmDD20.Width() + SPACING;
+              y = (m_Font->Height() - bmDD20.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDD20, clrBlack, clrWhite);
+              }
+           else {
+              x -= bmDD.Width() + SPACING;
+              y = (m_Font->Height() - bmDD.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDD, clrBlack, clrWhite);
+              }
+           }
+        value = m_Receiver->VideoFormat();
+        if (value == VF_PAL) {
+           x -= bmPAL.Width() + SPACING;
+           y = (m_Font->Height() - bmPAL.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmPAL, clrBlack, clrWhite);
+           }
+        else if (value == VF_NTSC) {
+           x -= bmNTSC.Width() + SPACING;
+           y = (m_Font->Height() - bmNTSC.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmNTSC, clrBlack, clrWhite);
+           }
+        value = m_Receiver->VideoAspectRatio();
+        if (value == AR_1_1) {
+           x -= bmAspectRatio_1_1.Width() + SPACING;
+           y = (m_Font->Height() - bmAspectRatio_1_1.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmAspectRatio_1_1, clrBlack, clrWhite);
+           }
+        else if (value == AR_4_3) {
+           x -= bmAspectRatio_4_3.Width() + SPACING;
+           y = (m_Font->Height() - bmAspectRatio_4_3.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmAspectRatio_4_3, clrBlack, clrWhite);
+           }
+        else if (value == AR_16_9) {
+           x -= bmAspectRatio_16_9.Width() + SPACING;
+           y = (m_Font->Height() - bmAspectRatio_16_9.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmAspectRatio_16_9, clrBlack, clrWhite);
+           }
+        else if (value == AR_2_21_1) {
+           x -= bmAspectRatio_2_21_1.Width() + SPACING;
+           y = (m_Font->Height() - bmAspectRatio_2_21_1.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmAspectRatio_2_21_1, clrBlack, clrWhite);
+           }
+        }
     offset += m_Font->Height();
     if (signal > 0) {
        signal = BARWIDTH(signal);
@@ -102,31 +299,39 @@ void cFemonOsd::DrawStatusWindow(void)
           }
        }
     offset += m_Font->Height();
-     snprintf(buf, sizeof(buf), "STR: %04x", m_Signal);
-     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "STR:", clrWhite, clrBackground, m_Font);
+     snprintf(buf, sizeof(buf), "%04x", m_Signal);
+     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
     snprintf(buf, sizeof(buf), "(%2d%%)", m_Signal / 655);
-     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite /*signal < femonConfig.redlimit ? clrRed : signal < femonConfig.greenlimit ? clrYellow : clrGreen*/, clrBackground, m_Font);
-     snprintf(buf, sizeof(buf), "BER: %08x", m_BER);
     m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     if (m_Receiver) snprintf(buf, sizeof(buf), "%s: %.2f %s", tr("Video"), m_Receiver->VideoBitrate(), tr("Mbit/s"));
-     else            snprintf(buf, sizeof(buf), "%s: --- %s", tr("Video"), tr("Mbit/s"));
-     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "BER:", clrWhite, clrBackground, m_Font);
+     snprintf(buf, sizeof(buf), "%08x", m_BER);
+     m_Osd->DrawText(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     snprintf(buf, sizeof(buf), "%s:", tr("Video"));
+     m_Osd->DrawText(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     if (m_Receiver) snprintf(buf, sizeof(buf), "%.2f %s", m_Receiver->VideoBitrate(), tr("Mbit/s"));
+     else            snprintf(buf, sizeof(buf), "--- %s", tr("Mbit/s"));
+     m_Osd->DrawText(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
     offset += m_Font->Height();
-     snprintf(buf, sizeof(buf), "SNR: %04x", m_SNR);
-     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "SNR:", clrWhite, clrBackground, m_Font);
+     snprintf(buf, sizeof(buf), "%04x", m_SNR);
+     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
     snprintf(buf, sizeof(buf), "(%2d%%)", m_SNR / 655);
-     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite /*snr < femonConfig.redlimit ? clrRed : snr < femonConfig.greenlimit ? clrYellow : clrGreen*/, clrBackground, m_Font);
-     snprintf(buf, sizeof(buf), "UNC: %08x", m_UNC);
     m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     if (m_Receiver) snprintf(buf, sizeof(buf), "%s: %.0f %s", tr("Audio"), m_Receiver->AudioBitrate(), tr("kbit/s"));
-     else            snprintf(buf, sizeof(buf), "%s: --- %s", tr("Audio"), tr("kbit/s"));
-     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "UNC:", clrWhite, clrBackground, m_Font);
+     snprintf(buf, sizeof(buf), "%08x", m_UNC);
+     m_Osd->DrawText(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     snprintf(buf, sizeof(buf), "%s:", (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) ? tr("AC-3") : tr("Audio"));
+     m_Osd->DrawText(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     if (m_Receiver) snprintf(buf, sizeof(buf), "%.0f %s", (m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) ? m_Receiver->AC3Bitrate() : m_Receiver->AudioBitrate(), tr("kbit/s"));
+     else            snprintf(buf, sizeof(buf), "--- %s", tr("kbit/s"));
+     m_Osd->DrawText(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
     offset += m_Font->Height();
-     m_Osd->DrawText(OSDSTATUSWIN_X2(1), OSDSTATUSWIN_Y(offset), tr("LOCK"),   (m_FrontendStatus & FE_HAS_LOCK)   ? clrYellow : clrBlack, clrBackground, m_Font);
-     m_Osd->DrawText(OSDSTATUSWIN_X2(2), OSDSTATUSWIN_Y(offset), tr("SIGNAL"), (m_FrontendStatus & FE_HAS_SIGNAL) ? clrYellow : clrBlack, clrBackground, m_Font);
-     m_Osd->DrawText(OSDSTATUSWIN_X2(3), OSDSTATUSWIN_Y(offset), tr("CARRIER"),(m_FrontendStatus & FE_HAS_CARRIER)? clrYellow : clrBlack, clrBackground, m_Font);
-     m_Osd->DrawText(OSDSTATUSWIN_X2(4), OSDSTATUSWIN_Y(offset), tr("VITERBI"),(m_FrontendStatus & FE_HAS_VITERBI)? clrYellow : clrBlack, clrBackground, m_Font);
-     m_Osd->DrawText(OSDSTATUSWIN_X2(5), OSDSTATUSWIN_Y(offset), tr("SYNC"),   (m_FrontendStatus & FE_HAS_SYNC)   ? clrYellow : clrBlack, clrBackground, m_Font);
+     m_Osd->DrawText(OSDSTATUSWIN_XC(1,tr("LOCK")),    OSDSTATUSWIN_Y(offset), tr("LOCK"),   (m_FrontendStatus & FE_HAS_LOCK)   ? clrYellow : clrBlack, clrBackground, m_Font);
+     m_Osd->DrawText(OSDSTATUSWIN_XC(2,tr("SIGNAL")),  OSDSTATUSWIN_Y(offset), tr("SIGNAL"), (m_FrontendStatus & FE_HAS_SIGNAL) ? clrYellow : clrBlack, clrBackground, m_Font);
+     m_Osd->DrawText(OSDSTATUSWIN_XC(3,tr("CARRIER")), OSDSTATUSWIN_Y(offset), tr("CARRIER"),(m_FrontendStatus & FE_HAS_CARRIER)? clrYellow : clrBlack, clrBackground, m_Font);
+     m_Osd->DrawText(OSDSTATUSWIN_XC(4,tr("VITERBI")), OSDSTATUSWIN_Y(offset), tr("VITERBI"),(m_FrontendStatus & FE_HAS_VITERBI)? clrYellow : clrBlack, clrBackground, m_Font);
+     m_Osd->DrawText(OSDSTATUSWIN_XC(5,tr("SYNC")),    OSDSTATUSWIN_Y(offset), tr("SYNC"),   (m_FrontendStatus & FE_HAS_SYNC)   ? clrYellow : clrBlack, clrBackground, m_Font);
     m_Osd->Flush();
     }
 }
@@ -134,15 +339,17 @@ void cFemonOsd::DrawStatusWindow(void)
 void cFemonOsd::DrawInfoWindow(void)
 {
  cMutexLock lock(m_Mutex);
-  //printf("cFemonOsd::DrawInfoWindow()\n");
+  debug(printf("cFemonOsd::DrawInfoWindow()\n"));
  char buf[128];
  char buf2[20];
  int offset = 0;
  int value = 0;
+  double dvalue = 0.0;
  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();

  if (m_Osd) {
-     if (m_DisplayMode) {
+     if (m_DisplayMode == modeTransponder) {
        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground);
        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+m_Font->Height()-1), clrWhite);
        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Transponder Information"), clrBackground, clrWhite, m_Font);
@@ -154,19 +361,93 @@ void cFemonOsd::DrawInfoWindow(void)
        snprintf(buf, sizeof(buf), "%d", channel->Ppid());
        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
        offset += m_Font->Height();
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Apid1"), clrWhite, clrBackground, m_Font);
-        value = channel->Apid2();
-        if (value) snprintf(buf, sizeof(buf), "%d, %d", channel->Apid1(), value);
-        else       snprintf(buf, sizeof(buf), "%d", channel->Apid1());
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Apid"), clrWhite, clrBackground, m_Font);
+        snprintf(buf, sizeof(buf), "%d", channel->Apid(0));
+        value = 1;
+        while (channel->Apid(value) && (value < MAXAPIDS)) {
+           snprintf(buf2, sizeof(buf2), ", %d", channel->Apid(value++));
+           strncat(buf, buf2, sizeof(buf));
+           }
        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Dpid1"), clrWhite, clrBackground, m_Font);
-        value = channel->Dpid2();
-        if (value) snprintf(buf, sizeof(buf), "%d, %d", channel->Dpid1(), value);
-        else       snprintf(buf, sizeof(buf), "%d", channel->Dpid1());
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Dpid"), clrWhite, clrBackground, m_Font);
+        snprintf(buf, sizeof(buf), "%d", channel->Dpid(0));
+        value = 1;
+        while (channel->Dpid(value) && (value < MAXDPIDS)) {
+           snprintf(buf2, sizeof(buf2), ", %d", channel->Dpid(value++));
+           strncat(buf, buf2, sizeof(buf));
+           }
        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
        offset += m_Font->Height();
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("CA"), clrWhite, clrBackground, m_Font);
-        snprintf(buf, sizeof(buf), "%d", channel->Ca());
+        value = channel->Ca();
+        if (femonConfig.showcasystem) {
+           /* http://www.dvb.org/index.php?id=174 */
+           switch (value) {
+             case 0x0000:
+                  /* Reserved */
+                  snprintf(buf, sizeof(buf), "%s", tr("Free to Air"));
+                  break;
+             case 0x0001 ... 0x00FF:
+                  /* Standardized systems */
+                  snprintf(buf, sizeof(buf), "%s", tr("Fixed"));
+                  break;
+             case 0x0100 ... 0x01FF:
+                  /* Canal Plus */
+                  snprintf(buf, sizeof(buf), "%s", tr("SECA/Mediaguard"));
+                  break;
+             case 0x0500 ... 0x05FF:
+                  /* France Telecom */
+                  snprintf(buf, sizeof(buf), "%s", tr("Viaccess"));
+                  break;
+             case 0x0600 ... 0x06FF:
+                  /* Irdeto */
+                  snprintf(buf, sizeof(buf), "%s", tr("Irdeto"));
+                  break;
+             case 0x0900 ... 0x09FF:
+                  /* News Datacom */
+                  snprintf(buf, sizeof(buf), "%s", tr("NDS/Videoguard"));
+                  break;
+             case 0x0B00 ... 0x0BFF:
+                  /* Norwegian Telekom */
+                  snprintf(buf, sizeof(buf), "%s", tr("Conax"));
+                  break;
+             case 0x0D00 ... 0x0DFF:
+                  /* Philips */
+                  snprintf(buf, sizeof(buf), "%s", tr("CryptoWorks"));
+                  break;
+             case 0x0E00 ... 0x0EFF:
+                  /* Scientific Atlanta */
+                  snprintf(buf, sizeof(buf), "%s", tr("PowerVu"));
+                  break;
+             case 0x1200 ... 0x12FF:
+                  /* BellVu Express */
+                  snprintf(buf, sizeof(buf), "%s", tr("NagraVision"));
+                  break;
+             case 0x1700 ... 0x17FF:
+                  /* BetaTechnik */
+                  snprintf(buf, sizeof(buf), "%s", tr("BetaCrypt"));
+                  break;
+             case 0x1800 ... 0x18FF:
+                  /* Kudelski SA */
+                  snprintf(buf, sizeof(buf), "%s", tr("NagraVision"));
+                  break;
+             case 0x4A60 ... 0x4A6F:
+                  /* @Sky */
+                  snprintf(buf, sizeof(buf), "%s", tr("SkyCrypt"));
+                  break;
+             default:
+                  snprintf(buf, sizeof(buf), "%X", value);
+                  break;
+             }
+           }
+        else {
+           snprintf(buf, sizeof(buf), "%X", value);
+           value = 1;
+           while (channel->Ca(value) && (value < MAXCAIDS)) {
+             snprintf(buf2, sizeof(buf2), ", %X", channel->Ca(value++));
+             strncat(buf, buf2, sizeof(buf));
+             }
+           }
        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Tpid"), clrWhite, clrBackground, m_Font);
        snprintf(buf, sizeof(buf), "%d", channel->Tpid());
@@ -175,14 +456,14 @@ void cFemonOsd::DrawInfoWindow(void)
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sid"), clrWhite, clrBackground, m_Font);
        snprintf(buf, sizeof(buf), "%d", channel->Sid());
        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), "Nid", clrWhite, clrBackground, m_Font);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Nid"), clrWhite, clrBackground, m_Font);
        snprintf(buf, sizeof(buf), "%d", channel->Nid());
        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
        offset += m_Font->Height();
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), "Tid" /*tr("Tid")*/, clrWhite, clrBackground, m_Font);
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Tid"), clrWhite, clrBackground, m_Font);
        snprintf(buf, sizeof(buf), "%d", channel->Tid());
        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), "Rid" /*tr("Rid")*/, clrWhite, clrBackground, m_Font);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Rid"), clrWhite, clrBackground, m_Font);
        snprintf(buf, sizeof(buf), "%d", channel->Rid());
        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
        offset += m_Font->Height();
@@ -197,7 +478,7 @@ void cFemonOsd::DrawInfoWindow(void)
               snprintf(buf, sizeof(buf), "%d %s", value, tr("MHz"));
               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_Font);
-               snprintf(buf, sizeof(buf), "%s", cSource::ToString(channel->Source()));
+               snprintf(buf, sizeof(buf), "%s", *cSource::ToString(channel->Source()));
               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
               offset += m_Font->Height();
               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_Font);
@@ -238,7 +519,7 @@ void cFemonOsd::DrawInfoWindow(void)
               snprintf(buf, sizeof(buf), "%d %s", value, tr("MHz"));
               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_Font);
-               snprintf(buf, sizeof(buf), "%s", cSource::ToString(channel->Source()));
+               snprintf(buf, sizeof(buf), "%s", *cSource::ToString(channel->Source()));
               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
               offset += m_Font->Height();
               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_Font);
@@ -361,7 +642,174 @@ void cFemonOsd::DrawInfoWindow(void)
               break;
          }
        }
-     else {
+     else if (m_DisplayMode == modeStream) {
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground);
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+m_Font->Height()-1), clrWhite);
+        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Stream Information"), clrBackground, clrWhite, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Stream"), clrYellow, clrBackground, m_Font);
+        snprintf(buf, sizeof(buf), "#%d", channel->Vpid());
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_Font);
+        if (m_Receiver) snprintf(buf, sizeof(buf), "%.2f %s (%.2f %s)", m_Receiver->VideoStreamBitrate(), tr("Mbit/s"), m_Receiver->VideoBitrate(), tr("Mbit/s"));
+        else            snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Aspect Ratio"), clrWhite, clrBackground, m_Font);
+        if (m_Receiver) {
+           value = m_Receiver->VideoAspectRatio();
+           if      (value == AR_1_1)    snprintf(buf, sizeof(buf), "1:1");
+           else if (value == AR_4_3)    snprintf(buf, sizeof(buf), "4:3");
+           else if (value == AR_16_9)   snprintf(buf, sizeof(buf), "16:9");
+           else if (value == AR_2_21_1) snprintf(buf, sizeof(buf), "2.21:1");
+           else                         snprintf(buf, sizeof(buf), "%s", tr("reserved"));
+           }
+        else                            snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frame Rate"), clrWhite, clrBackground, m_Font);
+        if (m_Receiver) snprintf(buf, sizeof(buf), "%.2f %s", m_Receiver->VideoFrameRate(), tr("Hz"));
+        else            snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Format"), clrWhite, clrBackground, m_Font);
+        if (m_Receiver) {
+           value = m_Receiver->VideoFormat();
+           if      (value == VF_PAL)  snprintf(buf, sizeof(buf), "%s", tr("PAL"));
+           else if (value == VF_NTSC) snprintf(buf, sizeof(buf), "%s", tr("NTSC"));
+           else                       snprintf(buf, sizeof(buf), "%s", tr("unknown"));
+           }
+        else                          snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Resolution"), clrWhite, clrBackground, m_Font);
+        if (m_Receiver) snprintf(buf, sizeof(buf), "%d x %d", m_Receiver->VideoHorizontalSize(), m_Receiver->VideoVerticalSize());
+        else            snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Stream"), clrYellow, clrBackground, m_Font);
+        snprintf(buf, sizeof(buf), "#%d %s", IS_AUDIO_TRACK(track) ? channel->Apid(int(track - ttAudioFirst)) : channel->Apid(0), IS_AUDIO_TRACK(track) ? channel->Alang(int(track - ttAudioFirst)) : channel->Alang(0));
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_Font);
+        if (m_Receiver) {
+           dvalue = m_Receiver->AudioStreamBitrate();
+           if      (dvalue == (double)FR_RESERVED) snprintf(buf, sizeof(buf), "%s (%.0f %s)", tr("reserved"), m_Receiver->AudioBitrate(), tr("kbit/s"));
+           else if (dvalue == (double)FR_FREE)     snprintf(buf, sizeof(buf), "%s (%.0f %s)", tr("free"), m_Receiver->AudioBitrate(), tr("kbit/s"));
+           else                                    snprintf(buf, sizeof(buf), "%.0f %s (%.0f %s)", dvalue, tr("kbit/s"), m_Receiver->AudioBitrate(), tr("kbit/s"));
+           }
+        else                                       snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("MPEG Layer"), clrWhite, clrBackground, m_Font);
+        if (m_Receiver) snprintf(buf, sizeof(buf), "%d", m_Receiver->AudioMPEGLayer());
+        else            snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sampling Frequency"), clrWhite, clrBackground, m_Font);
+        if (m_Receiver) {
+           value = m_Receiver->AudioSamplingFreq();
+           if (value == FR_RESERVED) snprintf(buf, sizeof(buf), "%s", tr("reserved"));
+           else                      snprintf(buf, sizeof(buf), "%.1f %s", (value / 1000.0), tr("kHz"));
+           }
+        else                         snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        }
+     else if (m_DisplayMode == modeAC3) {
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground);
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+m_Font->Height()-1), clrWhite);
+        snprintf(buf, sizeof(buf), "%s - %s #%d %s", tr("Stream Information"), tr("AC-3 Stream"), IS_DOLBY_TRACK(track) ? channel->Dpid(int(track - ttDolbyFirst)) : channel->Dpid(0), IS_DOLBY_TRACK(track) ? channel->Dlang(int(track - ttDolbyFirst)) : channel->Dlang(0));
+        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrBackground, clrWhite, m_Font);
+        offset += m_Font->Height();
+        if (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) {
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_Font);
+           snprintf(buf, sizeof(buf), "%.0f %s (%0.f %s)", m_Receiver->AC3StreamBitrate(), tr("kbit/s"), m_Receiver->AC3Bitrate(), tr("kbit/s"));
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+           offset += m_Font->Height();
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sampling Frequency"), clrWhite, clrBackground, m_Font);
+           snprintf(buf, sizeof(buf), "%.1f %s", m_Receiver->AC3SamplingFreq() / 1000., tr("kHz"));
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+           offset += m_Font->Height();
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frame Size"), clrWhite, clrBackground, m_Font);
+           snprintf(buf, sizeof(buf), "%d", m_Receiver->AC3FrameSize());
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+           offset += m_Font->Height();
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bit Stream Mode"), clrWhite, clrBackground, m_Font);
+           switch (m_Receiver->AC3BitStreamMode()) {
+             case 0: snprintf(buf, sizeof(buf), tr("Complete Main (CM)"));     break;
+             case 1: snprintf(buf, sizeof(buf), tr("Music and Effects (ME)")); break;
+             case 2: snprintf(buf, sizeof(buf), tr("Visually Impaired (VI)")); break;
+             case 3: snprintf(buf, sizeof(buf), tr("Hearing Impaired (HI)"));  break;
+             case 4: snprintf(buf, sizeof(buf), tr("Dialogue (D)"));           break;
+             case 5: snprintf(buf, sizeof(buf), tr("Commentary (C)"));         break;
+             case 6: snprintf(buf, sizeof(buf), tr("Emergency (E)"));          break;
+             case 7: (m_Receiver->AC3AudioCodingMode() == 1) ? snprintf(buf, sizeof(buf), tr("Voice Over (VO)")) : snprintf(buf, sizeof(buf), tr("Karaoke")); break;
+             default: snprintf(buf, sizeof(buf), "---");
+             }
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+           offset += m_Font->Height();
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Coding Mode"), clrWhite, clrBackground, m_Font);
+           if (m_Receiver->AC3BitStreamMode() != 7) {
+              switch (m_Receiver->AC3AudioCodingMode()) {
+                case 0:  snprintf(buf, sizeof(buf), "1+1 - %s, %s",             tr("Ch1"), tr("Ch2"));                           break;
+                case 1:  snprintf(buf, sizeof(buf), "1/0 - %s",                 tr("C"));                                        break;
+                case 2:  snprintf(buf, sizeof(buf), "2/0 - %s, %s",             tr("L"), tr("R"));                               break;
+                case 3:  snprintf(buf, sizeof(buf), "3/0 - %s, %s, %s",         tr("L"), tr("C"), tr("R"));                      break;
+                case 4:  snprintf(buf, sizeof(buf), "2/1 - %s, %s, %s",         tr("L"), tr("R"), tr("S"));                      break;
+                case 5:  snprintf(buf, sizeof(buf), "3/1 - %s, %s, %s, %s",     tr("L"), tr("C"), tr("R"),  tr("S"));            break;
+                case 6:  snprintf(buf, sizeof(buf), "2/2 - %s, %s, %s, %s",     tr("L"), tr("R"), tr("SL"), tr("SR"));           break;
+                case 7:  snprintf(buf, sizeof(buf), "3/2 - %s, %s, %s, %s, %s", tr("L"), tr("C"), tr("R"),  tr("SL"), tr("SR")); break;
+                default: snprintf(buf, sizeof(buf), "---");
+                }
+             }
+	   else snprintf(buf, sizeof(buf), "---");
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+           offset += m_Font->Height();
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Center Mix Level"), clrWhite, clrBackground, m_Font);
+           switch (m_Receiver->AC3CenterMixLevel()) {
+             case CML_MINUS_3dB:   snprintf(buf, sizeof(buf), "-3.0 %s", tr("dB"));  break;
+             case CML_MINUS_4_5dB: snprintf(buf, sizeof(buf), "-4.5 %s", tr("dB"));  break;
+             case CML_MINUS_6dB:   snprintf(buf, sizeof(buf), "-6.0 %s", tr("dB"));  break;
+             case CML_RESERVED:    snprintf(buf, sizeof(buf), "%s", tr("reserved")); break;
+             default:              snprintf(buf, sizeof(buf), "---");
+             }
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+           offset += m_Font->Height();
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Surround Mix Level"), clrWhite, clrBackground, m_Font);
+           switch (m_Receiver->AC3SurroundMixLevel()) {
+             case SML_MINUS_3dB: snprintf(buf, sizeof(buf), "-3 %s", tr("dB"));    break;
+             case SML_MINUS_6dB: snprintf(buf, sizeof(buf), "-6 %s", tr("dB"));    break;
+             case SML_0_dB:      snprintf(buf, sizeof(buf), "0 %s", tr("dB"));     break;
+             case SML_RESERVED:  snprintf(buf, sizeof(buf), "%s", tr("reserved")); break;
+             default:            snprintf(buf, sizeof(buf), "---");
+             }
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+           offset += m_Font->Height();
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Dolby Surround Mode"), clrWhite, clrBackground, m_Font);
+           switch (m_Receiver->AC3DolbySurroundMode()) {
+             case DSM_NOT_INDICATED:     snprintf(buf, sizeof(buf), "%s", tr("not indicated")); break;
+             case DSM_NOT_DOLBYSURROUND: snprintf(buf, sizeof(buf), "%s", tr("no"));            break;
+             case DSM_DOLBYSURROUND:     snprintf(buf, sizeof(buf), "%s", tr("yes"));           break;
+             case DSM_RESERVED:          snprintf(buf, sizeof(buf), "%s", tr("reserved"));      break;
+             default:                    snprintf(buf, sizeof(buf), "---");
+             }
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+           offset += m_Font->Height();
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Low Frequency Effects"), clrWhite, clrBackground, m_Font);
+           snprintf(buf, sizeof(buf), "%s", m_Receiver->AC3LfeOn() ? tr("On") : tr("Off"));
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+           offset += m_Font->Height();
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Dialogue Normalization"), clrWhite, clrBackground, m_Font);
+           value = m_Receiver->AC3DialogLevel();
+           if (value > 0) snprintf(buf, sizeof(buf), "-%d %s", value, tr("dB"));
+           else           snprintf(buf, sizeof(buf), "---");
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+           offset += m_Font->Height();
+           }
+        }
+     else /* modeBasic */ {
        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent);
        }
     m_Osd->Flush();
@@ -370,9 +818,11 @@ void cFemonOsd::DrawInfoWindow(void)

 void cFemonOsd::Action(void)
 {
-  //printf("cFemonOsd::Action()\n");
+  debug(printf("cFemonOsd::Action()\n"));
+  cTimeMs t;
  m_Active = true;
  while (m_Active) {
+    t.Set(0);
    if (m_Frontend != -1) {
       CHECK(ioctl(m_Frontend, FE_READ_STATUS, &m_FrontendStatus));
       CHECK(ioctl(m_Frontend, FE_READ_SIGNAL_STRENGTH, &m_Signal));
@@ -385,14 +835,17 @@ void cFemonOsd::Action(void)
          isyslog("Card #%d (%s) STR: %04x SNR: %04x BER: %08x UNC: %08x |%c|%c|%c|%c|%c|", cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name, m_Signal, m_SNR, m_BER, m_UNC, (m_FrontendStatus & FE_HAS_LOCK) ? 'L' : ' ', (m_FrontendStatus & FE_HAS_SIGNAL) ? 'S' : ' ', (m_FrontendStatus & FE_HAS_CARRIER) ? 'C' : ' ', (m_FrontendStatus & FE_HAS_VITERBI) ? 'V' : ' ', (m_FrontendStatus & FE_HAS_SYNC) ? 'Z' : ' ');
          }
       }
-    usleep(100000L * femonConfig.updateinterval);
+    cCondWait::SleepMs(100 * femonConfig.updateinterval - t.Elapsed());
    }
 }

 void cFemonOsd::Show(void)
 {
-  //printf("cFemonOsd::Show()\n");
+  debug(printf("cFemonOsd::Show()\n"));
+  int apid[2] = {0, 0};
+  int dpid[2] = {0, 0};
  char *dev = NULL;
+  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
  asprintf(&dev, FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
  m_Frontend = open(dev, O_RDONLY | O_NONBLOCK);
  free(dev);
@@ -403,8 +856,8 @@ void cFemonOsd::Show(void)
     }
  if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0) {
     isyslog("cFemonOsd::Show() cannot read frontend info.");
-     m_Frontend = -1;
     close(m_Frontend);
+     m_Frontend = -1;
     return;
     }
  m_Osd = cOsdProvider::NewOsd(((Setup.OSDWidth - OSDWIDTH) / 2) + Setup.OSDLeft, ((Setup.OSDHeight - OSDHEIGHT) / 2) + Setup.OSDTop);
@@ -423,9 +876,11 @@ void cFemonOsd::Show(void)
     m_Osd->Flush();
     if (m_Receiver)
        delete m_Receiver;
-     if (femonConfig.showbitrate) {
-        int channelNumber = cDevice::CurrentChannel();
-        m_Receiver = new cFemonReceiver(Channels.GetByNumber(channelNumber)->Ca(), Channels.GetByNumber(channelNumber)->Vpid(), Channels.GetByNumber(channelNumber)->Apid1());
+     if (femonConfig.analyzestream) {
+        cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+        IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
+        IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
+        m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), apid, dpid);
        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
        }
     Start();
@@ -434,8 +889,13 @@ void cFemonOsd::Show(void)

 void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
 {
-  //printf("cFemonOsd::ChannelSwitch()\n");
+  debug(printf("cFemonOsd::ChannelSwitch()\n"));
+  int apid[2] = {0, 0};
+  int dpid[2] = {0, 0};
  char *dev = NULL;
+  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
+  if (!device->IsPrimaryDevice() || !channelNumber || cDevice::PrimaryDevice()->CurrentChannel() != channelNumber)
+     return;
  close(m_Frontend);
  asprintf(&dev, FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
  m_Frontend = open(dev, O_RDONLY | O_NONBLOCK);
@@ -447,15 +907,34 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
     }
  if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0) {
     isyslog("cFemonOsd::ChannelSwitch() cannot read frontend info.");
-     m_Frontend = -1;
     close(m_Frontend);
+     m_Frontend = -1;
     return;
     }
  if (m_Receiver)
     delete m_Receiver;
-  if (femonConfig.showbitrate) {
-     channelNumber = cDevice::CurrentChannel();
-     m_Receiver = new cFemonReceiver(Channels.GetByNumber(channelNumber)->Ca(), Channels.GetByNumber(channelNumber)->Vpid(), Channels.GetByNumber(channelNumber)->Apid1());
+  if (femonConfig.analyzestream) {
+     cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+     IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
+     IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
+     m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), apid, dpid);
+     cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+     }
+}
+
+void cFemonOsd::SetAudioTrack(int Index, const char * const *Tracks)
+{
+  debug(printf("cFemonOsd::SetAudioTrack()\n"));
+  int apid[2] = {0, 0};
+  int dpid[2] = {0, 0};
+  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
+  if (m_Receiver)
+     delete m_Receiver;
+  if (femonConfig.analyzestream) {
+     cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+     IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
+     IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
+     m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), apid, dpid);
     cDevice::ActualDevice()->AttachReceiver(m_Receiver);
     }
 }
@@ -463,9 +942,8 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
 eOSState cFemonOsd::ProcessKey(eKeys Key)
 { 
  eOSState state = cOsdObject::ProcessKey(Key);
-
  if (state == osUnknown) {
-     switch (Key & ~k_Repeat) {
+     switch (Key) {
       case k0:
            if ((m_Number == 0) && (m_OldNumber != 0)) {
               m_Number = m_OldNumber;
@@ -480,7 +958,7 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
               if (m_Number > 0) {
                  DrawStatusWindow();
                  cChannel *ch = Channels.GetByNumber(m_Number);
-                  m_InputTime = time_ms();
+                  m_InputTime.Set(0);
                  // Lets see if there can be any useful further input:
                  int n = ch ? m_Number * 10 : 0;
                  while (ch && (ch = Channels.Next(ch)) != NULL) {
@@ -504,6 +982,66 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
            break;
       case kBack:
            return osEnd;
+       case kGreen:
+            {
+            eTrackType types[ttMaxTrackTypes];
+            eTrackType CurrentAudioTrack = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
+            int numTracks = 0;
+            int oldTrack = 0;
+            int track = 0;
+            for (int i = ttAudioFirst; i <= ttDolbyLast; i++) {
+                const tTrackId *TrackId = cDevice::PrimaryDevice()->GetTrack(eTrackType(i));
+                if (TrackId && TrackId->id) {
+                   types[numTracks] = eTrackType(i);
+                   if (i == CurrentAudioTrack)
+                      track = numTracks;
+                   numTracks++;
+                   }
+                }
+            oldTrack = track;
+            if (++track >= numTracks)
+               track = 0;
+            if (track != oldTrack) {
+               cDevice::PrimaryDevice()->SetCurrentAudioTrack(types[track]);
+               Setup.CurrentDolby = IS_DOLBY_TRACK(types[track]);
+               }
+            }
+            break;
+       case kYellow:
+            if (IS_AUDIO_TRACK(cDevice::PrimaryDevice()->GetCurrentAudioTrack())) {
+               int audioChannel = cDevice::PrimaryDevice()->GetAudioChannel();
+               int oldAudioChannel = audioChannel;
+               if (++audioChannel > 2)
+                  audioChannel = 0;
+               if (audioChannel != oldAudioChannel) {
+                  cDevice::PrimaryDevice()->SetAudioChannel(audioChannel);
+                  }
+               }
+            break;
+       case kRight:
+       case kLeft:
+            {
+            int device = cDevice::ActualDevice()->DeviceNumber();
+            if (device >= 0) {
+               cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+               for (int i = 0; i < cDevice::NumDevices() - 1; i++) {
+                   if (NORMALKEY(Key) == kBlue) {
+                      if (++device >= cDevice::NumDevices()) device = 0;
+                      }
+                   else {
+                      if (--device < 0) device = cDevice::NumDevices() - 1;
+                      }
+                   if (cDevice::GetDevice(device)->ProvidesChannel(channel)) {
+                      //cStatus::MsgChannelSwitch(cDevice::GetDevice(device), 0);
+                      //implement some tuning mechanism here
+                      //cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->Vpid(), channel->Apid(0), channel->Apid(1), channel->Dpid(0), channel->Dpid(1)));
+                      //cStatus::MsgChannelSwitch(cDevice::GetDevice(device), channel->Number());
+                      break;
+                      }
+                   }
+               }
+            }
+            break;
       case kUp|k_Repeat:
       case kUp:
       case kDown|k_Repeat:
@@ -513,20 +1051,22 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
            m_Number = 0;
            break;
       case kNone:
-            if (m_Number && (time_ms() - m_InputTime > CHANNELINPUT_TIMEOUT)) {
+            if (m_Number && (m_InputTime.Elapsed() > CHANNELINPUT_TIMEOUT)) {
               if (Channels.GetByNumber(m_Number)) {
                  m_OldNumber = cDevice::CurrentChannel();
                  Channels.SwitchTo(m_Number);
                  m_Number = 0;
                  }
               else {
-                  m_InputTime = time_ms();
+                  m_InputTime.Set(0);
                  m_Number = 0;
                  }
               }
            break;
       case kOk:
-            m_DisplayMode ^= 1; // toggle between advanced and simple display mode
+            // toggle between display modes
+            if (++m_DisplayMode == modeAC3 && !Channels.GetByNumber(cDevice::CurrentChannel())->Dpid(0)) m_DisplayMode++;
+            if (m_DisplayMode >= modeMaxNumber) m_DisplayMode = 0;
            DrawInfoWindow();
            break;
       default:
--- a/femonosd.h
+++ b/femonosd.h
@@ -16,6 +16,8 @@
 #include <vdr/thread.h>
 #include <vdr/status.h>
 #include <vdr/channels.h>
+#include <vdr/transfer.h>
+#include <vdr/tools.h>

 class cFemonOsd : public cOsdObject, public cThread, public cStatus {
 private:
@@ -26,7 +28,6 @@ private:
  struct dvb_frontend_info m_FrontendInfo;
  int m_Number;
  int m_OldNumber;
-  int m_InputTime;
  uint16_t m_SNR;
  uint16_t m_Signal;
  uint32_t m_BER;
@@ -34,13 +35,18 @@ private:
  fe_status_t m_FrontendStatus;
  int m_DisplayMode;
  const cFont *m_Font;
+  cTimeMs m_InputTime;
  cMutex* m_Mutex;
+  static cBitmap bmStereo, bmMonoLeft, bmMonoRight, bmDD, bmDD20, bmDD51;
+  static cBitmap bmZero, bmDevice, bmPAL, bmNTSC, bmOne, bmTwo, bmThree, bmFour, bmFive;
+  static cBitmap bmAspectRatio_1_1, bmAspectRatio_16_9, bmAspectRatio_2_21_1, bmAspectRatio_4_3;
  void DrawStatusWindow(void);
  void DrawInfoWindow(void);

 protected:
  virtual void Action(void);
  virtual void ChannelSwitch(const cDevice * device, int channelNumber);
+  virtual void SetAudioTrack(int Index, const char * const *Tracks);

 public:
  cFemonOsd(void);
--- a/femonreceiver.c
+++ b/femonreceiver.c
@@ -7,42 +7,269 @@
 */

 #include <unistd.h>
+#include <vdr/tools.h>
 #include "femoncfg.h"
 #include "femonreceiver.h"

-cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid)
-:cReceiver(Ca, -1, 2, Vpid, Apid), cThread("femon receiver")
+#define TS_SIZE       188
+#define PAY_START     0x40
+#define ADAPT_FIELD   0x20
+#define PAYLOAD       0x10
+#define PTS_DTS_FLAGS 0xC0
+
+cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[])
+:cReceiver(Ca, -1, Vpid, Apid, Dpid, NULL), cThread("femon receiver")
 {
-  //printf("cFemonReceiver::cFemonReceiver()\n");
+  debug(printf("cFemonReceiver::cFemonReceiver()\n"));
  m_Active = false;
  m_VideoPid = Vpid;
-  m_AudioPid = Apid;
+  m_AudioPid = Apid[0];
+  m_AC3Pid = Dpid[0];      
+  m_VideoValid = false;
  m_VideoPacketCount = 0;
-  m_AudioPacketCount = 0;
+  m_VideoHorizontalSize = 0;
+  m_VideoVerticalSize = 0;
+  m_VideoAspectRatio = AR_RESERVED;
+  m_VideoFormat = VF_UNKNOWN;
+  m_VideoFrameRate = 0.0;
+  m_VideoStreamBitrate = 0.0;
  m_VideoBitrate = 0.0;
+  m_AudioValid = false;
+  m_AudioPacketCount = 0;
+  m_AudioStreamBitrate = -2.0;
  m_AudioBitrate = 0.0;
+  m_AudioSamplingFreq = -1;
+  m_AudioMPEGLayer = 0;
+  m_AudioBitrate = 0.0;
+  m_AC3Valid = false;
+  m_AC3PacketCount = 0; 
+  m_AC3StreamBitrate = 0;
+  m_AC3SamplingFreq = 0;
+  m_AC3Bitrate = 0;
+  m_AC3FrameSize = 0;
+  m_AC3BitStreamMode = FR_NOTVALID;
+  m_AC3AudioCodingMode = FR_NOTVALID;
+  m_AC3CenterMixLevel = FR_NOTVALID;
+  m_AC3SurroundMixLevel = FR_NOTVALID;
+  m_AC3DolbySurroundMode = FR_NOTVALID;
+  m_AC3LfeOn = false;
+  m_AC3DialogLevel = FR_NOTVALID;
 }
 
 cFemonReceiver::~cFemonReceiver(void)
 {
-  //printf("cFemonReceiver::~cFemonReceiver()\n");
+  debug(printf("cFemonReceiver::~cFemonReceiver()\n"));
+  Detach();
  if (m_Active) {
     m_Active = false;
     Cancel(0);
     }
 }

+/* The following function originates from libdvbmpeg: */
+void cFemonReceiver::GetVideoInfo(uint8_t *mbuf, int count)
+{
+  debug(printf("cFemonReceiver::GetVideoInfo()\n"));
+  uint8_t *headr;
+  int found = 0;
+  int c = 0;
+  m_VideoValid = false;
+  while ((found < 4) && ((c + 4) < count)) {
+    uint8_t *b;
+    b = mbuf + c;
+    if ((b[0] == 0x00) && (b[1] == 0x00) && (b[2] == 0x01) && (b[3] == 0xb3))
+       found = 4;
+    else
+       c++;
+    }
+  if ((!found) || ((c + 16) >= count)) return;
+  m_VideoValid = true;
+  headr = mbuf + c + 4;
+  m_VideoHorizontalSize = ((headr[1] & 0xF0) >> 4) | (headr[0] << 4);
+  m_VideoVerticalSize = ((headr[1] & 0x0F) << 8) | (headr[2]);
+  int sw = (int)((headr[3] & 0xF0) >> 4);
+  switch ( sw ){
+    case 1:
+      m_VideoAspectRatio = AR_1_1;
+      break;
+    case 2:
+      m_VideoAspectRatio = AR_4_3;
+      break;
+    case 3:
+      m_VideoAspectRatio = AR_16_9;
+      break;
+    case 4:
+      m_VideoAspectRatio = AR_2_21_1;
+      break;
+    case 5 ... 15:
+    default:
+      m_VideoAspectRatio = AR_RESERVED;
+      break;
+    }
+  sw = (int)(headr[3] & 0x0F);
+  switch ( sw ) {
+    case 1:
+      m_VideoFrameRate = 24000 / 1001.0;
+      m_VideoFormat = VF_UNKNOWN;
+      break;
+    case 2:
+      m_VideoFrameRate = 24.0;
+      m_VideoFormat = VF_UNKNOWN;
+      break;
+    case 3:
+      m_VideoFrameRate = 25.0;
+      m_VideoFormat = VF_PAL;
+      break;
+    case 4:
+      m_VideoFrameRate = 30000 / 1001.0;
+      m_VideoFormat = VF_NTSC;
+      break;
+    case 5:
+      m_VideoFrameRate = 30.0;
+      m_VideoFormat = VF_NTSC;
+      break;
+    case 6:
+      m_VideoFrameRate = 50.0;
+      m_VideoFormat = VF_PAL;
+      break;
+    case 7:
+      m_VideoFrameRate = 60.0;
+      m_VideoFormat = VF_NTSC;
+      break;
+    case 8:
+      m_VideoFrameRate = 60000 / 1001.0;
+      m_VideoFormat = VF_NTSC;
+      break;
+    case 9 ... 15:
+    default:
+      m_VideoFrameRate = 0;
+      m_VideoFormat = VF_UNKNOWN;
+      break;
+    }
+  m_VideoStreamBitrate = 400 * (((headr[4] << 10) & 0x0003FC00UL) | ((headr[5] << 2) & 0x000003FCUL) | (((headr[6] & 0xC0) >> 6) & 0x00000003UL)) / 1000000.0;
+}
+
+static unsigned int bitrates[3][16] =
+{
+  {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 0},
+  {0, 32, 48, 56, 64,  80,  96,  112, 128, 160, 192, 224, 256, 320, 384, 0},
+  {0, 32, 40, 48, 56,  64,  80,  96,  112, 128, 160, 192, 224, 256, 320, 0}
+};
+
+static unsigned int samplerates[4] =
+{441, 480, 320, 0};
+
+/* The following function originates from libdvbmpeg: */
+void cFemonReceiver::GetAudioInfo(uint8_t *mbuf, int count)
+{
+  debug(printf("cFemonReceiver::GetAudioInfo()\n"));
+  uint8_t *headr;
+  int found = 0;
+  int c = 0;
+  int tmp = 0;
+  m_AudioValid = false;
+  while (!found && (c < count)) {
+    uint8_t *b = mbuf + c;
+    if ((b[0] == 0xff) && ((b[1] & 0xf8) == 0xf8))
+       found = 1;
+    else
+       c++;
+    }	
+  if ((!found) || ((c + 3) >= count)) return;
+  m_AudioValid = true;
+  headr = mbuf + c;
+  m_AudioMPEGLayer = 4 - ((headr[1] & 0x06) >> 1);
+  tmp = bitrates[(3 - ((headr[1] & 0x06) >> 1))][(headr[2] >> 4)] * 1000;
+  if (tmp == 0)
+     m_AudioStreamBitrate = (double)FR_FREE;
+  else if (tmp == 0xf)
+     m_AudioStreamBitrate = (double)FR_RESERVED;
+  else
+     m_AudioStreamBitrate = tmp / 1000.0;
+  tmp = samplerates[((headr[2] & 0x0c) >> 2)] * 100;
+  if (tmp == 3)
+     m_AudioSamplingFreq = FR_RESERVED;
+  else
+     m_AudioSamplingFreq = tmp;
+}
+
+static unsigned int ac3_bitrates[32] =
+{32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 576, 640, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+static unsigned int ac3_freq[4] =
+{480, 441, 320, 0};
+
+static unsigned int ac3_frames[3][32] =
+{
+  {64, 80,  96,  112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 640, 768,  896,  1024, 1152, 1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+  {69, 87,  104, 121, 139, 174, 208, 243, 278, 348, 417, 487, 557, 696, 835,  975,  1114, 1253, 1393, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+  {96, 120, 144, 168, 192, 240, 288, 336, 384, 480, 576, 672, 768, 960, 1152, 1344, 1536, 1728, 1920, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+};
+
+/*
+** AC3 Audio Header: http://www.atsc.org/standards/a_52a.pdf
+** The following function originates from libdvbmpeg:
+*/
+void cFemonReceiver::GetAC3Info(uint8_t *mbuf, int count)
+{
+  uint8_t *headr;
+  int found = 0;
+  int c = 0;
+  uint8_t frame;
+  m_AC3Valid = false;
+  while (!found && (c < count)) {
+    uint8_t *b = mbuf + c;
+    if ((b[0] == 0x0b) && (b[1] == 0x77))
+       found = 1;
+    else
+       c++;
+    }
+  if ((!found) || ((c + 5) >= count)) return;
+  m_AC3Valid = true;
+  headr = mbuf + c + 2;
+  frame = (headr[2] & 0x3f);
+  m_AC3StreamBitrate = ac3_bitrates[frame >> 1];
+  int fr = (headr[2] & 0xc0 ) >> 6;
+  m_AC3SamplingFreq = ac3_freq[fr] * 100;
+  m_AC3FrameSize = ac3_frames[fr][frame >> 1];
+  if ((frame & 1) && (fr == 1)) m_AC3FrameSize++;
+     m_AC3FrameSize <<= 1;
+  m_AC3BitStreamMode = (headr[3] & 7);
+  m_AC3AudioCodingMode = (headr[4] & 0xE0) >> 5;
+  if ((m_AC3AudioCodingMode & 0x01) && (m_AC3AudioCodingMode != 0x01)) // if 3 front channels
+     m_AC3CenterMixLevel = (headr[4] & 0x18) >> 3;
+  else
+     m_AC3CenterMixLevel = FR_NOTVALID;
+  if (m_AC3AudioCodingMode & 0x04) //  if a surround channel exists
+     m_AC3SurroundMixLevel = (headr[4] & 0x06) >> 1;
+  else
+     m_AC3SurroundMixLevel = FR_NOTVALID;
+  if (m_AC3AudioCodingMode == 0x02) // if in 2/0 mode
+     m_AC3DolbySurroundMode = ((headr[4] & 1) << 1) | ((headr[5] & 0x80) >> 7);
+  else 
+     m_AC3DolbySurroundMode = FR_NOTVALID;
+  m_AC3LfeOn = (headr[5] & 0x40) >> 6;
+  m_AC3DialogLevel = (headr[5] & 0x3e) >> 1;
+}
+
 void cFemonReceiver::Activate(bool On)
 {
-  //printf("cFemonReceiver::Activate()\n");
-  Start();
+  debug(printf("cFemonReceiver::Activate()\n"));
+  if (On) {
+     if (!m_Active)
+        Start();
+     }
+  else if (m_Active) {
+     m_Active = false;
+     Cancel(0);
+     }
 }

 void cFemonReceiver::Receive(uchar *Data, int Length)
 {
-  //printf("cFemonReceiver::Receive()\n");
-  // TS packet length: 188
-  if (Length == 188) {
+  debug(printf("cFemonReceiver::Receive()\n"));
+  // TS packet length: TS_SIZE
+  if (Length == TS_SIZE) {
     int pid = ((Data[1] & 0x1f) << 8) | (Data[2]);
     if (pid == m_VideoPid) {
        m_VideoPacketCount++;
@@ -50,19 +277,51 @@ void cFemonReceiver::Receive(uchar *Data, int Length)
     else if (pid == m_AudioPid) {
        m_AudioPacketCount++;
        }
+     else if (pid == m_AC3Pid) {
+        m_AC3PacketCount++;
+        }
+     /* the following originates from libdvbmpeg: */
+     if (!(Data[3] & PAYLOAD)) {
+        return;
+        }
+     uint8_t off = 0;
+     if (Data[3] & ADAPT_FIELD) {
+        off = Data[4] + 1;
+        }
+     if (Data[1] & PAY_START) {
+        uint8_t *sb = Data + 4 + off;
+        if (sb[7] & PTS_DTS_FLAGS) {
+           uint8_t *pay = sb + sb[8] + 9; 
+           int l = TS_SIZE - 13 - off - sb[8];
+           if (pid == m_VideoPid) {
+              GetVideoInfo(pay, l);
+              }
+           else if (pid == m_AudioPid) {
+              GetAudioInfo(pay, l);
+              }
+           else if (pid == m_AC3Pid) {
+              GetAC3Info(pay, l);
+              }
+           }
+        }
+     /* end */
     }
 }

 void cFemonReceiver::Action(void)
 {
-  //printf("cFemonReceiver::Action()\n");
+  debug(printf("cFemonReceiver::Action()\n"));
+  cTimeMs t;
  m_Active = true;
  while (m_Active) {
+        t.Set(0);
        // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit
        m_VideoBitrate = (8.0 * 184.0 * m_VideoPacketCount) / (femonConfig.calcinterval * 100000.0);
        m_VideoPacketCount = 0;
        m_AudioBitrate = (8.0 * 184.0 * m_AudioPacketCount) / (femonConfig.calcinterval * 100.0);
        m_AudioPacketCount = 0;
-        usleep(100000L * femonConfig.calcinterval);
+        m_AC3Bitrate   = (8.0 * 184.0 * m_AC3PacketCount)   / (femonConfig.calcinterval * 100.0);
+        m_AC3PacketCount = 0;
+        cCondWait::SleepMs(100 * femonConfig.calcinterval - t.Elapsed());
    }
 }
--- a/femonreceiver.h
+++ b/femonreceiver.h
@@ -12,15 +12,82 @@
 #include <vdr/thread.h>
 #include <vdr/receiver.h>

+enum eVideoFormat {
+  VF_UNKNOWN = 0,
+  VF_PAL     = 1,
+  VF_NTSC    = 2,
+  };
+
+enum eAspectRatio {
+  AR_RESERVED = 0,
+  AR_1_1      = 100,
+  AR_4_3      = 133,
+  AR_16_9     = 177,
+  AR_2_21_1   = 233,
+  };
+
+enum eCenterMixLevel {
+  CML_MINUS_3dB   = 0,
+  CML_MINUS_4_5dB = 1,
+  CML_MINUS_6dB   = 2,
+  CML_RESERVED    = 3,
+  };
+
+enum eSurroundMixLevel {
+  SML_MINUS_3dB = 0,
+  SML_MINUS_6dB = 1,
+  SML_0_dB      = 2,
+  SML_RESERVED  = 3,
+  };
+
+enum eDolbySurroundMode {
+  DSM_NOT_INDICATED     = 0,
+  DSM_NOT_DOLBYSURROUND = 1,
+  DSM_DOLBYSURROUND     = 2,
+  DSM_RESERVED          = 3,
+  };
+
+#define FR_RESERVED    -1
+#define FR_FREE        -2
+#define FR_NOTVALID    -3
+
 class cFemonReceiver : public cReceiver, public cThread {
 private:
-  bool m_Active;
-  int m_VideoPid;
-  int m_AudioPid;
-  int m_VideoPacketCount;
-  int m_AudioPacketCount;
+  bool   m_Active;
+  int    m_VideoPid;
+  int    m_AudioPid;
+  int    m_AC3Pid;
+  bool   m_VideoValid;
+  int    m_VideoPacketCount;
+  int    m_VideoHorizontalSize;
+  int    m_VideoVerticalSize;
+  int    m_VideoAspectRatio;
+  int    m_VideoFormat;
+  double m_VideoFrameRate;
+  double m_VideoStreamBitrate;
  double m_VideoBitrate;
+  bool   m_AudioValid;
+  int    m_AudioPacketCount;
+  double m_AudioStreamBitrate;
  double m_AudioBitrate;
+  int    m_AudioSamplingFreq;
+  int    m_AudioMPEGLayer;
+  bool   m_AC3Valid;
+  int    m_AC3PacketCount;
+  double m_AC3Bitrate;
+  int    m_AC3FrameSize;
+  int    m_AC3SamplingFreq;
+  int    m_AC3StreamBitrate;
+  int    m_AC3BitStreamMode;
+  int    m_AC3AudioCodingMode;
+  int    m_AC3CenterMixLevel;
+  int    m_AC3SurroundMixLevel;
+  int    m_AC3DolbySurroundMode;
+  bool   m_AC3LfeOn;
+  int    m_AC3DialogLevel;  
+  void   GetVideoInfo(uint8_t *mbuf, int count);
+  void   GetAudioInfo(uint8_t *mbuf, int count);
+  void   GetAC3Info(uint8_t *mbuf, int count);

 protected:
  virtual void Activate(bool On);
@@ -28,11 +95,38 @@ protected:
  virtual void Action(void);

 public:
-  cFemonReceiver(int Ca, int Vpid, int Apid);
+  cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[]);
  virtual ~cFemonReceiver();

-  double VideoBitrate(void) { return m_VideoBitrate; }; // Mbit/s
-  double AudioBitrate(void) { return m_AudioBitrate; }; // kbit/s
+  bool VideoValid(void)           { return m_VideoValid; };          // boolean
+  int VideoHorizontalSize(void)   { return m_VideoHorizontalSize; }; // pixels
+  int VideoVerticalSize(void)     { return m_VideoVerticalSize; };   // pixels
+  int VideoAspectRatio(void)      { return m_VideoAspectRatio; };    // eAspectRatio
+  int VideoFormat(void)           { return m_VideoFormat; };         // eVideoFormat
+  double VideoFrameRate(void)     { return m_VideoFrameRate; };      // Hz
+  double VideoStreamBitrate(void) { return m_VideoStreamBitrate; };  // Mbit/s
+  double VideoBitrate(void)       { return m_VideoBitrate; };        // Mbit/s
+
+  bool AudioValid(void)           { return m_AudioValid; };          // boolean
+  int AudioMPEGLayer(void)        { return m_AudioMPEGLayer; };      // layer number
+  int AudioSamplingFreq(void)     { return m_AudioSamplingFreq; };   // Hz
+  double AudioStreamBitrate(void) { return m_AudioStreamBitrate; };  // kbit/s
+  double AudioBitrate(void)       { return m_AudioBitrate; };        // kbit/s
+
+  bool AC3Valid(void)             { return m_AC3Valid; };                // boolean
+  int AC3SamplingFreq(void)       { return m_AC3SamplingFreq; };         // Hz
+  double AC3StreamBitrate(void)   { return m_AC3StreamBitrate; };        // kbit/s
+  double AC3Bitrate(void)         { return m_AC3Bitrate; };              // kbit/s
+  int AC3FrameSize(void)          { return m_AC3FrameSize; };            // Bytes
+  int AC3BitStreamMode(void)      { return m_AC3BitStreamMode; };        // 0..7
+  int AC3AudioCodingMode(void)    { return m_AC3AudioCodingMode; };      // 0..7
+  bool AC3_2_0(void)		  { return m_AC3AudioCodingMode == 2; }; // DD 2.0
+  bool AC3_5_1(void)	          { return m_AC3AudioCodingMode == 7; }; // DD 5.1
+  int AC3CenterMixLevel(void)     { return m_AC3CenterMixLevel; };       // eCenterMixLevel
+  int AC3SurroundMixLevel(void)   { return m_AC3SurroundMixLevel; };     // eSurroundMixLevel
+  int AC3DolbySurroundMode(void)  { return m_AC3DolbySurroundMode; };    // eDolbySurroundMode
+  bool AC3LfeOn(void)             { return m_AC3LfeOn; };                // boolean
+  int AC3DialogLevel(void)        { return m_AC3DialogLevel; };          // -dB
  };

 #endif //__FEMONRECEIVER_H
--- a/symbols/ar11.xpm
+++ b/symbols/ar11.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * ar11_xpm[] = {
+"26 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++++++++++",
+"+........................+",
+"+......++..........++....+",
+"+...+++++.......+++++....+",
+"+...+++++.......+++++....+",
+"+......++...++.....++....+",
+"+......++...++.....++....+",
+"+......++..........++....+",
+"+......++..........++....+",
+"+......++..........++....+",
+"+......++..........++....+",
+"+......++..........++....+",
+"+......++..........++....+",
+"+......++..........++....+",
+"+......++...++.....++....+",
+"+......++...++.....++....+",
+"+........................+",
+"++++++++++++++++++++++++++"};
--- a/symbols/ar169.xpm
+++ b/symbols/ar169.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * ar169_xpm[] = {
+"38 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++++++++++++++++++++++",
+"+....................................+",
+"+......++.....++++..........++++.....+",
+"+...+++++....+++++++.......++++++....+",
+"+...+++++....++...++......++...+++...+",
+"+......++...++........++..++....++...+",
+"+......++...++........++..++....++...+",
+"+......++...++............++....++...+",
+"+......++...++.+++.........+++++++...+",
+"+......++...+++++++.........+++.++...+",
+"+......++...++....++............++...+",
+"+......++...++....++............++...+",
+"+......++...++....++............++...+",
+"+......++...+++...++......++...++....+",
+"+......++....++++++...++..+++++++....+",
+"+......++.....++++....++...+++++.....+",
+"+....................................+",
+"++++++++++++++++++++++++++++++++++++++"};
--- a/symbols/ar2211.xpm
+++ b/symbols/ar2211.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * ar2211_xpm[] = {
+"52 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"+..................................................+",
+"+.....++++..........++++........++...........++....+",
+"+...+++++++.......+++++++....+++++........+++++....+",
+"+...++....++......++....++...+++++........+++++....+",
+"+.........++............++......++...++......++....+",
+"+.........++............++......++...++......++....+",
+"+........+++...........+++......++...........++....+",
+"+.......+++...........+++.......++...........++....+",
+"+......+++...........+++........++...........++....+",
+"+.....+++...........+++.........++...........++....+",
+"+....+++...........+++..........++...........++....+",
+"+...+++...........+++...........++...........++....+",
+"+...++............++............++...........++....+",
+"+...++++++++..++..++++++++......++...++......++....+",
+"+...++++++++..++..++++++++......++...++......++....+",
+"+..................................................+",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++"};
--- a/symbols/ar43.xpm
+++ b/symbols/ar43.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * ar43_xpm[] = {
+"31 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++++",
+"+.............................+",
+"+.........++.........+++++....+",
+"+........+++........+++++++...+",
+"+.......++++.......++....++...+",
+"+......++.++...++..++....++...+",
+"+.....++..++...++........++...+",
+"+.....++..++............++....+",
+"+....++...++..........+++.....+",
+"+...++....++..........++++....+",
+"+...+++++++++...........+++...+",
+"+...+++++++++............++...+",
+"+.........++.......++....++...+",
+"+.........++.......++...+++...+",
+"+.........++...++...++++++....+",
+"+.........++...++....++++.....+",
+"+.............................+",
+"+++++++++++++++++++++++++++++++"};
--- a/symbols/device.xpm
+++ b/symbols/device.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * device_xpm[] = {
+"14 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++",
+"+.............",
+"+.......+..+..",
+"+.......+..+..",
+"+.......+..+..",
+"+....+++++++++",
+"+....+++++++++",
+"+......+..+...",
+"+......+..+...",
+"+......+..+...",
+"+......+..+...",
+"+...+++++++++.",
+"+...+++++++++.",
+"+.....+..+....",
+"+.....+..+....",
+"+.....+..+....",
+"+.............",
+"++++++++++++++"};
--- a/symbols/dolbydigital.xpm
+++ b/symbols/dolbydigital.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * dolbydigital_xpm[] = {
+"31 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++++",
+"+.............................+",
+"+...+++++++++++.+++++++++++...+",
+"+...++.++++++++.++++++++.++...+",
+"+...++...++++++.++++++...++...+",
+"+...++.....++++.++++.....++...+",
+"+...++......+++.+++......++...+",
+"+...++.......++.++.......++...+",
+"+...++.......++.++.......++...+",
+"+...++.......++.++.......++...+",
+"+...++.......++.++.......++...+",
+"+...++......+++.+++......++...+",
+"+...++.....++++.++++.....++...+",
+"+...++...++++++.++++++...++...+",
+"+...++.++++++++.++++++++.++...+",
+"+...+++++++++++.+++++++++++...+",
+"+.............................+",
+"+++++++++++++++++++++++++++++++"};
--- a/symbols/dolbydigital20.xpm
+++ b/symbols/dolbydigital20.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * dolbydigital20_xpm[] = {
+"55 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"+.....................................................+",
+"+...+++++++++++.+++++++++++.....++++.........++++.....+",
+"+...++.++++++++.++++++++.++...+++++++.......++++++....+",
+"+...++...++++++.++++++...++...++....++......++..++....+",
+"+...++.....++++.++++.....++.........++.....++....++...+",
+"+...++......+++.+++......++.........++.....++....++...+",
+"+...++.......++.++.......++........+++.....++....++...+",
+"+...++.......++.++.......++.......+++......++....++...+",
+"+...++.......++.++.......++......+++.......++....++...+",
+"+...++.......++.++.......++.....+++........++....++...+",
+"+...++......+++.+++......++....+++.........++....++...+",
+"+...++.....++++.++++.....++...+++..........++....++...+",
+"+...++...++++++.++++++...++...++............++..++....+",
+"+...++.++++++++.++++++++.++...++++++++..++..++++++....+",
+"+...+++++++++++.+++++++++++...++++++++..++...++++.....+",
+"+.....................................................+",
+"+++++++++++++++++++++++++++++++++++++++++++++++++++++++"};
--- a/symbols/dolbydigital51.xpm
+++ b/symbols/dolbydigital51.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * dolbydigital51_xpm[] = {
+"51 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++++++++++++++++++++++++",
+"+.................................................+",
+"+...+++++++++++.+++++++++++...+++++++........++...+",
+"+...++.++++++++.++++++++.++...+++++++.....+++++...+",
+"+...++...++++++.++++++...++...++..........+++++...+",
+"+...++.....++++.++++.....++...++.............++...+",
+"+...++......+++.+++......++...++++++.........++...+",
+"+...++.......++.++.......++...+++++++........++...+",
+"+...++.......++.++.......++...++...+++.......++...+",
+"+...++.......++.++.......++.........++.......++...+",
+"+...++.......++.++.......++.........++.......++...+",
+"+...++......+++.+++......++.........++.......++...+",
+"+...++.....++++.++++.....++...++....++.......++...+",
+"+...++...++++++.++++++...++...++...+++.......++...+",
+"+...++.++++++++.++++++++.++...+++++++...++...++...+",
+"+...+++++++++++.+++++++++++....+++++....++...++...+",
+"+.................................................+",
+"+++++++++++++++++++++++++++++++++++++++++++++++++++"};
--- a/symbols/five.xpm
+++ b/symbols/five.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * five_xpm[] = {
+"15 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++",
+"..............+",
+"...+++++++....+",
+"...+++++++....+",
+"...++.........+",
+"...++.........+",
+"...++.........+",
+"...++++++.....+",
+"...+++++++....+",
+"...++...+++...+",
+".........++...+",
+".........++...+",
+"...++....++...+",
+"...++...+++...+",
+"...+++++++....+",
+"....+++++.....+",
+"..............+",
+"+++++++++++++++"};
--- a/symbols/four.xpm
+++ b/symbols/four.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * four_xpm[] = {
+"15 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++",
+"..............+",
+".........++...+",
+"........+++...+",
+".......++++...+",
+"......++.++...+",
+".....++..++...+",
+".....++..++...+",
+"....++...++...+",
+"...++....++...+",
+"...+++++++++..+",
+"...+++++++++..+",
+".........++...+",
+".........++...+",
+".........++...+",
+".........++...+",
+"..............+",
+"+++++++++++++++"};
--- a/symbols/monoleft.xpm
+++ b/symbols/monoleft.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * monoleft_xpm[] = {
+"17 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++",
+"+................",
+"+...++...........",
+"+...++++.........",
+"+...++++++.......",
+"+...++++++++.....",
+"+...+++++++++++++",
+"+...+++++++++++++",
+"+...+++++++++..++",
+"+...+++++++++..++",
+"+...+++++++++++++",
+"+...+++++++++++++",
+"+...++++++++.....",
+"+...++++++.......",
+"+...++++.........",
+"+...+++..........",
+"+................",
+"+++++++++++++++++"};
--- a/symbols/monoright.xpm
+++ b/symbols/monoright.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * monoright_xpm[] = {
+"17 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++",
+"+................",
+"+..............++",
+"+............++++",
+"+..........++++++",
+"+........++++++++",
+"+...+++++++++++++",
+"+...+++++++++++++",
+"+...++..+++++++++",
+"+...++..+++++++++",
+"+...+++++++++++++",
+"+...+++++++++++++",
+"+........++++++++",
+"+..........++++++",
+"+............++++",
+"+.............+++",
+"+................",
+"+++++++++++++++++"};
--- a/symbols/ntsc.xpm
+++ b/symbols/ntsc.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * ntsc_xpm[] = {
+"19 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++",
+"+.................+",
+"+...++.......++...+",
+"+...+++......++...+",
+"+...++++.....++...+",
+"+...++++.....++...+",
+"+...++.++....++...+",
+"+...++..++...++...+",
+"+...++..++...++...+",
+"+...++...++..++...+",
+"+...++...++..++...+",
+"+...++....++.++...+",
+"+...++.....++++...+",
+"+...++.....++++...+",
+"+...++......+++...+",
+"+...++.......++...+",
+"+.................+",
+"+++++++++++++++++++"};
--- a/symbols/one.xpm
+++ b/symbols/one.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * one_xpm[] = {
+"15 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++",
+"..............+",
+".......++.....+",
+"....+++++.....+",
+"....+++++.....+",
+".......++.....+",
+".......++.....+",
+".......++.....+",
+".......++.....+",
+".......++.....+",
+".......++.....+",
+".......++.....+",
+".......++.....+",
+".......++.....+",
+".......++.....+",
+".......++.....+",
+"..............+",
+"+++++++++++++++"};
--- a/symbols/pal.xpm
+++ b/symbols/pal.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * pal_xpm[] = {
+"18 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++",
+"+................+",
+"+...++++++++.....+",
+"+...+++++++++....+",
+"+...++.....+++...+",
+"+...++......++...+",
+"+...++......++...+",
+"+...++.....+++...+",
+"+...+++++++++....+",
+"+...++++++++.....+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+................+",
+"++++++++++++++++++"};
--- a/symbols/stereo.xpm
+++ b/symbols/stereo.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * stereo_xpm[] = {
+"17 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++",
+"+................",
+"+..............++",
+"+............++++",
+"+..........+++.++",
+"+........+++...++",
+"+...+++++++....++",
+"+...++++++.....++",
+"+...++..++.....++",
+"+...++..++.....++",
+"+...++++++.....++",
+"+...+++++++....++",
+"+........+++...++",
+"+..........+++.++",
+"+............++++",
+"+.............+++",
+"+................",
+"+++++++++++++++++"};
--- a/symbols/three.xpm
+++ b/symbols/three.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * three_xpm[] = {
+"15 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++",
+"..............+",
+".....+++++....+",
+"....+++++++...+",
+"...++....++...+",
+"...++....++...+",
+".........++...+",
+"........++....+",
+"......+++.....+",
+"......++++....+",
+"........+++...+",
+".........++...+",
+"...++....++...+",
+"...++...+++...+",
+"....++++++....+",
+".....++++.....+",
+"..............+",
+"+++++++++++++++"};
--- a/symbols/two.xpm
+++ b/symbols/two.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * two_xpm[] = {
+"15 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++",
+"..............+",
+".....++++.....+",
+"...+++++++....+",
+"...++....++...+",
+".........++...+",
+".........++...+",
+"........+++...+",
+".......+++....+",
+"......+++.....+",
+".....+++......+",
+"....+++.......+",
+"...+++........+",
+"...++.........+",
+"...++++++++...+",
+"...++++++++...+",
+"..............+",
+"+++++++++++++++"};
--- a/symbols/zero.xpm
+++ b/symbols/zero.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * zero_xpm[] = {
+"15 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++",
+"..............+",
+".....++++.....+",
+"....++++++....+",
+"....++..++....+",
+"...++....++...+",
+"...++....++...+",
+"...++....++...+",
+"...++....++...+",
+"...++....++...+",
+"...++....++...+",
+"...++....++...+",
+"...++....++...+",
+"....++..++....+",
+"....++++++....+",
+".....++++.....+",
+"..............+",
+"+++++++++++++++"};
Author	SHA1	Message	Date
Rolf Ahrenberg	825755281f	Added Estonian translations (Thanks to Arthur Konovalov).	2005-01-24 04:20:00 +02:00
Rolf Ahrenberg	ab3f270eed	Updated for vdr-1.3.19.	2005-01-23 04:20:00 +02:00
Rolf Ahrenberg	995b2567e5	Some minor cosmetic fixes.	2005-01-23 04:20:00 +02:00
Rolf Ahrenberg	6f9961f499	Updated for vdr-1.3.18. Added DEBUG mode (make DEBUG=1 plugins). OSD height is now user configurable. Added audio channel selection into Yellow key.	2005-01-15 04:20:00 +02:00
Rolf Ahrenberg	c454189adf	Updated for vdr-1.3.17. Fixed receiver related crash (Thanks to Marco Schluessler).	2004-11-28 04:20:00 +02:00
Rolf Ahrenberg	5339f71b33	Yet Another Minor Release. Integrated the CA system names patch: "Setup / Show CA System".	2004-09-11 04:20:00 +03:00
Rolf Ahrenberg	8e53fa8521	Fixed OSDSTATUSWIN_XC define. Added preliminary NTSC support (make NTSC_SYSTEM=1 plugins). Fixed "Setup/OSD/Use Small Fonts" bug (Thanks to Winni for reporting this one). Added patches directory: CA system names by Lauri Tischler.	2004-08-18 04:20:00 +03:00
Rolf Ahrenberg	9514ed5387	Added some new symbols and beautified the old ones. Added audio track selection feature. Added preliminary device switching feature (disabled at the moment).	2004-06-24 04:20:00 +03:00
Rolf Ahrenberg	a6039cdd66	Added "AC-3 Stream Information" display mode (Thanks to Lothar Englisch).	2004-06-11 04:20:00 +03:00
Rolf Ahrenberg	848a2ba78d	Fixed the channel switch bug (reported by Stefan Lucke). Nid/Tid/Rid are now included in translations. Added video format and aspect ratio symbols into status window.	2004-06-06 04:20:00 +03:00
Rolf Ahrenberg	74ed4d8490	Added "Stream Information" display mode. Toggle between different modes with 'OK' key: .-> basic -> transponder -> stream -. `-----------------------------------´ Added missing german translations (Thanks to Peter Marquardt).	2004-05-30 04:20:00 +03:00