Added 1080/720/576/480 symbols into status window.

This commit is contained in:
Rolf Ahrenberg 2009-09-02 15:58:30 +03:00
parent e57b36a151
commit c07abc7ed5
9 changed files with 142 additions and 1 deletions

View File

@ -375,3 +375,4 @@ VDR Plugin 'femon' Revision History
- Fixed H.264 bitstream parser.
- Added a mutex to receiver class.
- Added 1080/720/576/480 format symbols into status window.

View File

@ -247,6 +247,7 @@ void cFemonOsd::DrawStatusWindow(void)
case 5: bm = &bmSymbol[SYMBOL_FIVE]; break;
case 6: bm = &bmSymbol[SYMBOL_SIX]; break;
case 7: bm = &bmSymbol[SYMBOL_SEVEN]; break;
case 8: bm = &bmSymbol[SYMBOL_EIGHT]; break;
default: bm = &bmSymbol[SYMBOL_ZERO]; break;
}
OSDDRAWSTATUSBM(OSDSPACING);
@ -261,6 +262,7 @@ void cFemonOsd::DrawStatusWindow(void)
case 5: bm = &bmSymbol[SYMBOL_FIVE]; break;
case 6: bm = &bmSymbol[SYMBOL_SIX]; break;
case 7: bm = &bmSymbol[SYMBOL_SEVEN]; break;
case 8: bm = &bmSymbol[SYMBOL_EIGHT]; break;
default: bm = &bmSymbol[SYMBOL_ZERO]; break;
}
OSDDRAWSTATUSBM(OSDSPACING);
@ -278,6 +280,14 @@ void cFemonOsd::DrawStatusWindow(void)
OSDDRAWSTATUSBM(OSDSPACING);
}
if (m_Receiver) {
switch (m_Receiver->VideoVerticalSize()) {
case 1080: bm = &bmSymbol[SYMBOL_FORMAT_1080]; break;
case 720: bm = &bmSymbol[SYMBOL_FORMAT_720]; break;
case 576: bm = &bmSymbol[SYMBOL_FORMAT_576]; break;
case 480: bm = &bmSymbol[SYMBOL_FORMAT_480]; break;
default: bm = NULL; break;
}
OSDDRAWSTATUSBM(OSDSPACING);
switch (m_Receiver->VideoCodec()) {
case VIDEO_CODEC_MPEG2: bm = &bmSymbol[SYMBOL_MPEG2]; break;
case VIDEO_CODEC_H264: bm = &bmSymbol[SYMBOL_H264]; break;

View File

@ -37,6 +37,11 @@
#include "symbols/five.xpm"
#include "symbols/six.xpm"
#include "symbols/seven.xpm"
#include "symbols/eight.xpm"
#include "symbols/format1080.xpm"
#include "symbols/format720.xpm"
#include "symbols/format576.xpm"
#include "symbols/format480.xpm"
cBitmap bmSymbol[SYMBOL_MAX_COUNT] =
{
@ -69,5 +74,10 @@ cBitmap bmSymbol[SYMBOL_MAX_COUNT] =
cBitmap(four_xpm), // SYMBOL_FOUR
cBitmap(five_xpm), // SYMBOL_FIVE
cBitmap(six_xpm), // SYMBOL_SIX
cBitmap(seven_xpm) // SYMBOL_SEVEN
cBitmap(seven_xpm), // SYMBOL_SEVEN
cBitmap(eight_xpm), // SYMBOL_EIGHT
cBitmap(format1080_xpm), // SYMBOL_FORMAT_1080
cBitmap(format720_xpm), // SYMBOL_FORMAT_720
cBitmap(format576_xpm), // SYMBOL_FORMAT_576
cBitmap(format480_xpm) // SYMBOL_FORMAT_480
};

View File

@ -41,6 +41,11 @@ enum eSymbols {
SYMBOL_FIVE,
SYMBOL_SIX,
SYMBOL_SEVEN,
SYMBOL_EIGHT,
SYMBOL_FORMAT_1080,
SYMBOL_FORMAT_720,
SYMBOL_FORMAT_576,
SYMBOL_FORMAT_480,
SYMBOL_MAX_COUNT
};

23
symbols/eight.xpm Normal file
View File

@ -0,0 +1,23 @@
/* XPM */
static const char *const eight_xpm[] = {
"15 18 2 1",
". c #FFFFFF",
"+ c #000000",
"+++++++++++++++",
"..............+",
".....++++.....+",
"....++++++....+",
"....++..++....+",
"...++....++...+",
"...++....++...+",
"....++..++....+",
".....++++.....+",
".....++++.....+",
"....++..++....+",
"...++....++...+",
"...++....++...+",
"....++..++....+",
"....++++++....+",
".....++++.....+",
"..............+",
"+++++++++++++++"};

23
symbols/format1080.xpm Normal file
View File

@ -0,0 +1,23 @@
/* XPM */
static const char *const format1080_xpm[] = {
"46 18 2 1",
". c #FFFFFF",
"+ c #000000",
"++++++++++++++++++++++++++++++++++++++++++++++",
"+............................................+",
"+......++.....++++.......++++.......++++.....+",
"+...+++++....++++++.....++++++.....++++++....+",
"+...+++++....++..++.....++..++.....++..++....+",
"+......++...++....++...++....++...++....++...+",
"+......++...++....++...++....++...++....++...+",
"+......++...++....++....++..++....++....++...+",
"+......++...++....++.....++++.....++....++...+",
"+......++...++....++.....++++.....++....++...+",
"+......++...++....++....++..++....++....++...+",
"+......++...++....++...++....++...++....++...+",
"+......++...++....++...++....++...++....++...+",
"+......++....++..++.....++..++.....++..++....+",
"+......++....++++++.....++++++.....++++++....+",
"+......++.....++++.......++++.......++++.....+",
"+............................................+",
"++++++++++++++++++++++++++++++++++++++++++++++"};

23
symbols/format480.xpm Normal file
View File

@ -0,0 +1,23 @@
/* XPM */
static const char *const format480_xpm[] = {
"37 18 2 1",
". c #FFFFFF",
"+ c #000000",
"+++++++++++++++++++++++++++++++++++++",
"....................................+",
".........++.....++++.......++++.....+",
"........+++....++++++.....++++++....+",
".......++++....++..++.....++..++....+",
"......++.++...++....++...++....++...+",
".....++..++...++....++...++....++...+",
".....++..++....++..++....++....++...+",
"....++...++.....++++.....++....++...+",
"...++....++.....++++.....++....++...+",
"...+++++++++...++..++....++....++...+",
"...+++++++++..++....++...++....++...+",
".........++...++....++...++....++...+",
".........++....++..++.....++..++....+",
".........++....++++++.....++++++....+",
".........++.....++++.......++++.....+",
"....................................+",
"+++++++++++++++++++++++++++++++++++++"};

23
symbols/format576.xpm Normal file
View File

@ -0,0 +1,23 @@
/* XPM */
static const char *const format576_xpm[] = {
"36 18 2 1",
". c #FFFFFF",
"+ c #000000",
"++++++++++++++++++++++++++++++++++++",
"...................................+",
"...+++++++...++++++++....++++++....+",
"...+++++++...++++++++...++++++++...+",
"...++........++....++...+++...++...+",
"...++..............++...++.........+",
"...++.............+++...++.........+",
"...++++++.........++....++.+++.....+",
"...+++++++........++....+++++++....+",
"...++...+++......+++....+++..+++...+",
".........++......++.....++....++...+",
".........++......++.....++....++...+",
"...++....++.....+++.....++....++...+",
"...++...+++.....++......+++..+++...+",
"...+++++++......++......+++++++....+",
"....+++++.......++.......+++++.....+",
"...................................+",
"++++++++++++++++++++++++++++++++++++"};

23
symbols/format720.xpm Normal file
View File

@ -0,0 +1,23 @@
/* XPM */
static const char *const format720_xpm[] = {
"37 18 2 1",
". c #FFFFFF",
"+ c #000000",
"+++++++++++++++++++++++++++++++++++++",
"....................................+",
"...++++++++.....++++.......++++.....+",
"...++++++++...+++++++.....++++++....+",
"...++....++...++....++....++..++....+",
".........++.........++...++....++...+",
".........++.........++...++....++...+",
".........++.........+++..++....++...+",
"........++........+++....++....++...+",
".......+++.......+++.....++....++...+",
".......++.......+++......++....++...+",
".......++......+++.......++....++...+",
"......+++.....+++........++....++...+",
"......++......++..........++..++....+",
"......++......++++++++....++++++....+",
"......++......++++++++.....++++.....+",
"....................................+",
"+++++++++++++++++++++++++++++++++++++"};