mirror of
				https://github.com/rofafor/vdr-plugin-femon.git
				synced 2023-10-10 11:36:53 +00:00 
			
		
		
		
	Compare commits
	
		
			3 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | ca717b0425 | ||
|  | 9ce3009e39 | ||
|  | b08205607c | 
							
								
								
									
										36
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										36
									
								
								HISTORY
									
									
									
									
									
								
							| @@ -43,9 +43,41 @@ VDR Plugin 'femon' Revision History | ||||
|  | ||||
| 2004-04-04: Version 0.0.3c | ||||
|  | ||||
| - Fixed minor bitrate calculation errors | ||||
| - Added russian translation (Thanks to Vyacheslav Dikonov) | ||||
| - Fixed minor bitrate calculation errors. | ||||
| - Added russian translation (Thanks to Vyacheslav Dikonov). | ||||
|  | ||||
| 2004-05-31: Version 0.0.4 | ||||
|  | ||||
| - Backported "stream information" feature (from version 0.1.1). | ||||
|  | ||||
| 2004-06-06: Version 0.0.5 | ||||
|  | ||||
| - Backported changes and fixes from version 0.1.2. | ||||
|  | ||||
| 2004-06-11: Version 0.0.6 | ||||
|  | ||||
| - Backported the "AC3 Stream Information" feature from version 0.1.3. | ||||
|  | ||||
| ------------------------- | ||||
|  | ||||
| 2004-05-18: Version 0.1.0 | ||||
|  | ||||
| - Updated for vdr-1.3.7 and removed compability with older versions. | ||||
|  | ||||
| 2004-05-30: Version 0.1.1 | ||||
|  | ||||
| - Added "Stream Information" display mode. | ||||
|   Toggle between different modes with 'OK' key: | ||||
|   .-> basic -> transponder -> stream -. | ||||
|   `-----------------------------------<2D> | ||||
| - Added missing german translations (Thanks to Peter Marquardt). | ||||
|  | ||||
| 2004-06-06: Version 0.1.2 | ||||
|  | ||||
| - Fixed the channel switch bug (reported by Stefan Lucke). | ||||
| - Nid/Tid/Rid are now included in translations. | ||||
| - Added video format and aspect ratio symbols into status window. | ||||
|  | ||||
| 2004-06-11: Version 0.1.3 | ||||
|  | ||||
| - Added "AC-3 Stream Information" display mode (Thanks to Lothar Englisch). | ||||
|   | ||||
							
								
								
									
										64
									
								
								README
									
									
									
									
									
								
							
							
						
						
									
										64
									
								
								README
									
									
									
									
									
								
							| @@ -10,36 +10,64 @@ See the file COPYING for license information. | ||||
|  | ||||
| Requirements: | ||||
|  | ||||
| Ph.D. in Astro Physics and preferably a six-pack waiting in a fridge. | ||||
| Never trust a Klingon. "Qu'vaD lI' De'vam". Beam me up, Scotty! | ||||
| You're number six! | ||||
| VDR & DVB. BMW & Ph.D.. BEER. YARRR! | ||||
|  | ||||
| Description: | ||||
|  | ||||
| DVB Frontend Status Monitor is a plugin that displays some signal information | ||||
| parameters of the current tuned channel on OSD. You can zap through all your | ||||
| channels and the plugin should be monitoring always the right frontend. The | ||||
| transponder information is also available in advanced display mode. User can | ||||
| switch between simple and advanced display modes by pressing 'OK' key. | ||||
| transponder and stream information are also available in advanced display modes. | ||||
| 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 <sascha@akv-soft.de> | ||||
| and Andreas Regel <andreas.regel@powarman.de>. The bitrate calculation algorithm | ||||
| originates from the 'dvbstream' application by Dave Chapman <dave@dchapman.com>. | ||||
| The plugin is based on a neat console frontend status monitor application | ||||
| called 'femon' by Johannes Stezenbach (see DVB-apps/szap/femon.c for further | ||||
| information). The other parts of plugin code are borrowed from the excellent | ||||
| 'OSD Picture-In-Picture' plugin by Sascha Volkenandt and Andreas Regel. The | ||||
| bitrate calculation algorithm originates from the 'dvbstream' application by | ||||
| Dave Chapman and the stream information routines from the 'libdvb' library by | ||||
| Metzler Brothers. | ||||
|  | ||||
| Shortcomings / Todo list / Notes: | ||||
| Terminology: | ||||
|  | ||||
| -------------------------------------------------------------- | ||||
| |## Channel Name ############################# DD 16:9 PAL ##| | ||||
| |[=====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 (only first PID) | ||||
|  | ||||
| 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 | ||||
|  | ||||
| Installation: | ||||
|  | ||||
| cd /put/your/path/here/VDR/PLUGINS/src | ||||
| tar -xzf /put/your/path/here/vdr-femon-X.Y.Z.tar.gz | ||||
| ln -s femon-X.Y.Z femon | ||||
| cd /put/your/path/here/VDR | ||||
| make | ||||
| make plugins | ||||
| ./vdr -Pfemon | ||||
|  | ||||
| Notes: | ||||
|  | ||||
| - The current version is a kind of Proof In Concept to replace the old 'tech | ||||
|   patch', and it's now eating many unnecessary cpu clock cycles - this will be | ||||
|   fixed later... | ||||
| - The plugin supports only those DVB cards with _one_ frontend (do any cards | ||||
|   with multiple frontends even exist?), because I haven't yet figured howto do | ||||
|   it without patching the VDR core. | ||||
| - Sometimes (read always) ttxtsubs plugin messes up the OSD - user should disable | ||||
|   ttxtsubs, but closing and reopening the femon plugin might help temporarily as | ||||
|   well. Btw., this same thing happens with OSDTeletext plugin too :) | ||||
| - The stream information is still missing. | ||||
| - Disable bitrate calculation to speed up heavy zapping sessions. | ||||
| - If you're using VDR version 1.3.6 or older, you'll have to stick with femon-0.0.3c. | ||||
| - Disable the stream analyze to speed up heavy zapping sessions. | ||||
|   | ||||
							
								
								
									
										35
									
								
								femon.c
									
									
									
									
									
								
							
							
						
						
									
										35
									
								
								femon.c
									
									
									
									
									
								
							| @@ -12,7 +12,7 @@ | ||||
| #include "femonosd.h" | ||||
| #include "femon.h" | ||||
|  | ||||
| #if (VDRVERSNUM < 10307) | ||||
| #if VDRVERSNUM >= 10307 | ||||
| #error "You don't exist! Go away!" | ||||
| #endif | ||||
|  | ||||
| @@ -74,16 +74,21 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value) | ||||
|   else if (!strcasecmp(Name, "RedLimit"))       femonConfig.redlimit       = atoi(Value); | ||||
|   else if (!strcasecmp(Name, "GreenLimit"))     femonConfig.greenlimit     = atoi(Value); | ||||
|   else if (!strcasecmp(Name, "UpdateInterval")) femonConfig.updateinterval = atoi(Value); | ||||
|   else if (!strcasecmp(Name, "ShowBitRate"))    femonConfig.showbitrate    = atoi(Value); | ||||
|   else if (!strcasecmp(Name, "AnalStream"))     femonConfig.analyzestream  = atoi(Value); | ||||
|   else if (!strcasecmp(Name, "CalcInterval"))   femonConfig.calcinterval   = atoi(Value); | ||||
|   else | ||||
|     return false; | ||||
|   if (femonConfig.displaymode < 0 || femonConfig.displaymode >= modeMaxNumber) femonConfig.displaymode = 0; | ||||
|  | ||||
|   return true; | ||||
| } | ||||
|  | ||||
| cMenuFemonSetup::cMenuFemonSetup(void) | ||||
| { | ||||
|   dispmodes[modeBasic]       = tr("basic"); | ||||
|   dispmodes[modeTransponder] = tr("transponder"); | ||||
|   dispmodes[modeStream]      = tr("stream"); | ||||
|   dispmodes[modeAC3]         = tr("AC-3"); | ||||
|   Setup(); | ||||
| } | ||||
|  | ||||
| @@ -92,16 +97,16 @@ void cMenuFemonSetup::Setup(void) | ||||
|   int current = Current(); | ||||
|  | ||||
|   Clear(); | ||||
|   Add(new cMenuEditBoolItem(  tr("Hide Mainmenu Entry"),         &femonConfig.hidemenu,       tr("no"),     tr("yes"))); | ||||
|   Add(new cMenuEditBoolItem(  tr("Use Syslog Output"),           &femonConfig.syslogoutput,   tr("no"),     tr("yes"))); | ||||
|   Add(new cMenuEditBoolItem(  tr("Default Display Mode"),        &femonConfig.displaymode,    tr("simple"), tr("advanced"))); | ||||
|   Add(new cMenuEditBoolItem(  tr("Position"),                    &femonConfig.position,       tr("bottom"), tr("top"))); | ||||
|   Add(new cMenuEditIntItem(   tr("Red Limit [%]"),               &femonConfig.redlimit,       1,            50)); | ||||
|   Add(new cMenuEditIntItem(   tr("Green Limit [%]"),             &femonConfig.greenlimit,     51,           100)); | ||||
|   Add(new cMenuEditIntItem(   tr("OSD Update Interval [0.1s]"),  &femonConfig.updateinterval, 1,            100)); | ||||
|   Add(new cMenuEditBoolItem(  tr("Bitrate Calculation"),         &femonConfig.showbitrate,    tr("no"),     tr("yes"))); | ||||
|   if (femonConfig.showbitrate) | ||||
|      Add(new cMenuEditIntItem(tr("Calculation Interval [0.1s]"), &femonConfig.calcinterval,   1,            100)); | ||||
|   Add(new cMenuEditBoolItem(  tr("Hide Mainmenu Entry"),         &femonConfig.hidemenu,       tr("no"),      tr("yes"))); | ||||
|   Add(new cMenuEditBoolItem(  tr("Use Syslog Output"),           &femonConfig.syslogoutput,   tr("no"),      tr("yes"))); | ||||
|   Add(new cMenuEditStraItem(  tr("Default Display Mode"),        &femonConfig.displaymode,    modeMaxNumber, dispmodes)); | ||||
|   Add(new cMenuEditBoolItem(  tr("Position"),                    &femonConfig.position,       tr("bottom"),  tr("top"))); | ||||
|   Add(new cMenuEditIntItem(   tr("Red Limit [%]"),               &femonConfig.redlimit,       1,             50)); | ||||
|   Add(new cMenuEditIntItem(   tr("Green Limit [%]"),             &femonConfig.greenlimit,     51,            100)); | ||||
|   Add(new cMenuEditIntItem(   tr("OSD Update Interval [0.1s]"),  &femonConfig.updateinterval, 1,             100)); | ||||
|   Add(new cMenuEditBoolItem(  tr("Analyze Stream"),              &femonConfig.analyzestream,  tr("no"),      tr("yes"))); | ||||
|   if (femonConfig.analyzestream) | ||||
|      Add(new cMenuEditIntItem(tr("Calculation Interval [0.1s]"), &femonConfig.calcinterval,   1,             100)); | ||||
|  | ||||
|   SetCurrent(Get(current)); | ||||
|   Display(); | ||||
| @@ -116,17 +121,17 @@ void cMenuFemonSetup::Store(void) | ||||
|   SetupStore("RedLimit",       femonConfig.redlimit); | ||||
|   SetupStore("GreenLimit",     femonConfig.greenlimit); | ||||
|   SetupStore("UpdateInterval", femonConfig.updateinterval); | ||||
|   SetupStore("ShowBitRate",    femonConfig.showbitrate); | ||||
|   SetupStore("AnalStream",     femonConfig.analyzestream); | ||||
|   SetupStore("CalcInterval",   femonConfig.calcinterval); | ||||
| } | ||||
|  | ||||
| eOSState cMenuFemonSetup::ProcessKey(eKeys Key) | ||||
| { | ||||
|   int oldShowbitrate = femonConfig.showbitrate; | ||||
|   int oldAnalyzestream = femonConfig.analyzestream; | ||||
|  | ||||
|   eOSState state = cMenuSetupPage::ProcessKey(Key); | ||||
|  | ||||
|   if (Key != kNone && (femonConfig.showbitrate != oldShowbitrate)) { | ||||
|   if (Key != kNone && (femonConfig.analyzestream != oldAnalyzestream)) { | ||||
|      Setup(); | ||||
|      } | ||||
|  | ||||
|   | ||||
							
								
								
									
										3
									
								
								femon.h
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								femon.h
									
									
									
									
									
								
							| @@ -11,7 +11,7 @@ | ||||
|  | ||||
| #include <vdr/plugin.h> | ||||
|  | ||||
| static const char *VERSION        = "0.1.0"; | ||||
| static const char *VERSION        = "0.0.6"; | ||||
| static const char *DESCRIPTION    = "DVB Signal Information Monitor (OSD)"; | ||||
| static const char *MAINMENUENTRY  = "Signal Information"; | ||||
|  | ||||
| @@ -36,6 +36,7 @@ public: | ||||
|  | ||||
| class cMenuFemonSetup : public cMenuSetupPage { | ||||
|   private: | ||||
|     const char *dispmodes[modeMaxNumber]; | ||||
|     virtual void Setup(void); | ||||
|   protected: | ||||
|     virtual eOSState ProcessKey(eKeys Key); | ||||
|   | ||||
| @@ -18,7 +18,7 @@ cFemonConfig::cFemonConfig(void) | ||||
|   redlimit       = 33; | ||||
|   greenlimit     = 66; | ||||
|   updateinterval = 5; | ||||
|   showbitrate    = 1; | ||||
|   analyzestream  = 1; | ||||
|   calcinterval   = 20; | ||||
|   syslogoutput   = 0; | ||||
| } | ||||
|   | ||||
							
								
								
									
										10
									
								
								femoncfg.h
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								femoncfg.h
									
									
									
									
									
								
							| @@ -9,6 +9,14 @@ | ||||
| #ifndef __FEMONCFG_H | ||||
| #define __FEMONCFG_H | ||||
|  | ||||
| enum dispModes { | ||||
|   modeBasic, | ||||
|   modeTransponder, | ||||
|   modeStream, | ||||
|   modeAC3, | ||||
|   modeMaxNumber | ||||
|   }; | ||||
|  | ||||
| struct cFemonConfig | ||||
| { | ||||
| public: | ||||
| @@ -19,7 +27,7 @@ public: | ||||
|   int redlimit; | ||||
|   int greenlimit; | ||||
|   int updateinterval; | ||||
|   int showbitrate; | ||||
|   int analyzestream; | ||||
|   int calcinterval; | ||||
|   int syslogoutput; | ||||
| }; | ||||
|   | ||||
							
								
								
									
										1133
									
								
								femoni18n.c
									
									
									
									
									
								
							
							
						
						
									
										1133
									
								
								femoni18n.c
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -9,6 +9,7 @@ | ||||
| #ifndef __FEMONI18N_H | ||||
| #define __FEMONI18N_H | ||||
|  | ||||
| #include <vdr/config.h> // for VDRVERSNUM | ||||
| #include <vdr/i18n.h> | ||||
|  | ||||
| extern const tI18nPhrase Phrases[]; | ||||
|   | ||||
							
								
								
									
										524
									
								
								femonosd.c
									
									
									
									
									
								
							
							
						
						
									
										524
									
								
								femonosd.c
									
									
									
									
									
								
							| @@ -12,27 +12,34 @@ | ||||
| #include "femonreceiver.h" | ||||
| #include "femonosd.h" | ||||
|  | ||||
| #define FRONTEND_DEVICE        "/dev/dvb/adapter%d/frontend%d" | ||||
| #define CHANNELINPUT_TIMEOUT   1000 | ||||
| #if (VDRVERSNUM < 10300) && !defined(ELCHIAIOVERSION) | ||||
| #warning You should consider using the small fonts! | ||||
| #endif | ||||
|  | ||||
| #define SCREENWIDTH            720 // in pixels | ||||
| #define SCREENHEIGHT           576 // in pixels | ||||
| #define OSDWIDTH               600 // in pixels | ||||
| #define OSDHEIGHT              480 // in pixels | ||||
| #define OSDINFOHEIGHT          (m_Font->Height() * 11) // in pixels (11 rows) | ||||
| #define OSDSTATUSHEIGHT        (m_Font->Height() * 6)  // in pixels (6 rows) | ||||
| #define FRONTEND_DEVICE          "/dev/dvb/adapter%d/frontend%d" | ||||
| #define CHANNELINPUT_TIMEOUT     1000 | ||||
|  | ||||
| #define OSDINFOWIN_Y(offset)   (femonConfig.position ? (OSDHEIGHT - OSDINFOHEIGHT + offset) : offset) | ||||
| #define OSDINFOWIN_X(col)      ((col == 4) ? 470 : (col == 3) ? 300 : (col==2) ? 180 : 15) | ||||
| #define OSDSTATUSWIN_Y(offset) (femonConfig.position ? offset : (OSDHEIGHT - OSDSTATUSHEIGHT + offset)) | ||||
| #define OSDSTATUSWIN_X(col)    ((col == 4) ? 410 : (col == 3) ? 220 : (col==2) ? 125 : 15) | ||||
| #define OSDSTATUSWIN_X2(col)   ((col == 5) ? 520 : (col == 4) ? 390 : (col==3) ? 250 : (col==2) ? 115 : 15) | ||||
| #define BARWIDTH(x)            (OSDWIDTH * x / 100) | ||||
| #define SCREENWIDTH              720 // in pixels | ||||
| #define SCREENHEIGHT             576 // in pixels | ||||
| #define OSDWIDTH                 600 // in pixels | ||||
| #define OSDHEIGHT                480 // in pixels | ||||
| #define OSDINFOHEIGHT            ((cOsd::LineHeight() - 2) * 11) // in pixels (11 rows) | ||||
| #define OSDSTATUSHEIGHT          ((cOsd::LineHeight() - 2) * 6)  // in pixels (6 rows) | ||||
|  | ||||
| #define clrBackground          clrGray50 // this should be tied somehow into current theme | ||||
| #define OSDINFOWIN_Y(offset)     (femonConfig.position ? (OSDHEIGHT - OSDINFOHEIGHT + offset) : offset) | ||||
| #define OSDINFOWIN_X(col)        ((col == 4) ? 470 : (col == 3) ? 300 : (col==2) ? 180 : 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 - cOsd::WidthInCells(txt) * cOsd::CellWidth()) / 2)) | ||||
| #define BARWIDTH(x)              (OSDWIDTH * x / 100) | ||||
| #define DELTA                    2 | ||||
|  | ||||
| cFemonOsd::cFemonOsd(void) | ||||
| #if VDRVERSNUM >= 10300 | ||||
| :cOsdObject(true), cThread("femon osd") | ||||
| #else | ||||
| :cOsdObject(true) | ||||
| #endif | ||||
| { | ||||
|   //printf("cFemonOsd::cFemonOsd()\n"); | ||||
|   m_Osd = NULL; | ||||
| @@ -47,7 +54,11 @@ cFemonOsd::cFemonOsd(void) | ||||
|   m_BER = 0; | ||||
|   m_UNC = 0; | ||||
|   m_DisplayMode = femonConfig.displaymode; | ||||
|   m_Font = cFont::GetFont(fontSml); | ||||
| #if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION) | ||||
|   m_Font = fontSml; | ||||
| #else | ||||
|   m_Font = fontOsd; | ||||
| #endif | ||||
|   m_Mutex = new cMutex(); | ||||
| } | ||||
|  | ||||
| @@ -75,58 +86,72 @@ void cFemonOsd::DrawStatusWindow(void) | ||||
|   cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel()); | ||||
|  | ||||
|   if (m_Osd) { | ||||
|      m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrBackground); | ||||
| #if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION) | ||||
|      eDvbFont OldFont = m_Osd->SetFont(m_Font); | ||||
| #endif | ||||
|      m_Osd->Fill(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrBackground, m_StatusWindow); | ||||
|      snprintf(buf, sizeof(buf), "%d%s %s", m_Number ? m_Number : channel->Number(), m_Number ? "-" : "", channel->Name()); | ||||
|      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); | ||||
|      offset += m_Font->Height(); | ||||
|      m_Osd->Fill(0, OSDSTATUSWIN_Y(offset), OSDWIDTH, OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-1), clrWhite, m_StatusWindow); | ||||
|      m_Osd->Text(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrBlack, clrWhite, m_StatusWindow); | ||||
|      offset += cOsd::LineHeight(); | ||||
|      if (signal > 0) { | ||||
|         signal = BARWIDTH(signal); | ||||
|         m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.redlimit), signal), OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrRed); | ||||
|         m_Osd->Fill(0, OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.redlimit), signal), OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-3), clrRed, m_StatusWindow); | ||||
|         if (signal > BARWIDTH(femonConfig.redlimit)) { | ||||
|            m_Osd->DrawRectangle(BARWIDTH(femonConfig.redlimit), OSDSTATUSWIN_Y(offset+3), min((OSDWIDTH * femonConfig.greenlimit / 100), signal), OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrYellow); | ||||
|            m_Osd->Fill(BARWIDTH(femonConfig.redlimit), OSDSTATUSWIN_Y(offset+3), min((OSDWIDTH * femonConfig.greenlimit / 100), signal), OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-3), clrYellow, m_StatusWindow); | ||||
|            } | ||||
|         if (signal > BARWIDTH(femonConfig.greenlimit)) { | ||||
|            m_Osd->DrawRectangle(BARWIDTH(femonConfig.greenlimit), OSDSTATUSWIN_Y(offset+3), signal, OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrGreen); | ||||
|            m_Osd->Fill(BARWIDTH(femonConfig.greenlimit), OSDSTATUSWIN_Y(offset+3), signal, OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-3), clrGreen, m_StatusWindow); | ||||
|            } | ||||
|         } | ||||
|      offset += m_Font->Height(); | ||||
|      offset += cOsd::LineHeight() - DELTA; | ||||
|      if (snr > 0) { | ||||
|         snr = BARWIDTH(snr); | ||||
|         m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.redlimit), snr), OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrRed); | ||||
|         m_Osd->Fill(0, OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.redlimit), snr), OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-3), clrRed, m_StatusWindow); | ||||
|         if (snr > BARWIDTH(femonConfig.redlimit)) { | ||||
|            m_Osd->DrawRectangle(BARWIDTH(femonConfig.redlimit), OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.greenlimit), snr), OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrYellow); | ||||
|            m_Osd->Fill(BARWIDTH(femonConfig.redlimit), OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.greenlimit), snr), OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-3), clrYellow, m_StatusWindow); | ||||
|            } | ||||
|         if (snr > BARWIDTH(femonConfig.greenlimit)) { | ||||
|            m_Osd->DrawRectangle(BARWIDTH(femonConfig.greenlimit),  OSDSTATUSWIN_Y(offset+3), snr, OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrGreen); | ||||
|            m_Osd->Fill(BARWIDTH(femonConfig.greenlimit),  OSDSTATUSWIN_Y(offset+3), snr, OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-3), clrGreen, m_StatusWindow); | ||||
|            } | ||||
|         } | ||||
|      offset += m_Font->Height(); | ||||
|      snprintf(buf, sizeof(buf), "STR: %04x", m_Signal); | ||||
|      m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font); | ||||
|      offset += cOsd::LineHeight() - DELTA; | ||||
|      m_Osd->Text(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "STR:", clrWhite, clrBackground, m_StatusWindow); | ||||
|      snprintf(buf, sizeof(buf), "%04x", m_Signal); | ||||
|      m_Osd->Text(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow); | ||||
|      snprintf(buf, sizeof(buf), "(%2d%%)", m_Signal / 655); | ||||
|      m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite /*signal < femonConfig.redlimit ? clrRed : signal < femonConfig.greenlimit ? clrYellow : clrGreen*/, clrBackground, m_Font); | ||||
|      snprintf(buf, sizeof(buf), "BER: %08x", m_BER); | ||||
|      m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font); | ||||
|      if (m_Receiver) snprintf(buf, sizeof(buf), "%s: %.2f %s", tr("Video"), m_Receiver->VideoBitrate(), tr("Mbit/s")); | ||||
|      else            snprintf(buf, sizeof(buf), "%s: --- %s", tr("Video"), tr("Mbit/s")); | ||||
|      m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font); | ||||
|      offset += m_Font->Height(); | ||||
|      snprintf(buf, sizeof(buf), "SNR: %04x", m_SNR); | ||||
|      m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font); | ||||
|      m_Osd->Text(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow); | ||||
|      m_Osd->Text(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "BER:", clrWhite, clrBackground, m_StatusWindow); | ||||
|      snprintf(buf, sizeof(buf), "%08x", m_BER); | ||||
|      m_Osd->Text(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow); | ||||
|      snprintf(buf, sizeof(buf), "%s:", tr("Video")); | ||||
|      m_Osd->Text(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow); | ||||
|      if (m_Receiver) snprintf(buf, sizeof(buf), "%.2f %s", m_Receiver->VideoBitrate(), tr("Mbit/s")); | ||||
|      else            snprintf(buf, sizeof(buf), "--- %s", tr("Mbit/s")); | ||||
|      m_Osd->Text(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow); | ||||
|      offset += cOsd::LineHeight() - DELTA; | ||||
|      m_Osd->Text(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "SNR:", clrWhite, clrBackground, m_StatusWindow); | ||||
|      snprintf(buf, sizeof(buf), "%04x", m_SNR); | ||||
|      m_Osd->Text(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow); | ||||
|      snprintf(buf, sizeof(buf), "(%2d%%)", m_SNR / 655); | ||||
|      m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite /*snr < femonConfig.redlimit ? clrRed : snr < femonConfig.greenlimit ? clrYellow : clrGreen*/, clrBackground, m_Font); | ||||
|      snprintf(buf, sizeof(buf), "UNC: %08x", m_UNC); | ||||
|      m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font); | ||||
|      if (m_Receiver) snprintf(buf, sizeof(buf), "%s: %.0f %s", tr("Audio"), m_Receiver->AudioBitrate(), tr("kbit/s")); | ||||
|      else            snprintf(buf, sizeof(buf), "%s: --- %s", tr("Audio"), tr("kbit/s")); | ||||
|      m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font); | ||||
|      offset += m_Font->Height(); | ||||
|      m_Osd->DrawText(OSDSTATUSWIN_X2(1), OSDSTATUSWIN_Y(offset), tr("LOCK"),   (m_FrontendStatus & FE_HAS_LOCK)   ? clrYellow : clrBlack, clrBackground, m_Font); | ||||
|      m_Osd->DrawText(OSDSTATUSWIN_X2(2), OSDSTATUSWIN_Y(offset), tr("SIGNAL"), (m_FrontendStatus & FE_HAS_SIGNAL) ? clrYellow : clrBlack, clrBackground, m_Font); | ||||
|      m_Osd->DrawText(OSDSTATUSWIN_X2(3), OSDSTATUSWIN_Y(offset), tr("CARRIER"),(m_FrontendStatus & FE_HAS_CARRIER)? clrYellow : clrBlack, clrBackground, m_Font); | ||||
|      m_Osd->DrawText(OSDSTATUSWIN_X2(4), OSDSTATUSWIN_Y(offset), tr("VITERBI"),(m_FrontendStatus & FE_HAS_VITERBI)? clrYellow : clrBlack, clrBackground, m_Font); | ||||
|      m_Osd->DrawText(OSDSTATUSWIN_X2(5), OSDSTATUSWIN_Y(offset), tr("SYNC"),   (m_FrontendStatus & FE_HAS_SYNC)   ? clrYellow : clrBlack, clrBackground, m_Font); | ||||
|      m_Osd->Text(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow); | ||||
|      m_Osd->Text(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "UNC:", clrWhite, clrBackground, m_StatusWindow); | ||||
|      snprintf(buf, sizeof(buf), "%08x", m_UNC); | ||||
|      m_Osd->Text(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow); | ||||
|      snprintf(buf, sizeof(buf), "%s:", (m_Receiver && m_Receiver->AC3Valid()) ? tr("AC-3") : tr("Audio")); | ||||
|      m_Osd->Text(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow); | ||||
|      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->Text(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow); | ||||
|      offset += cOsd::LineHeight() - DELTA; | ||||
|      m_Osd->Text(OSDSTATUSWIN_XC(1,tr("LOCK")),    OSDSTATUSWIN_Y(offset), tr("LOCK"),   (m_FrontendStatus & FE_HAS_LOCK)   ? clrYellow : clrBlack, clrBackground, m_StatusWindow); | ||||
|      m_Osd->Text(OSDSTATUSWIN_XC(2,tr("SIGNAL")),  OSDSTATUSWIN_Y(offset), tr("SIGNAL"), (m_FrontendStatus & FE_HAS_SIGNAL) ? clrYellow : clrBlack, clrBackground, m_StatusWindow); | ||||
|      m_Osd->Text(OSDSTATUSWIN_XC(3,tr("CARRIER")), OSDSTATUSWIN_Y(offset), tr("CARRIER"),(m_FrontendStatus & FE_HAS_CARRIER)? clrYellow : clrBlack, clrBackground, m_StatusWindow); | ||||
|      m_Osd->Text(OSDSTATUSWIN_XC(4,tr("VITERBI")), OSDSTATUSWIN_Y(offset), tr("VITERBI"),(m_FrontendStatus & FE_HAS_VITERBI)? clrYellow : clrBlack, clrBackground, m_StatusWindow); | ||||
|      m_Osd->Text(OSDSTATUSWIN_XC(5,tr("SYNC")),    OSDSTATUSWIN_Y(offset), tr("SYNC"),   (m_FrontendStatus & FE_HAS_SYNC)   ? clrYellow : clrBlack, clrBackground, m_StatusWindow); | ||||
| #if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION) | ||||
|      m_Osd->SetFont(OldFont); | ||||
| #endif | ||||
|      m_Osd->Flush(); | ||||
|      } | ||||
| } | ||||
| @@ -139,81 +164,87 @@ void cFemonOsd::DrawInfoWindow(void) | ||||
|   char buf2[20]; | ||||
|   int offset = 0; | ||||
|   int value = 0; | ||||
|   double dvalue = 0.0; | ||||
|   cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel()); | ||||
|  | ||||
|   if (m_Osd) { | ||||
|      if (m_DisplayMode) { | ||||
|         m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground); | ||||
|         m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+m_Font->Height()-1), clrWhite); | ||||
|         m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Transponder Information"), clrBackground, clrWhite, m_Font); | ||||
|         offset += m_Font->Height(); | ||||
|         m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Vpid"), clrWhite, clrBackground, m_Font); | ||||
| #if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION) | ||||
|      eDvbFont OldFont = m_Osd->SetFont(m_Font); | ||||
| #endif | ||||
|      if (m_DisplayMode == modeTransponder) { | ||||
|         m_Osd->Fill(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground, m_InfoWindow); | ||||
|         m_Osd->Fill(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+cOsd::LineHeight()-1), clrWhite, m_InfoWindow); | ||||
|         m_Osd->Text( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Transponder Information"), clrBackground, clrWhite, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight(); | ||||
|         m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Vpid"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         snprintf(buf, sizeof(buf), "%d", channel->Vpid()); | ||||
|         m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|         m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Ppid"), clrWhite, clrBackground, m_Font); | ||||
|         m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Ppid"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         snprintf(buf, sizeof(buf), "%d", channel->Ppid()); | ||||
|         m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|         offset += m_Font->Height(); | ||||
|         m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Apid1"), clrWhite, clrBackground, m_Font); | ||||
|         m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight() - DELTA; | ||||
|         m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Apid1"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         value = channel->Apid2(); | ||||
|         if (value) snprintf(buf, sizeof(buf), "%d, %d", channel->Apid1(), value); | ||||
|         else       snprintf(buf, sizeof(buf), "%d", channel->Apid1()); | ||||
|         m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|         m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Dpid1"), clrWhite, clrBackground, m_Font); | ||||
|         m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Dpid1"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         value = channel->Dpid2(); | ||||
|         if (value) snprintf(buf, sizeof(buf), "%d, %d", channel->Dpid1(), value); | ||||
|         else       snprintf(buf, sizeof(buf), "%d", channel->Dpid1()); | ||||
|         m_Osd->DrawText(OSDINFOWIN_X(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); | ||||
|         m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight() - DELTA; | ||||
|         m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("CA"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         snprintf(buf, sizeof(buf), "%d", channel->Ca()); | ||||
|         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); | ||||
|         m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Tpid"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         snprintf(buf, sizeof(buf), "%d", channel->Tpid()); | ||||
|         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("Sid"), clrWhite, clrBackground, m_Font); | ||||
|         m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight() - DELTA; | ||||
|         m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sid"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         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->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
| #if (VDRVERSNUM >= 10300) | ||||
|         m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Nid"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         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->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight() - DELTA; | ||||
|         m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Tid"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         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->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Rid"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         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(); | ||||
|         m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
| #endif | ||||
|         offset += cOsd::LineHeight() - DELTA; | ||||
|         switch (m_FrontendInfo.type) { | ||||
|           case FE_QPSK: | ||||
|                snprintf(buf, sizeof(buf), "%s #%d - %s", tr("Satellite Card"), cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                offset += m_Font->Height(); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                offset += cOsd::LineHeight() - DELTA; | ||||
|                m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                value = channel->Frequency(); | ||||
|                while (value > 20000) value /= 1000; | ||||
|                snprintf(buf, sizeof(buf), "%d %s", value, tr("MHz")); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                snprintf(buf, sizeof(buf), "%s", cSource::ToString(channel->Source())); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                offset += m_Font->Height(); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                offset += cOsd::LineHeight() - DELTA; | ||||
|                m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                snprintf(buf, sizeof(buf), "%d", channel->Srate()); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Polarization"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Polarization"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                snprintf(buf, sizeof(buf), "%c", toupper(channel->Polarization())); | ||||
|                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("Inversion"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                offset += cOsd::LineHeight() - DELTA; | ||||
|                m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                value = channel->Inversion(); | ||||
|                if      (value == INVERSION_OFF)   snprintf(buf, sizeof(buf), tr("Off")); | ||||
|                else if (value == INVERSION_ON)    snprintf(buf, sizeof(buf), tr("On")); | ||||
|                else            /*INVERSION_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto")); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                value = channel->CoderateH(); | ||||
|                if      (value == FEC_NONE)  snprintf(buf, sizeof(buf), tr("None")); | ||||
|                else if (value == FEC_1_2)   snprintf(buf, sizeof(buf), "1/2"); | ||||
| @@ -225,26 +256,26 @@ void cFemonOsd::DrawInfoWindow(void) | ||||
|                else if (value == FEC_7_8)   snprintf(buf, sizeof(buf), "7/8"); | ||||
|                else if (value == FEC_8_9)   snprintf(buf, sizeof(buf), "8/9"); | ||||
|                else            /*FEC_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto")); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                break; | ||||
|  | ||||
|           case FE_QAM: | ||||
|                snprintf(buf, sizeof(buf), "%s #%d - %s", tr("Cable Card"), cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                offset += m_Font->Height(); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                offset += cOsd::LineHeight() - DELTA; | ||||
|                m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                value = channel->Frequency(); | ||||
|                while (value > 20000) value /= 1000; | ||||
|                snprintf(buf, sizeof(buf), "%d %s", value, tr("MHz")); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                snprintf(buf, sizeof(buf), "%s", cSource::ToString(channel->Source())); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                offset += m_Font->Height(); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                offset += cOsd::LineHeight() - DELTA; | ||||
|                m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                snprintf(buf, sizeof(buf), "%d", channel->Srate()); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                value = channel->Modulation(); | ||||
|                if      (value == QPSK)      snprintf(buf, sizeof(buf), "QPSK"); | ||||
|                else if (value == QAM_16)    snprintf(buf, sizeof(buf), "QAM 16"); | ||||
| @@ -253,15 +284,15 @@ void cFemonOsd::DrawInfoWindow(void) | ||||
|                else if (value == QAM_128)   snprintf(buf, sizeof(buf), "QAM 128"); | ||||
|                else if (value == QAM_256)   snprintf(buf, sizeof(buf), "QAM 256"); | ||||
|                else            /*QAM_AUTO*/ snprintf(buf, sizeof(buf), "QAM %s", tr("Auto")); | ||||
|                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("Inversion"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                offset += cOsd::LineHeight() - DELTA; | ||||
|                m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                value = channel->Inversion(); | ||||
|                if      (value == INVERSION_OFF)   snprintf(buf, sizeof(buf), tr("Off")); | ||||
|                else if (value == INVERSION_ON)    snprintf(buf, sizeof(buf), tr("On")); | ||||
|                else            /*INVERSION_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto")); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                value = channel->CoderateH(); | ||||
|                if      (value == FEC_NONE)  snprintf(buf, sizeof(buf), tr("None")); | ||||
|                else if (value == FEC_1_2)   snprintf(buf, sizeof(buf), "1/2"); | ||||
| @@ -273,33 +304,33 @@ void cFemonOsd::DrawInfoWindow(void) | ||||
|                else if (value == FEC_7_8)   snprintf(buf, sizeof(buf), "7/8"); | ||||
|                else if (value == FEC_8_9)   snprintf(buf, sizeof(buf), "8/9"); | ||||
|                else            /*FEC_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto")); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                break; | ||||
|  | ||||
|           default: | ||||
|                snprintf(buf, sizeof(buf), "%s #%d - %s", tr("Terrestial Card"), cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                offset += m_Font->Height(); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                offset += cOsd::LineHeight() - DELTA; | ||||
|                m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                value = channel->Frequency(); | ||||
|                while (value > 20000) value /= 1000; | ||||
|                snprintf(buf, sizeof(buf), "%d %s", value, tr("MHz")); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Transmission"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Transmission"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                value = channel->Transmission(); | ||||
|                if      (value == TRANSMISSION_MODE_2K)    snprintf(buf, sizeof(buf), "2K"); | ||||
|                else if (value == TRANSMISSION_MODE_8K)    snprintf(buf, sizeof(buf), "8K"); | ||||
|                else            /*TRANSMISSION_MODE_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto")); | ||||
|                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("Bandwidth"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                offset += cOsd::LineHeight() - DELTA; | ||||
|                m_Osd->Text( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bandwidth"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                value = channel->Bandwidth(); | ||||
|                if      (value == BANDWIDTH_8_MHZ) snprintf(buf, sizeof(buf), "8 %s", tr("MHz")); | ||||
|                else if (value == BANDWIDTH_7_MHZ) snprintf(buf, sizeof(buf), "7 %s", tr("MHz")); | ||||
|                else if (value == BANDWIDTH_6_MHZ) snprintf(buf, sizeof(buf), "6 %s", tr("MHz")); | ||||
|                else            /*BANDWIDTH_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto")); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                value = channel->Modulation(); | ||||
|                if      (value == QPSK)      snprintf(buf, sizeof(buf), "QPSK"); | ||||
|                else if (value == QAM_16)    snprintf(buf, sizeof(buf), "QAM 16"); | ||||
| @@ -308,15 +339,15 @@ void cFemonOsd::DrawInfoWindow(void) | ||||
|                else if (value == QAM_128)   snprintf(buf, sizeof(buf), "QAM 128"); | ||||
|                else if (value == QAM_256)   snprintf(buf, sizeof(buf), "QAM 256"); | ||||
|                else            /*QAM_AUTO*/ snprintf(buf, sizeof(buf), "QAM %s", tr("Auto")); | ||||
|                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("Inversion"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                offset += cOsd::LineHeight() - DELTA; | ||||
|                m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                value = channel->Inversion(); | ||||
|                if      (value == INVERSION_OFF)   snprintf(buf, sizeof(buf), tr("Off")); | ||||
|                else if (value == INVERSION_ON)    snprintf(buf, sizeof(buf), tr("On")); | ||||
|                else            /*INVERSION_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto")); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                value = channel->CoderateH(); | ||||
|                if      (value == FEC_NONE)  snprintf(buf, sizeof(buf), tr("None")); | ||||
|                else if (value == FEC_1_2)   snprintf(buf, sizeof(buf), "1/2"); | ||||
| @@ -340,30 +371,200 @@ void cFemonOsd::DrawInfoWindow(void) | ||||
|                else if (value == FEC_8_9)   snprintf(buf2, sizeof(buf2), " - 8/9"); | ||||
|                else            /*FEC_AUTO*/ snprintf(buf2, sizeof(buf2), " - %s", tr("Auto")); | ||||
|                strncat(buf, buf2, sizeof(buf)); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                offset += m_Font->Height(); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Hierarchy"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                offset += cOsd::LineHeight() - DELTA; | ||||
|                m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Hierarchy"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                value = channel->Hierarchy(); | ||||
|                if      (value == HIERARCHY_NONE)  snprintf(buf, sizeof(buf), tr("None")); | ||||
|                else if (value == HIERARCHY_1)     snprintf(buf, sizeof(buf), "1"); | ||||
|                else if (value == HIERARCHY_2)     snprintf(buf, sizeof(buf), "2"); | ||||
|                else if (value == HIERARCHY_4)     snprintf(buf, sizeof(buf), "4"); | ||||
|                else            /*HIERARCHY_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto")); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Guard"), clrWhite, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Guard"), clrWhite, clrBackground, m_InfoWindow); | ||||
|                value = channel->Guard(); | ||||
|                if      (value == GUARD_INTERVAL_1_32)  snprintf(buf, sizeof(buf), "1/32"); | ||||
|                else if (value == GUARD_INTERVAL_1_16)  snprintf(buf, sizeof(buf), "1/16"); | ||||
|                else if (value == GUARD_INTERVAL_1_8)   snprintf(buf, sizeof(buf), "1/8"); | ||||
|                else if (value == GUARD_INTERVAL_1_4)   snprintf(buf, sizeof(buf), "1/4"); | ||||
|                else            /*GUARD_INTERVAL_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto")); | ||||
|                m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font); | ||||
|                m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|                break; | ||||
|           } | ||||
|         } | ||||
|      else { | ||||
|         m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent); | ||||
|      else if (m_DisplayMode == modeStream) { | ||||
|         m_Osd->Fill(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground, m_InfoWindow); | ||||
|         m_Osd->Fill(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+cOsd::LineHeight()-1), clrWhite, m_InfoWindow); | ||||
|         m_Osd->Text( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Stream Information"), clrBackground, clrWhite, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight(); | ||||
|         m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Stream"), clrYellow, clrBackground, m_InfoWindow); | ||||
|         snprintf(buf, sizeof(buf), "#%d", channel->Vpid()); | ||||
|         m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight() - DELTA; | ||||
|         m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         if (m_Receiver) snprintf(buf, sizeof(buf), "%.2f %s (%.2f %s)", m_Receiver->VideoStreamBitrate(), tr("Mbit/s"), m_Receiver->VideoBitrate(), tr("Mbit/s")); | ||||
|         else            snprintf(buf, sizeof(buf), "---"); | ||||
|         m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight() - DELTA; | ||||
|         m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Aspect Ratio"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         if (m_Receiver) { | ||||
|            value = m_Receiver->VideoAspectRatio(); | ||||
|            if      (value == AR_1_1)    snprintf(buf, sizeof(buf), "1:1"); | ||||
|            else if (value == AR_4_3)    snprintf(buf, sizeof(buf), "4:3"); | ||||
|            else if (value == AR_16_9)   snprintf(buf, sizeof(buf), "16:9"); | ||||
|            else if (value == AR_2_21_1) snprintf(buf, sizeof(buf), "2.21:1"); | ||||
|            else                         snprintf(buf, sizeof(buf), "%s", tr("reserved")); | ||||
|            } | ||||
|         else                            snprintf(buf, sizeof(buf), "---"); | ||||
|         m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight() - DELTA; | ||||
|         m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frame Rate"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         if (m_Receiver) snprintf(buf, sizeof(buf), "%.2f %s", m_Receiver->VideoFrameRate(), tr("Hz")); | ||||
|         else            snprintf(buf, sizeof(buf), "---"); | ||||
|         m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight() - DELTA; | ||||
|         m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Format"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         if (m_Receiver) { | ||||
|            value = m_Receiver->VideoFormat(); | ||||
|            if      (value == VF_PAL)  snprintf(buf, sizeof(buf), "%s", tr("PAL")); | ||||
|            else if (value == VF_NTSC) snprintf(buf, sizeof(buf), "%s", tr("NTSC")); | ||||
|            else                       snprintf(buf, sizeof(buf), "%s", tr("unknown")); | ||||
|            } | ||||
|         else                          snprintf(buf, sizeof(buf), "---"); | ||||
|         m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight() - DELTA; | ||||
|         m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Resolution"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         if (m_Receiver) snprintf(buf, sizeof(buf), "%d x %d", m_Receiver->VideoHorizontalSize(), m_Receiver->VideoVerticalSize()); | ||||
|         else            snprintf(buf, sizeof(buf), "---"); | ||||
|         m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight() - DELTA; | ||||
|         m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Stream"), clrYellow, clrBackground, m_InfoWindow); | ||||
|         snprintf(buf, sizeof(buf), "#%d", channel->Apid1()); | ||||
|         m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight() - DELTA; | ||||
|         m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         if (m_Receiver) { | ||||
|            dvalue = m_Receiver->AudioStreamBitrate(); | ||||
|            if      (dvalue == (double)FR_RESERVED) snprintf(buf, sizeof(buf), "%s (%.0f %s)", tr("reserved"), m_Receiver->AudioBitrate(), tr("kbit/s")); | ||||
|            else if (dvalue == (double)FR_FREE)     snprintf(buf, sizeof(buf), "%s (%.0f %s)", tr("free"), m_Receiver->AudioBitrate(), tr("kbit/s")); | ||||
|            else                                    snprintf(buf, sizeof(buf), "%.0f %s (%.0f %s)", dvalue, tr("kbit/s"), m_Receiver->AudioBitrate(), tr("kbit/s")); | ||||
|            } | ||||
|         else                                       snprintf(buf, sizeof(buf), "---"); | ||||
|         m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight() - DELTA; | ||||
|         m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("MPEG Layer"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         if (m_Receiver) snprintf(buf, sizeof(buf), "%d", m_Receiver->AudioMPEGLayer()); | ||||
|         else            snprintf(buf, sizeof(buf), "---"); | ||||
|         m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight() - DELTA; | ||||
|         m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sampling Frequency"), clrWhite, clrBackground, m_InfoWindow); | ||||
|         if (m_Receiver) { | ||||
|            value = m_Receiver->AudioSamplingFreq(); | ||||
|            if (value == FR_RESERVED) snprintf(buf, sizeof(buf), "%s", tr("reserved")); | ||||
|            else                      snprintf(buf, sizeof(buf), "%.1f %s", (value / 1000.0), tr("kHz")); | ||||
|            } | ||||
|         else                         snprintf(buf, sizeof(buf), "---"); | ||||
|         m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight() - DELTA; | ||||
|         } | ||||
|      else if (m_DisplayMode == modeAC3) { | ||||
|         m_Osd->Fill(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground, m_InfoWindow); | ||||
|         m_Osd->Fill(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+cOsd::LineHeight()-1), clrWhite, m_InfoWindow); | ||||
|         snprintf(buf, sizeof(buf), "%s - %s #%d", tr("Stream Information"), tr("AC-3 Stream"), channel->Dpid1()); | ||||
|         m_Osd->Text( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrBackground, clrWhite, m_InfoWindow); | ||||
|         offset += cOsd::LineHeight(); | ||||
|         if (m_Receiver && m_Receiver->AC3Valid()) { | ||||
|            m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_InfoWindow); | ||||
|            snprintf(buf, sizeof(buf), "%.0f %s (%0.f %s)", m_Receiver->AC3StreamBitrate(), tr("kbit/s"), m_Receiver->AC3Bitrate(), tr("kbit/s")); | ||||
|            m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|            offset += cOsd::LineHeight() - DELTA; | ||||
|            m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sampling Frequency"), clrWhite, clrBackground, m_InfoWindow); | ||||
|            snprintf(buf, sizeof(buf), "%.1f %s", m_Receiver->AC3SamplingFreq() / 1000., tr("kHz")); | ||||
|            m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|            offset += cOsd::LineHeight() - DELTA; | ||||
|            m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frame Size"), clrWhite, clrBackground, m_InfoWindow); | ||||
|            snprintf(buf, sizeof(buf), "%d", m_Receiver->AC3FrameSize()); | ||||
|            m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|            offset += cOsd::LineHeight() - DELTA; | ||||
|            m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bit Stream Mode"), clrWhite, clrBackground, m_InfoWindow); | ||||
|            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->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|            offset += cOsd::LineHeight() - DELTA; | ||||
|            m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Coding Mode"), clrWhite, clrBackground, m_InfoWindow); | ||||
|            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->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|            offset += cOsd::LineHeight() - DELTA; | ||||
|            m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Center Mix Level"), clrWhite, clrBackground, m_InfoWindow); | ||||
|            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->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|            offset += cOsd::LineHeight() - DELTA; | ||||
|            m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Surround Mix Level"), clrWhite, clrBackground, m_InfoWindow); | ||||
|            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->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|            offset += cOsd::LineHeight() - DELTA; | ||||
|            m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Dolby Surround Mode"), clrWhite, clrBackground, m_InfoWindow); | ||||
|            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("Off"));           break; | ||||
|              case DSM_DOLBYSURROUND:     snprintf(buf, sizeof(buf), "%s", tr("On"));            break; | ||||
|              case DSM_RESERVED:          snprintf(buf, sizeof(buf), "%s", tr("reserved"));      break; | ||||
|              default:                    snprintf(buf, sizeof(buf), "---"); | ||||
|              } | ||||
|            m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|            offset += cOsd::LineHeight() - DELTA; | ||||
|            m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Low Frequency Effects"), clrWhite, clrBackground, m_InfoWindow); | ||||
|            snprintf(buf, sizeof(buf), "%s", m_Receiver->AC3LfeOn() ? tr("On") : tr("Off")); | ||||
|            m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|            offset += cOsd::LineHeight() - DELTA; | ||||
|            m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Dialogue Normalization"), clrWhite, clrBackground, m_InfoWindow); | ||||
|            value = m_Receiver->AC3DialogLevel(); | ||||
|            if (value > 0) snprintf(buf, sizeof(buf), "-%d %s", value, tr("dB")); | ||||
|            else           snprintf(buf, sizeof(buf), "---"); | ||||
|            m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow); | ||||
|            offset += cOsd::LineHeight() - DELTA; | ||||
|            } | ||||
|         } | ||||
|      else /* modeBasic */ { | ||||
|         m_Osd->Fill(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, m_InfoWindow); | ||||
|         } | ||||
| #if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION) | ||||
|      m_Osd->SetFont(OldFont); | ||||
| #endif | ||||
|      m_Osd->Flush(); | ||||
|      } | ||||
| } | ||||
| @@ -371,6 +572,9 @@ void cFemonOsd::DrawInfoWindow(void) | ||||
| void cFemonOsd::Action(void) | ||||
| { | ||||
|   //printf("cFemonOsd::Action()\n"); | ||||
| #if (VDRVERSNUM < 10300) | ||||
| 	isyslog("femon plugin: thread started (pid = %d)", getpid()); | ||||
| #endif | ||||
|   m_Active = true; | ||||
|   while (m_Active) { | ||||
|     if (m_Frontend != -1) { | ||||
| @@ -387,6 +591,9 @@ void cFemonOsd::Action(void) | ||||
|        } | ||||
|     usleep(100000L * femonConfig.updateinterval); | ||||
|     } | ||||
| #if (VDRVERSNUM < 10300) | ||||
| 	isyslog("femon plugin: thread stopped (pid = %d)", getpid()); | ||||
| #endif | ||||
| } | ||||
|  | ||||
| void cFemonOsd::Show(void) | ||||
| @@ -403,29 +610,28 @@ 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); | ||||
|   m_Osd = cOsd::OpenRaw((SCREENWIDTH - OSDWIDTH) / 2, (SCREENHEIGHT - OSDHEIGHT) / 2); | ||||
|   if (m_Osd) { | ||||
|      tArea Areas[] = { { 0, 0, OSDWIDTH, OSDHEIGHT, 4 } }; | ||||
|      if (m_Osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk) { | ||||
|         m_Osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea)); | ||||
|         } | ||||
|      else { | ||||
|         tArea Areas[] = { { 0, OSDSTATUSWIN_Y(0), (OSDWIDTH-1), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT-1), 4 }, | ||||
|                           { 0, OSDINFOWIN_Y(0),   (OSDWIDTH-1), OSDINFOWIN_Y(OSDINFOHEIGHT-1),     2 } | ||||
|                         }; | ||||
|         m_Osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea)); | ||||
|         } | ||||
|      m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent); | ||||
| #if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION) | ||||
|      eDvbFont OldFont = m_Osd->SetFont(m_Font); | ||||
| #endif | ||||
|      m_StatusWindow = m_Osd->Create(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSHEIGHT, 4); | ||||
|      m_InfoWindow   = m_Osd->Create(0, OSDINFOWIN_Y(0),   OSDWIDTH, OSDINFOHEIGHT,   2); | ||||
|      m_Osd->Clear(); | ||||
|      m_Osd->Fill(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, m_InfoWindow); | ||||
| #if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION) | ||||
|      m_Osd->SetFont(OldFont); | ||||
| #endif | ||||
|      m_Osd->Flush(); | ||||
|      if (m_Receiver) | ||||
|         delete m_Receiver; | ||||
|      if (femonConfig.showbitrate) { | ||||
|         int channelNumber = cDevice::CurrentChannel(); | ||||
|         m_Receiver = new cFemonReceiver(Channels.GetByNumber(channelNumber)->Ca(), Channels.GetByNumber(channelNumber)->Vpid(), Channels.GetByNumber(channelNumber)->Apid1()); | ||||
|      if (femonConfig.analyzestream) { | ||||
|         cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel()); | ||||
|         m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), channel->Apid1(), channel->Dpid1()); | ||||
|         cDevice::ActualDevice()->AttachReceiver(m_Receiver); | ||||
|         } | ||||
|      Start(); | ||||
| @@ -436,6 +642,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); | ||||
| @@ -447,15 +655,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.showbitrate) { | ||||
|      channelNumber = cDevice::CurrentChannel(); | ||||
|      m_Receiver = new cFemonReceiver(Channels.GetByNumber(channelNumber)->Ca(), Channels.GetByNumber(channelNumber)->Vpid(), Channels.GetByNumber(channelNumber)->Apid1()); | ||||
|   if (femonConfig.analyzestream) { | ||||
|      cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel()); | ||||
|      m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), channel->Apid1(), channel->Dpid1()); | ||||
|      cDevice::ActualDevice()->AttachReceiver(m_Receiver); | ||||
|      } | ||||
| } | ||||
| @@ -526,7 +734,9 @@ eOSState cFemonOsd::ProcessKey(eKeys Key) | ||||
|                } | ||||
|             break; | ||||
|        case kOk: | ||||
|             m_DisplayMode ^= 1; // toggle between advanced and simple display mode | ||||
|             // toggle between display modes | ||||
|             if (++m_DisplayMode == modeAC3 && !Channels.GetByNumber(cDevice::CurrentChannel())->Dpid1()) m_DisplayMode++; | ||||
|             if (m_DisplayMode >= modeMaxNumber) m_DisplayMode = 0; | ||||
|             DrawInfoWindow(); | ||||
|             break; | ||||
|        default: | ||||
|   | ||||
| @@ -16,11 +16,14 @@ | ||||
| #include <vdr/thread.h> | ||||
| #include <vdr/status.h> | ||||
| #include <vdr/channels.h> | ||||
| #include <vdr/font.h> | ||||
|  | ||||
| class cFemonOsd : public cOsdObject, public cThread, public cStatus { | ||||
| private: | ||||
|   bool m_Active; | ||||
|   cOsd *m_Osd; | ||||
|   cOsdBase *m_Osd; | ||||
|   tWindowHandle m_InfoWindow; | ||||
|   tWindowHandle m_StatusWindow; | ||||
|   cFemonReceiver *m_Receiver; | ||||
|   int m_Frontend; | ||||
|   struct dvb_frontend_info m_FrontendInfo; | ||||
| @@ -33,7 +36,7 @@ private: | ||||
|   uint32_t m_UNC; | ||||
|   fe_status_t m_FrontendStatus; | ||||
|   int m_DisplayMode; | ||||
|   const cFont *m_Font; | ||||
|   eDvbFont m_Font; | ||||
|   cMutex* m_Mutex; | ||||
|   void DrawStatusWindow(void); | ||||
|   void DrawInfoWindow(void); | ||||
|   | ||||
							
								
								
									
										268
									
								
								femonreceiver.c
									
									
									
									
									
								
							
							
						
						
									
										268
									
								
								femonreceiver.c
									
									
									
									
									
								
							| @@ -10,17 +10,53 @@ | ||||
| #include "femoncfg.h" | ||||
| #include "femonreceiver.h" | ||||
|  | ||||
| cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid) | ||||
| :cReceiver(Ca, -1, 2, Vpid, Apid), cThread("femon receiver") | ||||
| #define TS_SIZE       188 | ||||
| #define PAY_START     0x40 | ||||
| #define ADAPT_FIELD   0x20 | ||||
| #define PAYLOAD       0x10 | ||||
| #define PTS_DTS_FLAGS 0xC0 | ||||
|  | ||||
| cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid, int Dpid) | ||||
| #if VDRVERSNUM >= 10300 | ||||
| :cReceiver(Ca, -1, 3, Vpid, Apid, Dpid), cThread("femon receiver") | ||||
| #else | ||||
| :cReceiver(Ca, -1, 3, Vpid, Apid, Dpid) | ||||
| #endif | ||||
| { | ||||
|   //printf("cFemonReceiver::cFemonReceiver()\n"); | ||||
|   m_Active = false; | ||||
|   m_VideoPid = Vpid; | ||||
|   m_AudioPid = Apid; | ||||
|   m_AC3Pid = Dpid;       | ||||
|   m_VideoValid = false; | ||||
|   m_VideoPacketCount = 0; | ||||
|   m_AudioPacketCount = 0; | ||||
|   m_VideoHorizontalSize = 0; | ||||
|   m_VideoVerticalSize = 0; | ||||
|   m_VideoAspectRatio = AR_RESERVED; | ||||
|   m_VideoFormat = VF_UNKNOWN; | ||||
|   m_VideoFrameRate = 0.0; | ||||
|   m_VideoStreamBitrate = 0.0; | ||||
|   m_VideoBitrate = 0.0; | ||||
|   m_AudioValid = false; | ||||
|   m_AudioPacketCount = 0; | ||||
|   m_AudioStreamBitrate = -2.0; | ||||
|   m_AudioBitrate = 0.0; | ||||
|   m_AudioSamplingFreq = -1; | ||||
|   m_AudioMPEGLayer = 0; | ||||
|   m_AudioBitrate = 0.0; | ||||
|   m_AC3Valid = false; | ||||
|   m_AC3PacketCount = 0;  | ||||
|   m_AC3StreamBitrate = 0; | ||||
|   m_AC3SamplingFreq = 0; | ||||
|   m_AC3Bitrate = 0; | ||||
|   m_AC3FrameSize = 0; | ||||
|   m_AC3BitStreamMode = FR_NOTVALID; | ||||
|   m_AC3AudioCodingMode = FR_NOTVALID; | ||||
|   m_AC3CenterMixLevel = FR_NOTVALID; | ||||
|   m_AC3SurroundMixLevel = FR_NOTVALID; | ||||
|   m_AC3DolbySurroundMode = FR_NOTVALID; | ||||
|   m_AC3LfeOn = false; | ||||
|   m_AC3DialogLevel = FR_NOTVALID; | ||||
| } | ||||
|   | ||||
| cFemonReceiver::~cFemonReceiver(void) | ||||
| @@ -32,6 +68,192 @@ cFemonReceiver::~cFemonReceiver(void) | ||||
|      } | ||||
| } | ||||
|  | ||||
| /* 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; | ||||
|   m_VideoValid = false; | ||||
|   while ((found < 4) && ((c + 4) < count)) { | ||||
|     uint8_t *b; | ||||
|     b = mbuf + c; | ||||
|     if ((b[0] == 0x00) && (b[1] == 0x00) && (b[2] == 0x01) && (b[3] == 0xb3)) | ||||
|        found = 4; | ||||
|     else | ||||
|        c++; | ||||
|     } | ||||
|   if ((!found) || ((c + 16) >= count)) return; | ||||
|   m_VideoValid = true; | ||||
|   headr = mbuf + c + 4; | ||||
|   m_VideoHorizontalSize = ((headr[1] & 0xF0) >> 4) | (headr[0] << 4); | ||||
|   m_VideoVerticalSize = ((headr[1] & 0x0F) << 8) | (headr[2]); | ||||
|   int sw = (int)((headr[3] & 0xF0) >> 4); | ||||
|   switch ( sw ){ | ||||
|     case 1: | ||||
|       m_VideoAspectRatio = AR_1_1; | ||||
|       break; | ||||
|     case 2: | ||||
|       m_VideoAspectRatio = AR_4_3; | ||||
|       break; | ||||
|     case 3: | ||||
|       m_VideoAspectRatio = AR_16_9; | ||||
|       break; | ||||
|     case 4: | ||||
|       m_VideoAspectRatio = AR_2_21_1; | ||||
|       break; | ||||
|     case 5 ... 15: | ||||
|     default: | ||||
|       m_VideoAspectRatio = AR_RESERVED; | ||||
|       break; | ||||
|     } | ||||
|   sw = (int)(headr[3] & 0x0F); | ||||
|   switch ( sw ) { | ||||
|     case 1: | ||||
|       m_VideoFrameRate = 24000 / 1001.0; | ||||
|       m_VideoFormat = VF_UNKNOWN; | ||||
|       break; | ||||
|     case 2: | ||||
|       m_VideoFrameRate = 24.0; | ||||
|       m_VideoFormat = VF_UNKNOWN; | ||||
|       break; | ||||
|     case 3: | ||||
|       m_VideoFrameRate = 25.0; | ||||
|       m_VideoFormat = VF_PAL; | ||||
|       break; | ||||
|     case 4: | ||||
|       m_VideoFrameRate = 30000 / 1001.0; | ||||
|       m_VideoFormat = VF_NTSC; | ||||
|       break; | ||||
|     case 5: | ||||
|       m_VideoFrameRate = 30.0; | ||||
|       m_VideoFormat = VF_NTSC; | ||||
|       break; | ||||
|     case 6: | ||||
|       m_VideoFrameRate = 50.0; | ||||
|       m_VideoFormat = VF_PAL; | ||||
|       break; | ||||
|     case 7: | ||||
|       m_VideoFrameRate = 60.0; | ||||
|       m_VideoFormat = VF_NTSC; | ||||
|       break; | ||||
|     case 8: | ||||
|       m_VideoFrameRate = 60000 / 1001.0; | ||||
|       m_VideoFormat = VF_NTSC; | ||||
|       break; | ||||
|     case 9 ... 15: | ||||
|     default: | ||||
|       m_VideoFrameRate = 0; | ||||
|       m_VideoFormat = VF_UNKNOWN; | ||||
|       break; | ||||
|     } | ||||
|   m_VideoStreamBitrate = 400 * (((headr[4] << 10) & 0x0003FC00UL) | ((headr[5] << 2) & 0x000003FCUL) | (((headr[6] & 0xC0) >> 6) & 0x00000003UL)) / 1000000.0; | ||||
| } | ||||
|  | ||||
| static unsigned int bitrates[3][16] = | ||||
| { | ||||
|   {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 0}, | ||||
|   {0, 32, 48, 56, 64,  80,  96,  112, 128, 160, 192, 224, 256, 320, 384, 0}, | ||||
|   {0, 32, 40, 48, 56,  64,  80,  96,  112, 128, 160, 192, 224, 256, 320, 0} | ||||
| }; | ||||
|  | ||||
| static unsigned int samplerates[4] = | ||||
| {441, 480, 320, 0}; | ||||
|  | ||||
| /* The following function originates from libdvbmpeg: */ | ||||
| void cFemonReceiver::GetAudioInfo(uint8_t *mbuf, int count) | ||||
| { | ||||
|   //printf("cFemonReceiver::GetAudioInfo()\n"); | ||||
|   uint8_t *headr; | ||||
|   int found = 0; | ||||
|   int c = 0; | ||||
|   int tmp = 0; | ||||
|   m_AudioValid = false; | ||||
|   while (!found && (c < count)) { | ||||
|     uint8_t *b = mbuf + c; | ||||
|     if ((b[0] == 0xff) && ((b[1] & 0xf8) == 0xf8)) | ||||
|        found = 1; | ||||
|     else | ||||
|        c++; | ||||
|     }	 | ||||
|   if ((!found) || ((c + 3) >= count)) return; | ||||
|   m_AudioValid = true; | ||||
|   headr = mbuf + c; | ||||
|   m_AudioMPEGLayer = 4 - ((headr[1] & 0x06) >> 1); | ||||
|   tmp = bitrates[(3 - ((headr[1] & 0x06) >> 1))][(headr[2] >> 4)] * 1000; | ||||
|   if (tmp == 0) | ||||
|      m_AudioStreamBitrate = (double)FR_FREE; | ||||
|   else if (tmp == 0xf) | ||||
|      m_AudioStreamBitrate = (double)FR_RESERVED; | ||||
|   else | ||||
|      m_AudioStreamBitrate = tmp / 1000.0; | ||||
|   tmp = samplerates[((headr[2] & 0x0c) >> 2)] * 100; | ||||
|   if (tmp == 3) | ||||
|      m_AudioSamplingFreq = FR_RESERVED; | ||||
|   else | ||||
|      m_AudioSamplingFreq = tmp; | ||||
| } | ||||
|  | ||||
| static unsigned int ac3_bitrates[32] = | ||||
| {32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 576, 640, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; | ||||
|  | ||||
| static unsigned int ac3_freq[4] = | ||||
| {480, 441, 320, 0}; | ||||
|  | ||||
| static unsigned int ac3_frames[3][32] = | ||||
| { | ||||
|   {64, 80,  96,  112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 640, 768,  896,  1024, 1152, 1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, | ||||
|   {69, 87,  104, 121, 139, 174, 208, 243, 278, 348, 417, 487, 557, 696, 835,  975,  1114, 1253, 1393, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, | ||||
|   {96, 120, 144, 168, 192, 240, 288, 336, 384, 480, 576, 672, 768, 960, 1152, 1344, 1536, 1728, 1920, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} | ||||
| }; | ||||
|  | ||||
| /* | ||||
| ** AC3 Audio Header: http://www.atsc.org/standards/a_52a.pdf | ||||
| ** The following function originates from libdvbmpeg: | ||||
| */ | ||||
| void cFemonReceiver::GetAC3Info(uint8_t *mbuf, int count) | ||||
| { | ||||
|   uint8_t *headr; | ||||
|   int found = 0; | ||||
|   int c = 0; | ||||
|   uint8_t frame; | ||||
|   m_AC3Valid = false; | ||||
|   while (!found && (c < count)) { | ||||
|     uint8_t *b = mbuf + c; | ||||
|     if ((b[0] == 0x0b) && (b[1] == 0x77)) | ||||
|        found = 1; | ||||
|     else | ||||
|        c++; | ||||
|     } | ||||
|   if ((!found) || ((c + 5) >= count)) return; | ||||
|   m_AC3Valid = true; | ||||
|   headr = mbuf + c + 2; | ||||
|   frame = (headr[2] & 0x3f); | ||||
|   m_AC3StreamBitrate = ac3_bitrates[frame >> 1]; | ||||
|   int fr = (headr[2] & 0xc0 ) >> 6; | ||||
|   m_AC3SamplingFreq = ac3_freq[fr] * 100; | ||||
|   m_AC3FrameSize = ac3_frames[fr][frame >> 1]; | ||||
|   if ((frame & 1) && (fr == 1)) m_AC3FrameSize++; | ||||
|      m_AC3FrameSize <<= 1; | ||||
|   m_AC3BitStreamMode = (headr[3] & 7); | ||||
|   m_AC3AudioCodingMode = (headr[4] & 0xE0) >> 5; | ||||
|   if ((m_AC3AudioCodingMode & 0x01) && (m_AC3AudioCodingMode != 0x01)) // if 3 front channels | ||||
|      m_AC3CenterMixLevel = (headr[4] & 0x18) >> 3; | ||||
|   else | ||||
|      m_AC3CenterMixLevel = FR_NOTVALID; | ||||
|   if (m_AC3AudioCodingMode & 0x04) //  if a surround channel exists | ||||
|      m_AC3SurroundMixLevel = (headr[4] & 0x06) >> 1; | ||||
|   else | ||||
|      m_AC3SurroundMixLevel = FR_NOTVALID; | ||||
|   if (m_AC3AudioCodingMode == 0x02) // if in 2/0 mode | ||||
|      m_AC3DolbySurroundMode = ((headr[4] & 1) << 1) | ((headr[5] & 0x80) >> 7); | ||||
|   else  | ||||
|      m_AC3DolbySurroundMode = FR_NOTVALID; | ||||
|   m_AC3LfeOn = (headr[5] & 0x40) >> 6; | ||||
|   m_AC3DialogLevel = (headr[5] & 0x3e) >> 1; | ||||
| } | ||||
|  | ||||
| void cFemonReceiver::Activate(bool On) | ||||
| { | ||||
|   //printf("cFemonReceiver::Activate()\n"); | ||||
| @@ -41,8 +263,8 @@ void cFemonReceiver::Activate(bool On) | ||||
| void cFemonReceiver::Receive(uchar *Data, int Length) | ||||
| { | ||||
|   //printf("cFemonReceiver::Receive()\n"); | ||||
|   // TS packet length: 188 | ||||
|   if (Length == 188) { | ||||
|   // TS packet length: TS_SIZE | ||||
|   if (Length == TS_SIZE) { | ||||
|      int pid = ((Data[1] & 0x1f) << 8) | (Data[2]); | ||||
|      if (pid == m_VideoPid) { | ||||
|         m_VideoPacketCount++; | ||||
| @@ -50,12 +272,43 @@ void cFemonReceiver::Receive(uchar *Data, int Length) | ||||
|      else if (pid == m_AudioPid) { | ||||
|         m_AudioPacketCount++; | ||||
|         } | ||||
|      else if (pid == m_AC3Pid) { | ||||
|         m_AC3PacketCount++; | ||||
|         } | ||||
|      /* the following originates from libdvbmpeg: */ | ||||
|      if (!(Data[3] & PAYLOAD)) { | ||||
|         return; | ||||
|         } | ||||
|      uint8_t off = 0; | ||||
|      if (Data[3] & ADAPT_FIELD) { | ||||
|         off = Data[4] + 1; | ||||
|         } | ||||
|      if (Data[1] & PAY_START) { | ||||
|         uint8_t *sb = Data + 4 + off; | ||||
|         if (sb[7] & PTS_DTS_FLAGS) { | ||||
|            uint8_t *pay = sb + sb[8] + 9;  | ||||
|            int l = TS_SIZE - 13 - off - sb[8]; | ||||
|            if (pid == m_VideoPid) { | ||||
|               GetVideoInfo(pay, l); | ||||
|               } | ||||
|            else if (pid == m_AudioPid) { | ||||
|               GetAudioInfo(pay, l); | ||||
|               } | ||||
|            else if (pid == m_AC3Pid) { | ||||
|               GetAC3Info(pay, l); | ||||
|               } | ||||
|            } | ||||
|         } | ||||
|      /* end */ | ||||
|      } | ||||
| } | ||||
|  | ||||
| void cFemonReceiver::Action(void) | ||||
| { | ||||
|   //printf("cFemonReceiver::Action()\n"); | ||||
| #if (VDRVERSNUM < 10300) | ||||
|   isyslog("femon receiver: thread started (pid = %d)", getpid()); | ||||
| #endif | ||||
|   m_Active = true; | ||||
|   while (m_Active) { | ||||
|         // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit | ||||
| @@ -63,6 +316,11 @@ void cFemonReceiver::Action(void) | ||||
|         m_VideoPacketCount = 0; | ||||
|         m_AudioBitrate = (8.0 * 184.0 * m_AudioPacketCount) / (femonConfig.calcinterval * 100.0); | ||||
|         m_AudioPacketCount = 0; | ||||
|         m_AC3Bitrate   = (8.0 * 184.0 * m_AC3PacketCount)   / (femonConfig.calcinterval * 100.0); | ||||
|         m_AC3PacketCount = 0; | ||||
|         usleep(100000L * femonConfig.calcinterval); | ||||
|     } | ||||
| #if (VDRVERSNUM < 10300) | ||||
|   isyslog("femon receiver: thread stopped (pid = %d)", getpid()); | ||||
| #endif | ||||
| } | ||||
|   | ||||
							
								
								
									
										110
									
								
								femonreceiver.h
									
									
									
									
									
								
							
							
						
						
									
										110
									
								
								femonreceiver.h
									
									
									
									
									
								
							| @@ -12,15 +12,82 @@ | ||||
| #include <vdr/thread.h> | ||||
| #include <vdr/receiver.h> | ||||
|  | ||||
| enum eVideoFormat { | ||||
|   VF_UNKNOWN = 0, | ||||
|   VF_PAL     = 1, | ||||
|   VF_NTSC    = 2, | ||||
|   }; | ||||
|  | ||||
| enum eAspectRatio { | ||||
|   AR_RESERVED = 0, | ||||
|   AR_1_1      = 100, | ||||
|   AR_4_3      = 133, | ||||
|   AR_16_9     = 177, | ||||
|   AR_2_21_1   = 233, | ||||
|   }; | ||||
|  | ||||
| enum eCenterMixLevel { | ||||
|   CML_MINUS_3dB   = 0, | ||||
|   CML_MINUS_4_5dB = 1, | ||||
|   CML_MINUS_6dB   = 2, | ||||
|   CML_RESERVED    = 3, | ||||
|   }; | ||||
|  | ||||
| enum eSurroundMixLevel { | ||||
|   SML_MINUS_3dB = 0, | ||||
|   SML_MINUS_6dB = 1, | ||||
|   SML_0_dB      = 2, | ||||
|   SML_RESERVED  = 3, | ||||
|   }; | ||||
|  | ||||
| enum eDolbySurroundMode { | ||||
|   DSM_NOT_INDICATED     = 0, | ||||
|   DSM_NOT_DOLBYSURROUND = 1, | ||||
|   DSM_DOLBYSURROUND     = 2, | ||||
|   DSM_RESERVED          = 3, | ||||
|   }; | ||||
|  | ||||
| #define FR_RESERVED    -1 | ||||
| #define FR_FREE        -2 | ||||
| #define FR_NOTVALID    -3 | ||||
|  | ||||
| class cFemonReceiver : public cReceiver, public cThread { | ||||
| private: | ||||
|   bool m_Active; | ||||
|   int m_VideoPid; | ||||
|   int m_AudioPid; | ||||
|   int m_VideoPacketCount; | ||||
|   int m_AudioPacketCount; | ||||
|   bool   m_Active; | ||||
|   int    m_VideoPid; | ||||
|   int    m_AudioPid; | ||||
|   int    m_AC3Pid; | ||||
|   bool   m_VideoValid; | ||||
|   int    m_VideoPacketCount; | ||||
|   int    m_VideoHorizontalSize; | ||||
|   int    m_VideoVerticalSize; | ||||
|   int    m_VideoAspectRatio; | ||||
|   int    m_VideoFormat; | ||||
|   double m_VideoFrameRate; | ||||
|   double m_VideoStreamBitrate; | ||||
|   double m_VideoBitrate; | ||||
|   bool   m_AudioValid; | ||||
|   int    m_AudioPacketCount; | ||||
|   double m_AudioStreamBitrate; | ||||
|   double m_AudioBitrate; | ||||
|   int    m_AudioSamplingFreq; | ||||
|   int    m_AudioMPEGLayer; | ||||
|   bool   m_AC3Valid; | ||||
|   int    m_AC3PacketCount; | ||||
|   double m_AC3Bitrate; | ||||
|   int    m_AC3FrameSize; | ||||
|   int    m_AC3SamplingFreq; | ||||
|   int    m_AC3StreamBitrate; | ||||
|   int    m_AC3BitStreamMode; | ||||
|   int    m_AC3AudioCodingMode; | ||||
|   int    m_AC3CenterMixLevel; | ||||
|   int    m_AC3SurroundMixLevel; | ||||
|   int    m_AC3DolbySurroundMode; | ||||
|   bool   m_AC3LfeOn; | ||||
|   int    m_AC3DialogLevel;   | ||||
|   void   GetVideoInfo(uint8_t *mbuf, int count); | ||||
|   void   GetAudioInfo(uint8_t *mbuf, int count); | ||||
|   void   GetAC3Info(uint8_t *mbuf, int count); | ||||
|  | ||||
| protected: | ||||
|   virtual void Activate(bool On); | ||||
| @@ -28,11 +95,38 @@ protected: | ||||
|   virtual void Action(void); | ||||
|  | ||||
| public: | ||||
|   cFemonReceiver(int Ca, int Vpid, int Apid); | ||||
|   cFemonReceiver(int Ca, int Vpid, int Apid, int Dpid); | ||||
|   virtual ~cFemonReceiver(); | ||||
|  | ||||
|   double VideoBitrate(void) { return m_VideoBitrate; }; // Mbit/s | ||||
|   double AudioBitrate(void) { return m_AudioBitrate; }; // kbit/s | ||||
|   bool VideoValid(void)           { return m_VideoValid; };          // boolean | ||||
|   int VideoHorizontalSize(void)   { return m_VideoHorizontalSize; }; // pixels | ||||
|   int VideoVerticalSize(void)     { return m_VideoVerticalSize; };   // pixels | ||||
|   int VideoAspectRatio(void)      { return m_VideoAspectRatio; };    // eAspectRatio | ||||
|   int VideoFormat(void)           { return m_VideoFormat; };         // eVideoFormat | ||||
|   double VideoFrameRate(void)     { return m_VideoFrameRate; };      // Hz | ||||
|   double VideoStreamBitrate(void) { return m_VideoStreamBitrate; };  // Mbit/s | ||||
|   double VideoBitrate(void)       { return m_VideoBitrate; };        // Mbit/s | ||||
|  | ||||
|   bool AudioValid(void)           { return m_AudioValid; };          // boolean | ||||
|   int AudioMPEGLayer(void)        { return m_AudioMPEGLayer; };      // layer number | ||||
|   int AudioSamplingFreq(void)     { return m_AudioSamplingFreq; };   // Hz | ||||
|   double AudioStreamBitrate(void) { return m_AudioStreamBitrate; };  // kbit/s | ||||
|   double AudioBitrate(void)       { return m_AudioBitrate; };        // kbit/s | ||||
|  | ||||
|   bool AC3Valid(void)             { return m_AC3Valid; };                // boolean | ||||
|   int AC3SamplingFreq(void)       { return m_AC3SamplingFreq; };         // Hz | ||||
|   double AC3StreamBitrate(void)   { return m_AC3StreamBitrate; };        // kbit/s | ||||
|   double AC3Bitrate(void)         { return m_AC3Bitrate; };              // kbit/s | ||||
|   int AC3FrameSize(void)          { return m_AC3FrameSize; };            // Bytes | ||||
|   int AC3BitStreamMode(void)      { return m_AC3BitStreamMode; };        // 0..7 | ||||
|   int AC3AudioCodingMode(void)    { return m_AC3AudioCodingMode; };      // 0..7 | ||||
|   bool AC3_2_0(void)		  { return m_AC3AudioCodingMode == 2; }; // DD 2.0 | ||||
|   bool AC3_5_1(void)	          { return m_AC3AudioCodingMode == 7; }; // DD 5.1 | ||||
|   int AC3CenterMixLevel(void)     { return m_AC3CenterMixLevel; };       // eCenterMixLevel | ||||
|   int AC3SurroundMixLevel(void)   { return m_AC3SurroundMixLevel; };     // eSurroundMixLevel | ||||
|   int AC3DolbySurroundMode(void)  { return m_AC3DolbySurroundMode; };    // eDolbySurroundMode | ||||
|   bool AC3LfeOn(void)             { return m_AC3LfeOn; };                // boolean | ||||
|   int AC3DialogLevel(void)        { return m_AC3DialogLevel; };          // -dB | ||||
|   }; | ||||
|  | ||||
| #endif //__FEMONRECEIVER_H | ||||
|   | ||||
		Reference in New Issue
	
	Block a user