diff --git a/HISTORY b/HISTORY index dc39c38..d34a5e5 100644 --- a/HISTORY +++ b/HISTORY @@ -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. diff --git a/femonosd.c b/femonosd.c index b1f2bad..0fb4e31 100644 --- a/femonosd.c +++ b/femonosd.c @@ -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; diff --git a/femonsymbol.c b/femonsymbol.c index 7844ca8..0ac1771 100644 --- a/femonsymbol.c +++ b/femonsymbol.c @@ -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 }; diff --git a/femonsymbol.h b/femonsymbol.h index 615dab1..ef6bd42 100644 --- a/femonsymbol.h +++ b/femonsymbol.h @@ -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 }; diff --git a/symbols/eight.xpm b/symbols/eight.xpm new file mode 100644 index 0000000..17262e2 --- /dev/null +++ b/symbols/eight.xpm @@ -0,0 +1,23 @@ +/* XPM */ +static const char *const eight_xpm[] = { +"15 18 2 1", +". c #FFFFFF", +"+ c #000000", +"+++++++++++++++", +"..............+", +".....++++.....+", +"....++++++....+", +"....++..++....+", +"...++....++...+", +"...++....++...+", +"....++..++....+", +".....++++.....+", +".....++++.....+", +"....++..++....+", +"...++....++...+", +"...++....++...+", +"....++..++....+", +"....++++++....+", +".....++++.....+", +"..............+", +"+++++++++++++++"}; diff --git a/symbols/format1080.xpm b/symbols/format1080.xpm new file mode 100644 index 0000000..134c745 --- /dev/null +++ b/symbols/format1080.xpm @@ -0,0 +1,23 @@ +/* XPM */ +static const char *const format1080_xpm[] = { +"46 18 2 1", +". c #FFFFFF", +"+ c #000000", +"++++++++++++++++++++++++++++++++++++++++++++++", +"+............................................+", +"+......++.....++++.......++++.......++++.....+", +"+...+++++....++++++.....++++++.....++++++....+", +"+...+++++....++..++.....++..++.....++..++....+", +"+......++...++....++...++....++...++....++...+", +"+......++...++....++...++....++...++....++...+", +"+......++...++....++....++..++....++....++...+", +"+......++...++....++.....++++.....++....++...+", +"+......++...++....++.....++++.....++....++...+", +"+......++...++....++....++..++....++....++...+", +"+......++...++....++...++....++...++....++...+", +"+......++...++....++...++....++...++....++...+", +"+......++....++..++.....++..++.....++..++....+", +"+......++....++++++.....++++++.....++++++....+", +"+......++.....++++.......++++.......++++.....+", +"+............................................+", +"++++++++++++++++++++++++++++++++++++++++++++++"}; diff --git a/symbols/format480.xpm b/symbols/format480.xpm new file mode 100644 index 0000000..a16d561 --- /dev/null +++ b/symbols/format480.xpm @@ -0,0 +1,23 @@ +/* XPM */ +static const char *const format480_xpm[] = { +"37 18 2 1", +". c #FFFFFF", +"+ c #000000", +"+++++++++++++++++++++++++++++++++++++", +"....................................+", +".........++.....++++.......++++.....+", +"........+++....++++++.....++++++....+", +".......++++....++..++.....++..++....+", +"......++.++...++....++...++....++...+", +".....++..++...++....++...++....++...+", +".....++..++....++..++....++....++...+", +"....++...++.....++++.....++....++...+", +"...++....++.....++++.....++....++...+", +"...+++++++++...++..++....++....++...+", +"...+++++++++..++....++...++....++...+", +".........++...++....++...++....++...+", +".........++....++..++.....++..++....+", +".........++....++++++.....++++++....+", +".........++.....++++.......++++.....+", +"....................................+", +"+++++++++++++++++++++++++++++++++++++"}; diff --git a/symbols/format576.xpm b/symbols/format576.xpm new file mode 100644 index 0000000..729bb53 --- /dev/null +++ b/symbols/format576.xpm @@ -0,0 +1,23 @@ +/* XPM */ +static const char *const format576_xpm[] = { +"36 18 2 1", +". c #FFFFFF", +"+ c #000000", +"++++++++++++++++++++++++++++++++++++", +"...................................+", +"...+++++++...++++++++....++++++....+", +"...+++++++...++++++++...++++++++...+", +"...++........++....++...+++...++...+", +"...++..............++...++.........+", +"...++.............+++...++.........+", +"...++++++.........++....++.+++.....+", +"...+++++++........++....+++++++....+", +"...++...+++......+++....+++..+++...+", +".........++......++.....++....++...+", +".........++......++.....++....++...+", +"...++....++.....+++.....++....++...+", +"...++...+++.....++......+++..+++...+", +"...+++++++......++......+++++++....+", +"....+++++.......++.......+++++.....+", +"...................................+", +"++++++++++++++++++++++++++++++++++++"}; diff --git a/symbols/format720.xpm b/symbols/format720.xpm new file mode 100644 index 0000000..13ecf27 --- /dev/null +++ b/symbols/format720.xpm @@ -0,0 +1,23 @@ +/* XPM */ +static const char *const format720_xpm[] = { +"37 18 2 1", +". c #FFFFFF", +"+ c #000000", +"+++++++++++++++++++++++++++++++++++++", +"....................................+", +"...++++++++.....++++.......++++.....+", +"...++++++++...+++++++.....++++++....+", +"...++....++...++....++....++..++....+", +".........++.........++...++....++...+", +".........++.........++...++....++...+", +".........++.........+++..++....++...+", +"........++........+++....++....++...+", +".......+++.......+++.....++....++...+", +".......++.......+++......++....++...+", +".......++......+++.......++....++...+", +"......+++.....+++........++....++...+", +"......++......++..........++..++....+", +"......++......++++++++....++++++....+", +"......++......++++++++.....++++.....+", +"....................................+", +"+++++++++++++++++++++++++++++++++++++"};