Added Estonian translations (Thanks to Arthur Konovalov).

HISTORY

@@ -118,3 +118,15 @@ VDR Plugin 'femon' Revision History
 - 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).

femon.c

@@ -12,7 +12,7 @@
 #include "femonosd.h"
 #include "femon.h"
 
-#if VDRVERSNUM && VDRVERSNUM < 10318
+#if VDRVERSNUM && VDRVERSNUM < 10319
 #error "You don't exist! Go away!"
 #endif
 

femon.h

@@ -11,7 +11,7 @@
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.7.7";
+static const char *VERSION        = "0.8.1";
 static const char *DESCRIPTION    = "DVB Signal Information Monitor (OSD)";
 static const char *MAINMENUENTRY  = "Signal Information";
 

femoni18n.c

@@ -27,7 +27,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "DVB Signaalmonitor (OSD)", // Eesti
     "", // Dansk
   },
   { "Signal Information", // English
@@ -48,7 +48,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Signaaliinfo", // Eesti
     "", // Dansk
   },
   { "Position", // English
@@ -69,7 +69,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Positsioon", // Eesti
     "", // Dansk
   },
   { "Height", // English
@@ -90,7 +90,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "K<EFBFBD>rgus", // Eesti
     "", // Dansk
   },
   { "Default Display Mode", // English
@@ -111,7 +111,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>  
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Vaikimisi displei moodus", // Eesti
     "", // Dansk
   },
   { "basic", // English
@@ -132,7 +132,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>  
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "standard", // Eesti
     "", // Dansk
   },
   { "transponder", // English
@@ -154,7 +154,7 @@ const tI18nPhrase Phrases[] = {
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
     "", // Eesti
-    "", // Dansk
+    "transponder", // Dansk
   },
   { "stream", // English
     "Stream", // Deutsch
@@ -174,7 +174,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>  
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "striim", // Eesti
     "", // Dansk
   },
   { "Hide Mainmenu Entry", // English
@@ -195,7 +195,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Peida valik peamen<65><6E>s", // Eesti
     "", // Dansk
   },
   { "OSD Update Interval [0.1s]", // English
@@ -216,7 +216,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (0,1 <20><><EFBFBD>)", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Uuendusintervall [0,1s]", // Eesti
     "", // Dansk
   },
   { "Analyze Stream", // English
@@ -237,7 +237,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Striimi anal<61><6C>s", // Eesti
     "", // Dansk
   },
   { "Calculation Interval [0.1s]", // English
@@ -258,7 +258,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (0,1 <20><><EFBFBD>)", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Kalkulatsiooni intervall [0,1s]", // Eesti
     "", // Dansk
   },
   { "Red Limit [%]", // English
@@ -279,7 +279,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> (%)", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Punase limiit [%]", // Eesti
     "", // Dansk
   },
   { "Green Limit [%]", // English
@@ -300,7 +300,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> (%)", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Rohelise limiit [%]", // Eesti
     "", // Dansk
   },
   { "Transponder Information", // English
@@ -321,7 +321,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Transponderi info", // Eesti
     "", // Dansk
   },
   { "Satellite Card", // English
@@ -342,7 +342,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Satelliidikaart", // Eesti
     "", // Dansk
   },
   { "Cable Card", // English
@@ -363,7 +363,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Kaablikaart", // Eesti
     "", // Dansk
   },
   { "Terrestial Card", // English
@@ -384,7 +384,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Terrestiaalkaart", // Eesti
     "", // Dansk
   },
   { "Use Syslog Output", // English
@@ -405,7 +405,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> syslog", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Kirjuta s<>steemilogisse", // Eesti
     "", // Dansk
   },
   { "LOCK", // English
@@ -594,7 +594,7 @@ const tI18nPhrase Phrases[] = {
     "None", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "None", // Hrvatski (Croatian)
-    "None", // Eesti
+    "Ei", // Eesti
     "None", // Dansk
   },
   { "Off", // English
@@ -615,7 +615,7 @@ const tI18nPhrase Phrases[] = {
     "Off", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "Off", // Hrvatski (Croatian)
-    "Off", // Eesti
+    "V<EFBFBD>ljas", // Eesti
     "Off", // Dansk
   },
   { "On", // English
@@ -636,7 +636,7 @@ const tI18nPhrase Phrases[] = {
     "On", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "On", // Hrvatski (Croatian)
-    "On", // Eesti
+    "Sees", // Eesti
     "On", // Dansk
   },
   { "MHz", // English
@@ -720,7 +720,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Striimi info", // Eesti
     "", // Dansk
   },
   { "MPEG Layer", // English
@@ -741,7 +741,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "MPEG tase", // Eesti
     "", // Dansk
   },
   { "Video Stream", // English
@@ -762,7 +762,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Videostriim", // Eesti
     "", // Dansk
   },
   { "Bitrate", // English
@@ -783,7 +783,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Bitikiirus", // Eesti
     "", // Dansk
   },
   { "Frame Rate", // English
@@ -804,7 +804,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Kaadrisagedus", // Eesti
     "", // Dansk
   },
   { "Hz", // English
@@ -846,7 +846,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "K<EFBFBD>lgsuhe", // Eesti
     "", // Dansk
   },
   { "reserved", // English
@@ -867,7 +867,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "reserveeritud", // Eesti
     "", // Dansk
   },
   { "free", // English
@@ -888,7 +888,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "vaba", // Eesti
     "", // Dansk
   },
   { "Video Format", // English
@@ -909,7 +909,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Videoformaat", // Eesti
     "", // Dansk
   },
   { "PAL", // English
@@ -972,7 +972,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "tundmatu", // Eesti
     "", // Dansk
   },
   { "Resolution", // English
@@ -993,7 +993,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Resolutsioon", // Eesti
     "", // Dansk
   },
   { "Audio Stream", // English
@@ -1014,7 +1014,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Audiostriim", // Eesti
     "", // Dansk
   },
   { "Sampling Frequency", // English
@@ -1035,7 +1035,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "S<EFBFBD>mplimissagedus", // Eesti
     "", // Dansk
   },
   { "kHz", // English
@@ -1203,7 +1203,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "m<EFBFBD>rkimata", // Eesti
     "", // Dansk
   },
   { "AC-3", // English
@@ -1245,7 +1245,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "AC-3 striim", // Eesti
     "", // Dansk
   },
   { "Frame Size", // English
@@ -1266,7 +1266,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Kaadri suurus", // Eesti
     "", // Dansk
   },
   { "Bit Stream Mode", // English
@@ -1287,7 +1287,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Bitistriimi t<><74>p", // Eesti
     "", // Dansk
   },
   { "Audio Coding Mode", // English
@@ -1308,7 +1308,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Audiokodeering", // Eesti
     "", // Dansk
   },
   { "Center Mix Level", // English
@@ -1329,7 +1329,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Keskmise kanali tase", // Eesti
     "", // Dansk
   },
   { "Surround Mix Level", // English
@@ -1350,7 +1350,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Surround kanali tase", // Eesti
     "", // Dansk
   },
   { "Dolby Surround Mode", // English
@@ -1371,7 +1371,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Dolby Surround'i t<><74>p", // Eesti
     "", // Dansk
   },
   { "Low Frequency Effects", // English
@@ -1392,7 +1392,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "LFE kanal", // Eesti
     "", // Dansk
   },
   { "Dialogue Normalization", // English
@@ -1413,7 +1413,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Dialoogi normalisatsioon", // Eesti
     "", // Dansk
   },
   { "Complete Main (CM)", // English
@@ -1434,7 +1434,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "CM", // Eesti
     "", // Dansk
   },
   { "Music and Effects (ME)", // English
@@ -1455,7 +1455,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Muusika ja efektid (ME)", // Eesti
     "", // Dansk
   },
   { "Visually Impaired (VI)", // English
@@ -1476,7 +1476,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Vaegn<EFBFBD>gemine (VE)", // Eesti
     "", // Dansk
   },
   { "Hearing Impaired (HI)", // English
@@ -1497,7 +1497,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Vaegkuulmine (HI)", // Eesti
     "", // Dansk
   },
   { "Dialogue (D)", // English
@@ -1518,7 +1518,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Dialoog (D)", // Eesti
     "", // Dansk
   },
   { "Commentary (C)", // English
@@ -1539,7 +1539,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Kommentaar (C)", // Eesti
     "", // Dansk
   },
   { "Emergency (E)", // English
@@ -1560,7 +1560,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "H<EFBFBD>dateade (E)", // Eesti
     "", // Dansk
   },
   { "Voice Over (VO)", // English
@@ -1581,7 +1581,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Pealer<EFBFBD><EFBFBD>kimine (VO)", // Eesti
     "", // Dansk
   },
   { "Karaoke", // English
@@ -1602,7 +1602,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Karaoke", // Eesti
     "", // Dansk
   },
   { "Ch1", // English "Channel 1"
@@ -1623,7 +1623,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Kan. 1", // Eesti
     "", // Dansk
   },
   { "Ch2", // English "Channel 2"
@@ -1644,7 +1644,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Kan. 2", // Eesti
     "", // Dansk
   },
   { "C", // English "Center"
@@ -1665,7 +1665,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "K", // Eesti
     "", // Dansk
   },
   { "L", // English "Left"
@@ -1686,7 +1686,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "L", // Eesti
     "", // Dansk
   },
   { "R", // English "Right"
@@ -1707,7 +1707,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "R", // Eesti
     "", // Dansk
   },
   { "S", // English "Surround"
@@ -1728,7 +1728,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "S", // Eesti
     "", // Dansk
   },
   { "SL", // English "Surround Left"
@@ -1749,7 +1749,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "SL", // Eesti
     "", // Dansk
   },
   { "SR", // English "Surround Right"
@@ -1770,7 +1770,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "SR", // Eesti
     "", // Dansk
   },
   { "Show CA System", // English
@@ -1791,7 +1791,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "N<EFBFBD>ita CA s<>steemi", // Eesti
     "", // Dansk
   },
   { "Fixed", // English
@@ -1812,7 +1812,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Fikseeritud", // Eesti
     "", // Dansk
   },
   { "Free to Air", // English
@@ -1833,7 +1833,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "FTA", // Eesti
     "", // Dansk
   },
   { "SECA/Mediaguard", // English
@@ -1854,7 +1854,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "SECA/Mediaguard", // Eesti
     "", // Dansk
   },
   { "Viaccess", // English
@@ -1875,7 +1875,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Viaccess", // Eesti
     "", // Dansk
   },
   { "Irdeto", // English
@@ -1896,7 +1896,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Irdeto", // Eesti
     "", // Dansk
   },
   { "NDS/Videoguard", // English
@@ -1917,7 +1917,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "NDS/Videoguard", // Eesti
     "", // Dansk
   },
   { "Conax", // English
@@ -1938,7 +1938,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Conax", // Eesti
     "", // Dansk
   },
   { "CryptoWorks", // English
@@ -1959,7 +1959,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "CryptoWorks", // Eesti
     "", // Dansk
   },
   { "PowerVu", // English
@@ -1980,7 +1980,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "PowerVu", // Eesti
     "", // Dansk
   },
   { "BetaCrypt", // English
@@ -2001,7 +2001,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "BetaCrypt", // Eesti
     "", // Dansk
   },
   { "NagraVision", // English
@@ -2022,7 +2022,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "NagraVision", // Eesti
     "", // Dansk
   },
   { "SkyCrypt", // English
@@ -2043,7 +2043,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "SkyCrypt", // Eesti
     "", // Dansk
   },
   { NULL }

femonosd.c

@@ -121,6 +121,7 @@ void cFemonOsd::DrawStatusWindow(void)
   int x = OSDWIDTH;
   int y = 0;
   int value = 0;
+  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
   cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
 
   if (m_Osd) {
@@ -158,8 +159,8 @@ void cFemonOsd::DrawStatusWindow(void)
         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(cDevice::PrimaryDevice()->GetCurrentAudioTrack())) {
-           value = int(cDevice::PrimaryDevice()->GetCurrentAudioTrack() - ttAudioFirst);
+        if (IS_AUDIO_TRACK(track)) {
+           value = int(track - ttAudioFirst);
            if (value == 1) {
               x -= bmOne.Width() + SPACING;
               y = (m_Font->Height() - bmOne.Height()) / 2;
@@ -216,7 +217,7 @@ void cFemonOsd::DrawStatusWindow(void)
               m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmStereo, clrBlack, clrWhite);
               }
            }
-        else if (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(cDevice::PrimaryDevice()->GetCurrentAudioTrack())) {
+        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;
@@ -320,9 +321,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:", (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(cDevice::PrimaryDevice()->GetCurrentAudioTrack())) ? tr("AC-3") : tr("Audio"));
+     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(cDevice::PrimaryDevice()->GetCurrentAudioTrack())) ? m_Receiver->AC3Bitrate() : m_Receiver->AudioBitrate(), tr("kbit/s"));
+     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();
@@ -345,6 +346,7 @@ void cFemonOsd::DrawInfoWindow(void)
   int value = 0;
   double dvalue = 0.0;
   cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
 
   if (m_Osd) {
      if (m_DisplayMode == modeTransponder) {
@@ -370,7 +372,7 @@ void cFemonOsd::DrawInfoWindow(void)
         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 < MAXAPIDS)) {
+        while (channel->Dpid(value) && (value < MAXDPIDS)) {
            snprintf(buf2, sizeof(buf2), ", %d", channel->Dpid(value++));
            strncat(buf, buf2, sizeof(buf));
            }
@@ -687,8 +689,7 @@ 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);
-        value = int(cDevice::PrimaryDevice()->GetCurrentAudioTrack());
-        snprintf(buf, sizeof(buf), "#%d", IS_AUDIO_TRACK(value) ? channel->Apid(value - ttAudioFirst) : channel->Apid(0));
+        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);
@@ -719,11 +720,10 @@ void cFemonOsd::DrawInfoWindow(void)
      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);
-        value = int(cDevice::PrimaryDevice()->GetCurrentAudioTrack());
-        snprintf(buf, sizeof(buf), "%s - %s #%d", tr("Stream Information"), tr("AC-3 Stream"), IS_DOLBY_TRACK(value) ? channel->Dpid(value - ttDolbyFirst) : 0);
+        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(cDevice::PrimaryDevice()->GetCurrentAudioTrack())) {
+        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);
@@ -842,9 +842,10 @@ void cFemonOsd::Action(void)
 void cFemonOsd::Show(void)
 {
   debug(printf("cFemonOsd::Show()\n"));
-  eTrackType track = ttNone;
-  int apid = 0, dpid = 0;
+  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);
@@ -876,11 +877,10 @@ void cFemonOsd::Show(void)
      if (m_Receiver)
         delete m_Receiver;
      if (femonConfig.analyzestream) {
-        track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
-        if (IS_AUDIO_TRACK(track)) apid = int(track - ttAudioFirst);
-        else if (IS_DOLBY_TRACK(track)) dpid = int(track - ttDolbyFirst);
         cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-        m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), channel->Apid(apid), channel->Dpid(dpid));
+        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();
@@ -890,9 +890,10 @@ void cFemonOsd::Show(void)
 void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
 {
   debug(printf("cFemonOsd::ChannelSwitch()\n"));
-  eTrackType track = ttNone;
-  int apid = 0, dpid = 0;
+  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);
@@ -913,11 +914,10 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
   if (m_Receiver)
      delete m_Receiver;
   if (femonConfig.analyzestream) {
-     track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
-     if (IS_AUDIO_TRACK(track)) apid = int(track - ttAudioFirst);
-     else if (IS_DOLBY_TRACK(track)) dpid = int(track - ttDolbyFirst);
      cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-     m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), channel->Apid(apid), channel->Dpid(dpid));
+     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);
      }
 }
@@ -925,16 +925,16 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
 void cFemonOsd::SetAudioTrack(int Index, const char * const *Tracks)
 {
   debug(printf("cFemonOsd::SetAudioTrack()\n"));
-  eTrackType track = ttNone;
-  int apid = 0, dpid = 0;
+  int apid[2] = {0, 0};
+  int dpid[2] = {0, 0};
+  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
   if (m_Receiver)
      delete m_Receiver;
   if (femonConfig.analyzestream) {
-     track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
-     if (IS_AUDIO_TRACK(track)) apid = int(track - ttAudioFirst);
-     else if (IS_DOLBY_TRACK(track)) dpid = int(track - ttDolbyFirst);
      cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-     m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), channel->Apid(apid), channel->Dpid(dpid));
+     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);
      }
 }

femonreceiver.c

@@ -17,14 +17,14 @@
 #define PAYLOAD       0x10
 #define PTS_DTS_FLAGS 0xC0
 
-cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid, int Dpid)
-:cReceiver(Ca, -1, 3, Vpid, Apid, Dpid), cThread("femon receiver")
+cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[])
+:cReceiver(Ca, -1, Vpid, Apid, Dpid, NULL), cThread("femon receiver")
 {
   debug(printf("cFemonReceiver::cFemonReceiver()\n"));
   m_Active = false;
   m_VideoPid = Vpid;
-  m_AudioPid = Apid;
-  m_AC3Pid = Dpid;      
+  m_AudioPid = Apid[0];
+  m_AC3Pid = Dpid[0];      
   m_VideoValid = false;
   m_VideoPacketCount = 0;
   m_VideoHorizontalSize = 0;

femonreceiver.h

@@ -95,7 +95,7 @@ protected:
   virtual void Action(void);
 
 public:
-  cFemonReceiver(int Ca, int Vpid, int Apid, int Dpid);
+  cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[]);
   virtual ~cFemonReceiver();
 
   bool VideoValid(void)           { return m_VideoValid; };          // boolean