Updated for vdr-1.3.17.

Fixed receiver related crash (Thanks to Marco Schluessler).
Yet Another Minor Release.
2023-10-10 11:36:53 +00:00 · 2004-11-28 04:20:00 +02:00 · 2004-09-11 04:20:00 +03:00 · 2004-08-18 04:20:00 +03:00 · 2004-06-24 04:20:00 +03:00 · 2004-06-11 04:20:00 +03:00
27 changed files with 2152 additions and 137 deletions
--- a/52
+++ b/52
@@ -1,5 +1,6 @@
+===================================
 VDR Plugin 'femon' Revision History
-----------------------------------
+===================================

 2004-02-15: Version 0.0.1

@@ -50,7 +51,21 @@ VDR Plugin 'femon' Revision History

 - 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

@@ -63,3 +78,36 @@ VDR Plugin 'femon' Revision History
  .-> 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).
--- 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/75
+++ b/75
@@ -10,9 +10,7 @@ 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! I'm number two.
+VDR & DVB. BMW & Ph.D.. BEER. YARRR!

 Description:

@@ -20,17 +18,66 @@ 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 and stream information are also available in advanced display modes.
-User can switch between different display modes by pressing 'OK' key.

-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 and Andreas Regel.
-The bitrate calculation algorithm originates from the 'dvbstream' application by
+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 / Important Notes:
+Terminology:
+
+--------------------------------------------------------------
+|## Channel Name ######################### [DD][AR][VF][A][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
+
+DD      - AC-3 stream (optional)
+AR      - Aspect Ratio: 1:1/4:3/16:9/2.21:1 (optional)
+VF      - Video format: PAL/NTSC (optional)
+A       - Audio track: 1..2 (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
+Right/Left    - Switch to next/previous device that provides the current channel
+Green         - Select language (APID)
+Back          - Exit plugin
+
+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 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
@@ -39,4 +86,10 @@ Shortcomings / Todo list / Important Notes:
  ttxtsubs, but closing and reopening the femon plugin might help temporarily as
  well. Btw., this same thing happens with OSDTeletext plugin too :)
 - Disable the stream analyze 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.4!
+- 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.
+- Shrinked OSD is available 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 < 10317
 #error "You don't exist! Go away!"
 #endif

@@ -71,6 +71,7 @@ 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, "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);
@@ -85,9 +86,10 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value)

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

@@ -100,6 +102,7 @@ void cMenuFemonSetup::Setup(void)
  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 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));
@@ -115,8 +118,9 @@ 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("ShowCASystem",   femonConfig.showcasystem);
  SetupStore("RedLimit",       femonConfig.redlimit);
  SetupStore("GreenLimit",     femonConfig.greenlimit);
  SetupStore("UpdateInterval", femonConfig.updateinterval);
--- a/femon.h
+++ b/femon.h
@@ -11,7 +11,7 @@

 #include <vdr/plugin.h>

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

--- a/femoncfg.c
+++ b/femoncfg.c
@@ -21,4 +21,5 @@ cFemonConfig::cFemonConfig(void)
  analyzestream  = 1;
  calcinterval   = 20;
  syslogoutput   = 0;
+  showcasystem   = 0;
 }
--- a/femoncfg.h
+++ b/femoncfg.h
@@ -13,6 +13,7 @@ enum dispModes {
  modeBasic,
  modeTransponder,
  modeStream,
+  modeAC3,
  modeMaxNumber
  };

@@ -29,6 +30,7 @@ public:
  int analyzestream;
  int calcinterval;
  int syslogoutput;
+  int showcasystem;
 };

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

+#include "symbols/dev0.xpm"
+#include "symbols/dev1.xpm"
+#include "symbols/dev2.xpm"
+#include "symbols/dev3.xpm"
+#include "symbols/apid1.xpm"
+#include "symbols/apid2.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 FRONTEND_DEVICE          "/dev/dvb/adapter%d/frontend%d"
 #define CHANNELINPUT_TIMEOUT     1000

-#define SCREENWIDTH              720 // in pixels
-#define SCREENHEIGHT             576 // in pixels
-#define OSDWIDTH                 600 // in pixels
+#ifdef NTSC_SYSTEM
+#define OSDHEIGHT                420 // in pixels
+#else
 #define OSDHEIGHT                480 // in pixels
+#endif
+#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 OSDINFOWIN_Y(offset)     (femonConfig.position ? (OSDHEIGHT - OSDINFOHEIGHT + offset) : offset)
-#define OSDINFOWIN_X(col)        ((col == 4) ? 470 : (col == 3) ? 300 : (col==2) ? 180 : 15)
+#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) * SCREENWIDTH / 6) + ((SCREENWIDTH / 6 - m_Font->Width(txt)) / 2))
+#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::bmDevice0(dev0_xpm);
+cBitmap cFemonOsd::bmDevice1(dev1_xpm);
+cBitmap cFemonOsd::bmDevice2(dev2_xpm);
+cBitmap cFemonOsd::bmDevice3(dev3_xpm);
+cBitmap cFemonOsd::bmApid1(apid1_xpm);
+cBitmap cFemonOsd::bmApid2(apid2_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")
 {
@@ -47,8 +82,15 @@ cFemonOsd::cFemonOsd(void)
  m_BER = 0;
  m_UNC = 0;
  m_DisplayMode = femonConfig.displaymode;
-  m_Font = cFont::GetFont(fontSml);
  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)
@@ -72,13 +114,116 @@ void cFemonOsd::DrawStatusWindow(void)
  int snr = m_SNR / 655;
  int signal = m_Signal / 655;
  int offset = 0;
+  int x = OSDWIDTH;
+  int y = 0;
  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", m_Number ? m_Number : channel->Number(), m_Number ? "-" : "", channel->ShortName(true));
     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) {
+        int value = cDevice::ActualDevice()->CardIndex();
+        if (value == 0) {
+           x -= bmDevice0.Width() + SPACING;
+           y = (m_Font->Height() - bmDevice0.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDevice0, clrBlack, clrWhite);
+           }
+        else if (value == 1) {
+           x -= bmDevice1.Width() + SPACING;
+           y = (m_Font->Height() - bmDevice1.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDevice1, clrBlack, clrWhite);
+           }
+        else if (value == 2) {
+           x -= bmDevice2.Width() + SPACING;
+           y = (m_Font->Height() - bmDevice2.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDevice2, clrBlack, clrWhite);
+           }
+        else if (value == 3) {
+           x -= bmDevice3.Width() + SPACING;
+           y = (m_Font->Height() - bmDevice3.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDevice3, clrBlack, clrWhite);
+           }
+        value = -1;
+        const char **AudioTracks = cDevice::PrimaryDevice()->GetAudioTracks(&value);
+        if (AudioTracks) {
+           if (value == 0) {
+              x -= bmApid1.Width() + SPACING;
+              y = (m_Font->Height() - bmApid1.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmApid1, clrBlack, clrWhite);
+              }
+           else if (value == 1) {
+              x -= bmApid2.Width() + SPACING;
+              y = (m_Font->Height() - bmApid2.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmApid2, 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);
+           }
+        if (m_Receiver && m_Receiver->AC3Valid()) {
+           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);
+              }
+           }
+        }
     offset += m_Font->Height();
     if (signal > 0) {
        signal = BARWIDTH(signal);
@@ -124,9 +269,9 @@ void cFemonOsd::DrawStatusWindow(void)
     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:", tr("Audio"));
+     snprintf(buf, sizeof(buf), "%s:", (m_Receiver && m_Receiver->AC3Valid()) ? 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->AudioBitrate(), tr("kbit/s"));
+     if (m_Receiver) snprintf(buf, sizeof(buf), "%.0f %s", m_Receiver->AC3Valid() ? 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();
@@ -175,7 +320,75 @@ void cFemonOsd::DrawInfoWindow(void)
        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());
@@ -184,14 +397,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();
@@ -386,14 +599,14 @@ void cFemonOsd::DrawInfoWindow(void)
        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 == 100) snprintf(buf, sizeof(buf), "1:1");
-           else if (value == 133) snprintf(buf, sizeof(buf), "4:3");
-           else if (value == 177) snprintf(buf, sizeof(buf), "16:9");
-           else if (value == 233) snprintf(buf, sizeof(buf), "2.21:1");
-           else                   snprintf(buf, sizeof(buf), "%s", tr("reserved"));
+           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), "---");
+        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);
@@ -403,12 +616,12 @@ void cFemonOsd::DrawInfoWindow(void)
        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 == 1) snprintf(buf, sizeof(buf), "%s", tr("PAL"));
-           else if (value == 2) snprintf(buf, sizeof(buf), "%s", tr("NTSC"));
-           else                 snprintf(buf, sizeof(buf), "%s", tr("unknown"));
+           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), "---");
+        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);
@@ -417,17 +630,19 @@ void cFemonOsd::DrawInfoWindow(void)
        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", channel->Apid1());
+        value = -1;
+        cDevice::PrimaryDevice()->GetAudioTracks(&value);
+        snprintf(buf, sizeof(buf), "#%d", (value > 0 ? channel->Apid2() : channel->Apid1()));
        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);
-        dvalue = m_Receiver->AudioStreamBitrate();
        if (m_Receiver) {
-            if      (dvalue == -1.0) snprintf(buf, sizeof(buf), "%s (%.0f %s)", tr("reserved"), m_Receiver->AudioBitrate(), tr("kbit/s"));
-            else if (dvalue == -2.0) 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), "---");
+           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);
@@ -437,12 +652,105 @@ void cFemonOsd::DrawInfoWindow(void)
        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 == -1) snprintf(buf, sizeof(buf), "%s", tr("reserved"));
-           else                  snprintf(buf, sizeof(buf), "%.1f %s", (value / 1000.0), tr("kHz"));
+           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), "---");
+        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", tr("Stream Information"), tr("AC-3 Stream"), channel->Dpid1());
+        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrBackground, clrWhite, m_Font);
+        offset += m_Font->Height();
+        if (m_Receiver && m_Receiver->AC3Valid()) {
+           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);
@@ -453,9 +761,11 @@ void cFemonOsd::DrawInfoWindow(void)

 void cFemonOsd::Action(void)
 {
+  int t0;
  //printf("cFemonOsd::Action()\n");
  m_Active = true;
  while (m_Active) {
+    t0 = time_ms();
    if (m_Frontend != -1) {
       CHECK(ioctl(m_Frontend, FE_READ_STATUS, &m_FrontendStatus));
       CHECK(ioctl(m_Frontend, FE_READ_SIGNAL_STRENGTH, &m_Signal));
@@ -468,7 +778,7 @@ 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 - (time_ms() - t0));
    }
 }

@@ -486,8 +796,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);
@@ -507,8 +817,8 @@ void cFemonOsd::Show(void)
     if (m_Receiver)
        delete m_Receiver;
     if (femonConfig.analyzestream) {
-        int channelNumber = cDevice::CurrentChannel();
-        m_Receiver = new cFemonReceiver(Channels.GetByNumber(channelNumber)->Ca(), Channels.GetByNumber(channelNumber)->Vpid(), Channels.GetByNumber(channelNumber)->Apid1());
+        cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+        m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), channel->Apid1(), channel->Dpid1());
        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
        }
     Start();
@@ -519,6 +829,8 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
 {
  //printf("cFemonOsd::ChannelSwitch()\n");
  char *dev = NULL;
+  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);
@@ -530,15 +842,15 @@ 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.analyzestream) {
-     channelNumber = cDevice::CurrentChannel();
-     m_Receiver = new cFemonReceiver(Channels.GetByNumber(channelNumber)->Ca(), Channels.GetByNumber(channelNumber)->Vpid(), Channels.GetByNumber(channelNumber)->Apid1());
+     cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+     m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), channel->Apid1(), channel->Dpid1());
     cDevice::ActualDevice()->AttachReceiver(m_Receiver);
     }
 }
@@ -546,9 +858,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;
@@ -587,6 +898,49 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
            break;
       case kBack:
            return osEnd;
+       case kGreen:
+            {
+            int CurrentAudioTrack = -1;
+            const char **AudioTracks = cDevice::PrimaryDevice()->GetAudioTracks(&CurrentAudioTrack);
+            if (AudioTracks) {
+               const char **at = &AudioTracks[CurrentAudioTrack];
+               if (!*++at)
+                  at = AudioTracks;
+               cDevice::PrimaryDevice()->SetAudioTrack(at - AudioTracks);
+               if (femonConfig.analyzestream) {
+                  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+                  if (m_Receiver)
+                     delete m_Receiver;
+                  m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), (at - AudioTracks) ? channel->Apid2() : channel->Apid1(), channel->Dpid1());
+                  cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+                  }
+               }
+            }
+            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) == kRight) {
+                      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->Apid1(), channel->Apid2(), channel->Dpid1(), channel->Dpid2()));
+                      //cStatus::MsgChannelSwitch(cDevice::GetDevice(device), channel->Number());
+                      break;
+                      }
+                   }
+               }
+            }
+            break;
       case kUp|k_Repeat:
       case kUp:
       case kDown|k_Repeat:
@@ -609,7 +963,9 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
               }
            break;
       case kOk:
-            if (++m_DisplayMode >= modeMaxNumber) m_DisplayMode = 0; // toggle between display modes
+            // toggle between display modes
+            if (++m_DisplayMode == modeAC3 && !Channels.GetByNumber(cDevice::CurrentChannel())->Dpid1()) m_DisplayMode++;
+            if (m_DisplayMode >= modeMaxNumber) m_DisplayMode = 0;
            DrawInfoWindow();
            break;
       default:
--- a/femonosd.h
+++ b/femonosd.h
@@ -16,6 +16,7 @@
 #include <vdr/thread.h>
 #include <vdr/status.h>
 #include <vdr/channels.h>
+#include <vdr/transfer.h>

 class cFemonOsd : public cOsdObject, public cThread, public cStatus {
 private:
@@ -35,6 +36,8 @@ private:
  int m_DisplayMode;
  const cFont *m_Font;
  cMutex* m_Mutex;
+  static cBitmap bmDevice0, bmDevice1, bmDevice2, bmDevice3, bmApid1, bmApid2, bmDD, bmDD20, bmDD51;
+  static cBitmap bmPAL, bmNTSC, bmAspectRatio_1_1, bmAspectRatio_16_9, bmAspectRatio_2_21_1, bmAspectRatio_4_3;
  void DrawStatusWindow(void);
  void DrawInfoWindow(void);

--- a/femonreceiver.c
+++ b/femonreceiver.c
@@ -16,109 +16,133 @@
 #define PAYLOAD       0x10
 #define PTS_DTS_FLAGS 0xC0

-cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid)
-:cReceiver(Ca, -1, 2, Vpid, Apid), cThread("femon receiver")
+cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid, int Dpid)
+:cReceiver(Ca, -1, 3, Vpid, Apid, Dpid), cThread("femon receiver")
 {
  //printf("cFemonReceiver::cFemonReceiver()\n");
  m_Active = false;
  m_VideoPid = Vpid;
  m_AudioPid = Apid;
+  m_AC3Pid = Dpid;      
+  m_VideoValid = false;
  m_VideoPacketCount = 0;
  m_VideoHorizontalSize = 0;
  m_VideoVerticalSize = 0;
-  m_VideoAspectRatio = 0;
-  m_VideoFormat = 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");
+  Detach();
  if (m_Active) {
     m_Active = false;
     Cancel(0);
     }
 }

-/* the following function originates from libdvbmpeg: */
+/* The following function originates from libdvbmpeg: */
 void cFemonReceiver::GetVideoInfo(uint8_t *mbuf, int count)
 {
  //printf("cFemonReceiver::GetVideoInfo()\n");
  uint8_t *headr;
  int found = 0;
  int c = 0;
-  while (found < 4 && c + 4 < count) {
+  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)
+    if ((b[0] == 0x00) && (b[1] == 0x00) && (b[2] == 0x01) && (b[3] == 0xb3))
       found = 4;
    else
       c++;
    }
-  if (!found) return;
-  c += 4;
-  if (c + 12 >= count) return;
-  headr = mbuf + c;
-  m_VideoHorizontalSize = ((headr[1] &0xF0) >> 4) | (headr[0] << 4);
-  m_VideoVerticalSize = ((headr[1] &0x0F) << 8) | (headr[2]);
+  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 ){
+  switch ( sw ){
    case 1:
-      m_VideoAspectRatio = 100;
+      m_VideoAspectRatio = AR_1_1;
      break;
    case 2:
-      m_VideoAspectRatio = 133;
+      m_VideoAspectRatio = AR_4_3;
      break;
    case 3:
-      m_VideoAspectRatio = 177;
+      m_VideoAspectRatio = AR_16_9;
      break;
    case 4:
-      m_VideoAspectRatio = 221;
+      m_VideoAspectRatio = AR_2_21_1;
      break;
    case 5 ... 15:
-      m_VideoAspectRatio = 0;
-      break;
    default:
-      return;
+      m_VideoAspectRatio = AR_RESERVED;
+      break;
    }
  sw = (int)(headr[3] & 0x0F);
  switch ( sw ) {
    case 1:
-      m_VideoFrameRate = 24000/1001.0;
-      m_VideoFormat = 0;
+      m_VideoFrameRate = 24000 / 1001.0;
+      m_VideoFormat = VF_UNKNOWN;
      break;
    case 2:
      m_VideoFrameRate = 24.0;
-      m_VideoFormat = 0;
+      m_VideoFormat = VF_UNKNOWN;
      break;
    case 3:
      m_VideoFrameRate = 25.0;
-      m_VideoFormat = 1;
+      m_VideoFormat = VF_PAL;
      break;
    case 4:
-      m_VideoFrameRate = 30000/1001.0;
-      m_VideoFormat = 2;
+      m_VideoFrameRate = 30000 / 1001.0;
+      m_VideoFormat = VF_NTSC;
      break;
    case 5:
      m_VideoFrameRate = 30.0;
-      m_VideoFormat = 2;
+      m_VideoFormat = VF_NTSC;
      break;
    case 6:
      m_VideoFrameRate = 50.0;
-      m_VideoFormat = 1;
+      m_VideoFormat = VF_PAL;
      break;
    case 7:
      m_VideoFrameRate = 60.0;
-      m_VideoFormat = 2;
+      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;
@@ -131,9 +155,10 @@ static unsigned int bitrates[3][16] =
  {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};
+static unsigned int samplerates[4] =
+{441, 480, 320, 0};

-/* the following function originates from libdvbmpeg: */
+/* The following function originates from libdvbmpeg: */
 void cFemonReceiver::GetAudioInfo(uint8_t *mbuf, int count)
 {
  //printf("cFemonReceiver::GetAudioInfo()\n");
@@ -141,35 +166,102 @@ void cFemonReceiver::GetAudioInfo(uint8_t *mbuf, int count)
  int found = 0;
  int c = 0;
  int tmp = 0;
-  while (!found && c < count) {
+  m_AudioValid = false;
+  while (!found && (c < count)) {
    uint8_t *b = mbuf + c;
-    if (b[0] == 0xff && (b[1] & 0xf8) == 0xf8)
+    if ((b[0] == 0xff) && ((b[1] & 0xf8) == 0xf8))
       found = 1;
    else
       c++;
    }	
-  if (!found) return;
-  if (c + 3 >= count) return;
+  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 = -2.0; // free
+     m_AudioStreamBitrate = (double)FR_FREE;
  else if (tmp == 0xf)
-     m_AudioStreamBitrate = -1.0; // reserved
+     m_AudioStreamBitrate = (double)FR_RESERVED;
  else
     m_AudioStreamBitrate = tmp / 1000.0;
  tmp = samplerates[((headr[2] & 0x0c) >> 2)] * 100;
  if (tmp == 3)
-     m_AudioSamplingFreq = -1; // reserved
+     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();
+  if (On) {
+     if (!m_Active)
+        Start();
+     }
+  else if (m_Active) {
+     m_Active = false;
+     Cancel(0);
+     }
 }

 void cFemonReceiver::Receive(uchar *Data, int Length)
@@ -184,6 +276,9 @@ 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;
@@ -200,9 +295,12 @@ void cFemonReceiver::Receive(uchar *Data, int Length)
           if (pid == m_VideoPid) {
              GetVideoInfo(pay, l);
              }
-           if (pid == m_AudioPid) {
+           else if (pid == m_AudioPid) {
              GetAudioInfo(pay, l);
              }
+           else if (pid == m_AC3Pid) {
+              GetAC3Info(pay, l);
+              }
           }
        }
     /* end */
@@ -211,14 +309,18 @@ void cFemonReceiver::Receive(uchar *Data, int Length)

 void cFemonReceiver::Action(void)
 {
+  int t0;
  //printf("cFemonReceiver::Action()\n");
  m_Active = true;
  while (m_Active) {
+        t0 = time_ms();
        // 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 - (time_ms() - t0));
    }
 }
--- a/femonreceiver.h
+++ b/femonreceiver.h
@@ -12,26 +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_VideoHorizontalSize;
-  int m_VideoVerticalSize;
-  int m_VideoAspectRatio;
-  int m_VideoFormat;
+  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;
-  int m_AudioPacketCount;
+  bool   m_AudioValid;
+  int    m_AudioPacketCount;
  double m_AudioStreamBitrate;
  double m_AudioBitrate;
-  int m_AudioSamplingFreq;
-  int m_AudioMPEGLayer;
-  void GetVideoInfo(uint8_t *mbuf, int count);
-  void GetAudioInfo(uint8_t *mbuf, int count);
+  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);
@@ -39,21 +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();

+  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; };    // 4:3 == 133, ...
-  int VideoFormat(void)           { return m_VideoFormat; };         // 0 == unknown, 1 == PAL, 2 == NTSC
+  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

-  int AudioMPEGLayer(void)        { return m_AudioMPEGLayer; };      // number
+  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/apid1.xpm
+++ b/symbols/apid1.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * apid1_xpm[] = {
+"32 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++++++++++++++++",
+"+..............................+",
+"+..............++.......++.....+",
+"+............++++....+++++.....+",
+"+..........+++.++....+++++.....+",
+"+........+++...++.......++.....+",
+"+...+++++++....++.......++.....+",
+"+...++++++.....++.......++.....+",
+"+...++..++.....++.......++.....+",
+"+...++..++.....++.......++.....+",
+"+...++++++.....++.......++.....+",
+"+...+++++++....++.......++.....+",
+"+........+++...++.......++.....+",
+"+..........+++.++.......++.....+",
+"+............++++.......++.....+",
+"+.............+++.......++.....+",
+"+..............................+",
+"++++++++++++++++++++++++++++++++"};
--- a/symbols/apid2.xpm
+++ b/symbols/apid2.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * apid2_xpm[] = {
+"32 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++++++++++++++++",
+"+..............................+",
+"+..............++.....++++.....+",
+"+............++++...+++++++....+",
+"+..........+++.++...++....++...+",
+"+........+++...++.........++...+",
+"+...+++++++....++.........++...+",
+"+...++++++.....++........+++...+",
+"+...++..++.....++.......+++....+",
+"+...++..++.....++......+++.....+",
+"+...++++++.....++.....+++......+",
+"+...+++++++....++....+++.......+",
+"+........+++...++...+++........+",
+"+..........+++.++...++.........+",
+"+............++++...++++++++...+",
+"+.............+++...++++++++...+",
+"+..............................+",
+"++++++++++++++++++++++++++++++++"};
--- 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/dev0.xpm
+++ b/symbols/dev0.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * dev0_xpm[] = {
+"29 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++",
+"+...........................+",
+"+.......+..+.......++++.....+",
+"+.......+..+......++++++....+",
+"+.......+..+......++..++....+",
+"+....+++++++++...++....++...+",
+"+....+++++++++...++....++...+",
+"+......+..+......++....++...+",
+"+......+..+......++....++...+",
+"+......+..+......++....++...+",
+"+......+..+......++....++...+",
+"+...+++++++++....++....++...+",
+"+...+++++++++....++....++...+",
+"+.....+..+........++..++....+",
+"+.....+..+........++++++....+",
+"+.....+..+.........++++.....+",
+"+...........................+",
+"+++++++++++++++++++++++++++++"};
--- a/symbols/dev1.xpm
+++ b/symbols/dev1.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * dev1_xpm[] = {
+"29 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++",
+"+...........................+",
+"+.......+..+.........++.....+",
+"+.......+..+......+++++.....+",
+"+.......+..+......+++++.....+",
+"+....+++++++++.......++.....+",
+"+....+++++++++.......++.....+",
+"+......+..+..........++.....+",
+"+......+..+..........++.....+",
+"+......+..+..........++.....+",
+"+......+..+..........++.....+",
+"+...+++++++++........++.....+",
+"+...+++++++++........++.....+",
+"+.....+..+...........++.....+",
+"+.....+..+...........++.....+",
+"+.....+..+...........++.....+",
+"+...........................+",
+"+++++++++++++++++++++++++++++"};
--- a/symbols/dev2.xpm
+++ b/symbols/dev2.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * dev2_xpm[] = {
+"29 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++",
+"+...........................+",
+"+.......+..+.......++++.....+",
+"+.......+..+.....+++++++....+",
+"+.......+..+.....++....++...+",
+"+....+++++++++.........++...+",
+"+....+++++++++.........++...+",
+"+......+..+...........+++...+",
+"+......+..+..........+++....+",
+"+......+..+.........+++.....+",
+"+......+..+........+++......+",
+"+...+++++++++.....+++.......+",
+"+...+++++++++....+++........+",
+"+.....+..+.......++.........+",
+"+.....+..+.......++++++++...+",
+"+.....+..+.......++++++++...+",
+"+...........................+",
+"+++++++++++++++++++++++++++++"};
--- a/symbols/dev3.xpm
+++ b/symbols/dev3.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * dev3_xpm[] = {
+"29 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/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/pal.xpm
+++ b/symbols/pal.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * pal_xpm[] = {
+"18 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++",
+"+................+",
+"+...++++++++.....+",
+"+...+++++++++....+",
+"+...++.....+++...+",
+"+...++......++...+",
+"+...++......++...+",
+"+...++.....+++...+",
+"+...+++++++++....+",
+"+...++++++++.....+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+................+",
+"++++++++++++++++++"};
Author	SHA1	Message	Date
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