Merge from 1.2 main branch.

--HG--
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : src/libxineadec/Makefile.am => src/audio_dec/Makefile.am
rename : src/libxineadec/xine_a52_decoder.c => src/audio_dec/xine_a52_decoder.c
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
rename : src/libffmpeg/ff_audio_decoder.c => src/combined/ffmpeg/ff_audio_decoder.c
rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/ff_dvdata.h => src/combined/ffmpeg/ff_dvdata.h
rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c
rename : src/libffmpeg/ffmpeg_encoder.c => src/combined/ffmpeg/ffmpeg_encoder.c
rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
rename : src/libmpeg2/decode.c => src/video_dec/libmpeg2/decode.c

1 files changed, 98 insertions, 6 deletions

diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index 1587b76e4..907b20c8e 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -20,8 +20,6 @@
  * OSD stuff (text and graphic primitives)
  */
 
-#define __OSD_C__
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -50,11 +48,11 @@
 
 #define XINE_ENGINE_INTERNAL
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "xine-engine/bswap.h"
-#include "xineutils.h"
-#include "video_out.h"
-#include "osd.h"
+#include <xine/xineutils.h>
+#include <xine/video_out.h>
+#include <xine/osd.h>
 
 #ifdef HAVE_FT2
 #include <ft2build.h>
@@ -110,6 +108,100 @@
 #  define FT_LOAD_FLAGS  (FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING)
 #endif
 
+/* This text descriptions are used for config screen */
+static const char *const textpalettes_str[NUMBER_OF_TEXT_PALETTES+1] = {
+  "white-black-transparent",
+  "white-none-transparent",
+  "white-none-translucid",
+  "yellow-black-transparent",    
+  NULL};
+
+/* 
+   Palette entries as used by osd fonts:
+
+   0: not used by font, always transparent
+   1: font background, usually transparent, may be used to implement
+      translucid boxes where the font will be printed.
+   2-5: transition between background and border (usually only alpha
+        value changes).
+   6: font border. if the font is to be displayed without border this
+      will probably be adjusted to font background or near.
+   7-9: transition between border and foreground
+   10: font color (foreground)   
+*/
+
+/* 
+    The palettes below were made by hand, ie, i just throw
+    values that seemed to do the transitions i wanted.
+    This can surelly be improved a lot. [Miguel]
+*/
+
+static const clut_t textpalettes_color[NUMBER_OF_TEXT_PALETTES][TEXT_PALETTE_SIZE] = {
+/* white, black border, transparent */
+  {
+    CLUT_Y_CR_CB_INIT(0x00, 0x00, 0x00), /*0*/
+    CLUT_Y_CR_CB_INIT(0x00, 0x80, 0x80), /*1*/
+    CLUT_Y_CR_CB_INIT(0x00, 0x80, 0x80), /*2*/
+    CLUT_Y_CR_CB_INIT(0x00, 0x80, 0x80), /*3*/
+    CLUT_Y_CR_CB_INIT(0x00, 0x80, 0x80), /*4*/
+    CLUT_Y_CR_CB_INIT(0x00, 0x80, 0x80), /*5*/
+    CLUT_Y_CR_CB_INIT(0x00, 0x80, 0x80), /*6*/
+    CLUT_Y_CR_CB_INIT(0x40, 0x80, 0x80), /*7*/
+    CLUT_Y_CR_CB_INIT(0x80, 0x80, 0x80), /*8*/
+    CLUT_Y_CR_CB_INIT(0xc0, 0x80, 0x80), /*9*/
+    CLUT_Y_CR_CB_INIT(0xff, 0x80, 0x80), /*10*/
+  },
+  /* white, no border, transparent */
+  {
+    CLUT_Y_CR_CB_INIT(0x00, 0x00, 0x00), /*0*/
+    CLUT_Y_CR_CB_INIT(0xff, 0x80, 0x80), /*1*/
+    CLUT_Y_CR_CB_INIT(0xff, 0x80, 0x80), /*2*/
+    CLUT_Y_CR_CB_INIT(0xff, 0x80, 0x80), /*3*/
+    CLUT_Y_CR_CB_INIT(0xff, 0x80, 0x80), /*4*/
+    CLUT_Y_CR_CB_INIT(0xff, 0x80, 0x80), /*5*/
+    CLUT_Y_CR_CB_INIT(0xff, 0x80, 0x80), /*6*/
+    CLUT_Y_CR_CB_INIT(0xff, 0x80, 0x80), /*7*/
+    CLUT_Y_CR_CB_INIT(0xff, 0x80, 0x80), /*8*/
+    CLUT_Y_CR_CB_INIT(0xff, 0x80, 0x80), /*9*/
+    CLUT_Y_CR_CB_INIT(0xff, 0x80, 0x80), /*10*/
+  },
+  /* white, no border, translucid */
+  {
+    CLUT_Y_CR_CB_INIT(0x00, 0x00, 0x00), /*0*/
+    CLUT_Y_CR_CB_INIT(0x80, 0x80, 0x80), /*1*/
+    CLUT_Y_CR_CB_INIT(0x80, 0x80, 0x80), /*2*/
+    CLUT_Y_CR_CB_INIT(0x80, 0x80, 0x80), /*3*/
+    CLUT_Y_CR_CB_INIT(0x80, 0x80, 0x80), /*4*/
+    CLUT_Y_CR_CB_INIT(0x80, 0x80, 0x80), /*5*/
+    CLUT_Y_CR_CB_INIT(0x80, 0x80, 0x80), /*6*/
+    CLUT_Y_CR_CB_INIT(0xa0, 0x80, 0x80), /*7*/
+    CLUT_Y_CR_CB_INIT(0xc0, 0x80, 0x80), /*8*/
+    CLUT_Y_CR_CB_INIT(0xe0, 0x80, 0x80), /*9*/
+    CLUT_Y_CR_CB_INIT(0xff, 0x80, 0x80), /*10*/
+  },
+  /* yellow, black border, transparent */
+  {
+    CLUT_Y_CR_CB_INIT(0x00, 0x00, 0x00), /*0*/
+    CLUT_Y_CR_CB_INIT(0x00, 0x80, 0x80), /*1*/
+    CLUT_Y_CR_CB_INIT(0x00, 0x80, 0x80), /*2*/
+    CLUT_Y_CR_CB_INIT(0x00, 0x80, 0x80), /*3*/
+    CLUT_Y_CR_CB_INIT(0x00, 0x80, 0x80), /*4*/
+    CLUT_Y_CR_CB_INIT(0x00, 0x80, 0x80), /*5*/
+    CLUT_Y_CR_CB_INIT(0x00, 0x80, 0x80), /*6*/
+    CLUT_Y_CR_CB_INIT(0x40, 0x84, 0x60), /*7*/
+    CLUT_Y_CR_CB_INIT(0x70, 0x88, 0x40), /*8*/
+    CLUT_Y_CR_CB_INIT(0xb0, 0x8a, 0x20), /*9*/
+    CLUT_Y_CR_CB_INIT(0xff, 0x90, 0x00), /*10*/
+  },
+};
+
+static const uint8_t textpalettes_trans[NUMBER_OF_TEXT_PALETTES][TEXT_PALETTE_SIZE] = {
+  {0, 0, 3, 6, 8, 10, 12, 14, 15, 15, 15 },
+  {0, 0, 0, 0, 0, 0, 2, 6, 9, 12, 15 },
+  {0, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15 },
+  {0, 0, 3, 6, 8, 10, 12, 14, 15, 15, 15 },
+};
+
 typedef struct osd_fontchar_s {
   uint8_t *bmp;
   uint16_t code;