diff -uN vdr-1.4.0-orig/README.beauty vdr-1.4.0-beauty/README.beauty --- vdr-1.4.0-orig/README.beauty 1970-01-01 01:00:00.000000000 +0100 +++ vdr-1.4.0-beauty/README.beauty 2006-06-05 18:30:02.000000000 +0200 @@ -0,0 +1,10 @@ +Replaymode display beauty + +The replaymode display feature was included into VDR as of version 0.95. +Unfortunaly Klaus decided to use some standard characters for the display. +This patch brings back the special symbols used before. + +Beside applying the patch, there is no additional configuration needed. + +Stefan Huelswitt + diff -uN vdr-1.4.0-orig/font.c vdr-1.4.0-beauty/font.c --- vdr-1.4.0-orig/font.c 2006-04-16 12:59:15.000000000 +0200 +++ vdr-1.4.0-beauty/font.c 2006-06-05 18:25:04.000000000 +0200 @@ -36,15 +36,17 @@ #include "fontosd-iso8859-15.c" #include "fontsml-iso8859-15.c" +#include "fontsym.c" + // --- cFont ----------------------------------------------------------------- static const void *const FontData[eDvbCodeSize][eDvbFontSize] = { - { FontOsd_iso8859_1, FontFix_iso8859_1, FontSml_iso8859_1 }, - { FontOsd_iso8859_2, FontFix_iso8859_2, FontSml_iso8859_2 }, - { FontOsd_iso8859_5, FontFix_iso8859_5, FontSml_iso8859_5 }, - { FontOsd_iso8859_7, FontFix_iso8859_7, FontSml_iso8859_7 }, - { FontOsd_iso8859_13, FontFix_iso8859_13, FontSml_iso8859_13 }, - { FontOsd_iso8859_15, FontFix_iso8859_15, FontSml_iso8859_15 }, + { FontOsd_iso8859_1, FontFix_iso8859_1, FontSml_iso8859_1, FontSym }, + { FontOsd_iso8859_2, FontFix_iso8859_2, FontSml_iso8859_2, FontSym }, + { FontOsd_iso8859_5, FontFix_iso8859_5, FontSml_iso8859_5, FontSym }, + { FontOsd_iso8859_7, FontFix_iso8859_7, FontSml_iso8859_7, FontSym }, + { FontOsd_iso8859_13, FontFix_iso8859_13, FontSml_iso8859_13, FontSym }, + { FontOsd_iso8859_15, FontFix_iso8859_15, FontSml_iso8859_15, FontSym }, }; static const char *FontCode[eDvbCodeSize] = { diff -uN vdr-1.4.0-orig/font.h vdr-1.4.0-beauty/font.h --- vdr-1.4.0-orig/font.h 2006-02-05 14:46:36.000000000 +0100 +++ vdr-1.4.0-beauty/font.h 2006-06-05 18:23:14.000000000 +0200 @@ -12,11 +12,16 @@ #include +#ifndef HAVE_BEAUTYPATCH +#define HAVE_BEAUTYPATCH +#endif + enum eDvbFont { fontOsd, fontFix, - fontSml -#define eDvbFontSize (fontSml + 1) + fontSml, + fontSym +#define eDvbFontSize (fontSym + 1) }; enum eDvbCode { diff -uN vdr-1.4.0-orig/fontsym.c vdr-1.4.0-beauty/fontsym.c --- vdr-1.4.0-orig/fontsym.c 1970-01-01 01:00:00.000000000 +0100 +++ vdr-1.4.0-beauty/fontsym.c 2006-06-05 18:23:14.000000000 +0200 @@ -0,0 +1,362 @@ +cFont::tPixelData FontSym[][29] = { + { // 32 + 6, 27, + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + 0x00000000, // ...... + }, + { // 33 + 28, 27, + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x03c00000, // ..####...................... + 0x03e00000, // ..#####..................... + 0x03fc0000, // ..########.................. + 0x03fe0000, // ..#########................. + 0x03ffc000, // ..############.............. + 0x03ffe000, // ..#############............. + 0x03e7fc00, // ..#####..#########.......... + 0x03e3fe00, // ..#####...#########......... + 0x03e07fc0, // ..#####......#########...... + 0x03e03fe0, // ..#####.......#########..... + 0x03e007fc, // ..#####..........#########.. + 0x03e007fc, // ..#####..........#########.. + 0x03e03fe0, // ..#####.......#########..... + 0x03e07fc0, // ..#####......#########...... + 0x03e3fe00, // ..#####...#########......... + 0x03e7fc00, // ..#####..#########.......... + 0x03ffe000, // ..#############............. + 0x03ffc000, // ..############.............. + 0x03fe0000, // ..#########................. + 0x03fc0000, // ..########.................. + 0x03e00000, // ..#####..................... + 0x03c00000, // ..####...................... + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + }, + { // 34 + 28, 27, + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x0381c000, // ..###......###.............. + 0x03c1e000, // ..####.....####............. + 0x03f1f800, // ..######...######........... + 0x00f87c00, // ....#####....#####.......... + 0x007e3f00, // .....######...######........ + 0x001f0f80, // .......#####....#####....... + 0x000fc7e0, // ........######...######..... + 0x0003e1f0, // ..........#####....#####.... + 0x0001f8fc, // ...........######...######.. + 0x0001f8fc, // ...........######...######.. + 0x0003e1f0, // ..........#####....#####.... + 0x000fc7e0, // ........######...######..... + 0x001f0f80, // .......#####....#####....... + 0x007e3f00, // .....######...######........ + 0x00f87c00, // ....#####....#####.......... + 0x03f1f800, // ..######...######........... + 0x03c1e000, // ..####.....####............. + 0x0381c000, // ..###......###.............. + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x03f80000, // ..#######................... + 0x03f80000, // ..#######................... + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + }, + { // 35 + 28, 27, + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x0381c000, // ..###......###.............. + 0x03c1e000, // ..####.....####............. + 0x03f1f800, // ..######...######........... + 0x00f87c00, // ....#####....#####.......... + 0x007e3f00, // .....######...######........ + 0x001f0f80, // .......#####....#####....... + 0x000fc7e0, // ........######...######..... + 0x0003e1f0, // ..........#####....#####.... + 0x0001f8fc, // ...........######...######.. + 0x0001f8fc, // ...........######...######.. + 0x0003e1f0, // ..........#####....#####.... + 0x000fc7e0, // ........######...######..... + 0x001f0f80, // .......#####....#####....... + 0x007e3f00, // .....######...######........ + 0x00f87c00, // ....#####....#####.......... + 0x03f1f800, // ..######...######........... + 0x03c1e000, // ..####.....####............. + 0x0381c000, // ..###......###.............. + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x03f9fc00, // ..#######..#######.......... + 0x03f9fc00, // ..#######..#######.......... + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + }, + { // 36 + 28, 27, + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x0381c000, // ..###......###.............. + 0x03c1e000, // ..####.....####............. + 0x03f1f800, // ..######...######........... + 0x00f87c00, // ....#####....#####.......... + 0x007e3f00, // .....######...######........ + 0x001f0f80, // .......#####....#####....... + 0x000fc7e0, // ........######...######..... + 0x0003e1f0, // ..........#####....#####.... + 0x0001f8fc, // ...........######...######.. + 0x0001f8fc, // ...........######...######.. + 0x0003e1f0, // ..........#####....#####.... + 0x000fc7e0, // ........######...######..... + 0x001f0f80, // .......#####....#####....... + 0x007e3f00, // .....######...######........ + 0x00f87c00, // ....#####....#####.......... + 0x03f1f800, // ..######...######........... + 0x03c1e000, // ..####.....####............. + 0x0381c000, // ..###......###.............. + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x03f9fcfe, // ..#######..#######..#######. + 0x03f9fcfe, // ..#######..#######..#######. + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + }, + { // 37 + 28, 27, + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00fe07f0, // ....#######......#######.... + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + }, + { // 38 + 28, 27, + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x0000381c, // ..............###......###.. + 0x0000783c, // .............####.....####.. + 0x0001f8fc, // ...........######...######.. + 0x0003e1f0, // ..........#####....#####.... + 0x000fc7e0, // ........######...######..... + 0x001f0f80, // .......#####....#####....... + 0x007e3f00, // .....######...######........ + 0x00f87c00, // ....#####....#####.......... + 0x03f1f800, // ..######...######........... + 0x03f1f800, // ..######...######........... + 0x00f87c00, // ....#####....#####.......... + 0x007e3f00, // .....######...######........ + 0x001f0f80, // .......#####....#####....... + 0x000fc7e0, // ........######...######..... + 0x0003e1f0, // ..........#####....#####.... + 0x0001f8fc, // ...........######...######.. + 0x0000783c, // .............####.....####.. + 0x0000381c, // ..............###......###.. + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x03f80000, // ..#######................... + 0x03f80000, // ..#######................... + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + }, + { // 39 + 28, 27, + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x0000381c, // ..............###......###.. + 0x0000783c, // .............####.....####.. + 0x0001f8fc, // ...........######...######.. + 0x0003e1f0, // ..........#####....#####.... + 0x000fc7e0, // ........######...######..... + 0x001f0f80, // .......#####....#####....... + 0x007e3f00, // .....######...######........ + 0x00f87c00, // ....#####....#####.......... + 0x03f1f800, // ..######...######........... + 0x03f1f800, // ..######...######........... + 0x00f87c00, // ....#####....#####.......... + 0x007e3f00, // .....######...######........ + 0x001f0f80, // .......#####....#####....... + 0x000fc7e0, // ........######...######..... + 0x0003e1f0, // ..........#####....#####.... + 0x0001f8fc, // ...........######...######.. + 0x0000783c, // .............####.....####.. + 0x0000381c, // ..............###......###.. + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x03f9fc00, // ..#######..#######.......... + 0x03f9fc00, // ..#######..#######.......... + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + }, + { // 40 + 28, 27, + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x0000381c, // ..............###......###.. + 0x0000783c, // .............####.....####.. + 0x0001f8fc, // ...........######...######.. + 0x0003e1f0, // ..........#####....#####.... + 0x000fc7e0, // ........######...######..... + 0x001f0f80, // .......#####....#####....... + 0x007e3f00, // .....######...######........ + 0x00f87c00, // ....#####....#####.......... + 0x03f1f800, // ..######...######........... + 0x03f1f800, // ..######...######........... + 0x00f87c00, // ....#####....#####.......... + 0x007e3f00, // .....######...######........ + 0x001f0f80, // .......#####....#####....... + 0x000fc7e0, // ........######...######..... + 0x0003e1f0, // ..........#####....#####.... + 0x0001f8fc, // ...........######...######.. + 0x0000783c, // .............####.....####.. + 0x0000381c, // ..............###......###.. + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x03f9fcfe, // ..#######..#######..#######. + 0x03f9fcfe, // ..#######..#######..#######. + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + }, + { // 41 + 28, 27, + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + }, + { // 42 + 29, 27, + 0x00000001, // ............................ + 0x00000001, // ............................ + 0x07038001, // ..###......###.............. + 0x0783c001, // ..####.....####............. + 0x07e3f001, // ..######...######........... + 0x01f0f801, // ....#####....#####.......... + 0x00fc7e01, // .....######...######........ + 0x003e1f01, // .......#####....#####....... + 0x001f8fc1, // ........######...######..... + 0x0007c3e1, // ..........#####....#####.... + 0x0003f1f9, // ...........######...######.. + 0x0003f1f9, // ...........######...######.. + 0x0007c3e1, // ..........#####....#####.... + 0x001f8fc1, // ........######...######..... + 0x003e1f01, // .......#####....#####....... + 0x00fc7e01, // .....######...######........ + 0x01f0f801, // ....#####....#####.......... + 0x07e3f001, // ..######...######........... + 0x0783c001, // ..####.....####............. + 0x07038001, // ..###......###.............. + 0x00000001, // ............................ + 0x00000001, // ............................ + 0x00000001, // ............................ + 0x00000001, // ............................ + 0x00000001, // ............................ + 0x00000001, // ............................ + 0x00000001, // ............................ + }, + { // 43 + 28, 27, + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x0000381c, // ..............###......###.. + 0x0000783c, // .............####.....####.. + 0x0001f8fc, // ...........######...######.. + 0x0003e1f0, // ..........#####....#####.... + 0x000fc7e0, // ........######...######..... + 0x001f0f80, // .......#####....#####....... + 0x007e3f00, // .....######...######........ + 0x00f87c00, // ....#####....#####.......... + 0x03f1f800, // ..######...######........... + 0x03f1f800, // ..######...######........... + 0x00f87c00, // ....#####....#####.......... + 0x007e3f00, // .....######...######........ + 0x001f0f80, // .......#####....#####....... + 0x000fc7e0, // ........######...######..... + 0x0003e1f0, // ..........#####....#####.... + 0x0001f8fc, // ...........######...######.. + 0x0000783c, // .............####.....####.. + 0x0000381c, // ..............###......###.. + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + 0x00000000, // ............................ + }, + }; diff -uN vdr-1.4.0-orig/fontsym.h vdr-1.4.0-beauty/fontsym.h --- vdr-1.4.0-orig/fontsym.h 1970-01-01 01:00:00.000000000 +0100 +++ vdr-1.4.0-beauty/fontsym.h 2006-06-05 18:23:14.000000000 +0200 @@ -0,0 +1,25 @@ +/* + * fontsym.h: Some defines for the symbol font + * + * See the main source file 'vdr.c' for copyright information and + * how to reach the author. + * + * $Id: fontsym.h 1.00 $ + */ + +#ifndef _FONTSYM_H +#define _FONTSYM_H + +#define FSYM_PLAY 33 +#define FSYM_FORW1 34 +#define FSYM_FORW2 35 +#define FSYM_FORW3 36 +#define FSYM_PAUSE 37 +#define FSYM_BACK1 38 +#define FSYM_BACK2 39 +#define FSYM_BACK3 40 +#define FSYM_EMPTY 41 +#define FSYM_FORW 42 +#define FSYM_BACK 43 + +#endif diff -uN vdr-1.4.0-orig/skinclassic.c vdr-1.4.0-beauty/skinclassic.c --- vdr-1.4.0-orig/skinclassic.c 2006-03-31 15:59:50.000000000 +0200 +++ vdr-1.4.0-beauty/skinclassic.c 2006-06-05 18:23:14.000000000 +0200 @@ -12,6 +12,7 @@ #include "i18n.h" #include "osd.h" #include "themes.h" +#include "fontsym.h" #define ScrollWidth 5 @@ -432,6 +433,7 @@ void cSkinClassicDisplayReplay::SetMode(bool Play, bool Forward, int Speed) { if (Setup.ShowReplayMode) { +/* const char *Mode; if (Speed == -1) Mode = Play ? " > " : " || "; else if (Play) Mode = Forward ? " X>> " : " < 0 ? '1' + Speed - 1 : ' '; SetJump(buf); +*/ + static const int forwSym[] = { FSYM_FORW,FSYM_FORW1,FSYM_FORW2,FSYM_FORW3 }; + static const int backSym[] = { FSYM_BACK,FSYM_BACK1,FSYM_BACK2,FSYM_BACK3 }; + char buf[4]; + buf[0]=(Speed>=0 && !Forward) ? backSym[Speed] : FSYM_EMPTY; + buf[1]=Play ? (Speed==-1 ? FSYM_PLAY : FSYM_EMPTY) : FSYM_PAUSE; + buf[2]=(Speed>=0 && Forward) ? forwSym[Speed] : FSYM_EMPTY; + buf[3]=0; + osd->DrawText(x0 + (x1 - x0) / 4, y2, buf, Theme.Color(clrReplayModeJump), Theme.Color(clrBackground), cFont::GetFont(fontSym), (x1 - x0) / 2, 0, taCenter); } }