From 544233bded74186eca2498e202ed82003c5e04be Mon Sep 17 00:00:00 2001
From: uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 22 Nov 2006 19:21:16 +0000
Subject: Make compilation depending on USE_OSD unconditional. USE_OSD was
 hardcoded to true in configure, manually turning it off would break
 compilation, and most OSD-related code wasn't affected by it anyway so it did
 nothing useful.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21177 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/font_load_ft.c |  2 --
 libvo/vo_aa.c        | 20 ++------------------
 libvo/vo_caca.c      |  8 +-------
 3 files changed, 3 insertions(+), 27 deletions(-)

(limited to 'libvo')

diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c
index 8a5c3964da..d068e046fe 100644
--- a/libvo/font_load_ft.c
+++ b/libvo/font_load_ft.c
@@ -1150,7 +1150,6 @@ void load_font_ft(int width, int height)
 
     if (vo_font) free_font_desc(vo_font);
 
-#ifdef USE_OSD
 #ifdef HAVE_FONTCONFIG
     if (font_fontconfig)
     {
@@ -1176,5 +1175,4 @@ void load_font_ft(int width, int height)
     else
 #endif
     vo_font=read_font_desc_ft(font_name, width, height);
-#endif
 }
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c
index 860799d025..3229d13cbb 100644
--- a/libvo/vo_aa.c
+++ b/libvo/vo_aa.c
@@ -78,9 +78,7 @@ char posbar[MESSAGE_SIZE];
 static int osdx, osdy;
 static int osd_text_length = 0;
 int aaconfigmode=1;
-#ifdef USE_OSD
 font_desc_t* vo_font_save = NULL;
-#endif
 static struct SwsContext *sws=NULL;
 
 /* our version of the playmodes :) */
@@ -248,7 +246,6 @@ config(uint32_t width, uint32_t height, uint32_t d_width,
     /* nothing will change its size, be we need some values initialized */
     resize();
 
-#ifdef USE_OSD
     /* now init out own 'font' (to use vo_draw_text_sub without edit them) */
     if(!vo_font_save) vo_font_save = vo_font;
     if(vo_font == vo_font_save) {
@@ -280,7 +277,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width,
 	vo_font->pic_b[0]->bmp[i]=i;
       }
     }
-#endif
+
     /* say hello */
     osdmessage(5, 1, "Welcome to ASCII ART MPlayer");  
 
@@ -334,11 +331,7 @@ query_format(uint32_t format) {
 	case IMGFMT_RGB24:
 	case IMGFMT_Y8:
 	case IMGFMT_Y800:
-	    return VFCAP_CSP_SUPPORTED|VFCAP_SWSCALE
-#ifdef USE_OSD
-	    | VFCAP_OSD
-#endif
-	    ;
+	    return VFCAP_CSP_SUPPORTED | VFCAP_SWSCALE | VFCAP_OSD;
     }
     return 0;
 }
@@ -419,9 +412,7 @@ flip_page(void) {
 	}
       }
     /* OSD time & playmode , subtitles */
-#ifdef USE_OSD
     printosdtext();
-#endif
 
 
     /* print out */
@@ -516,7 +507,6 @@ uninit(void) {
     if (strstr(c->driver->name,"Curses") || strstr(c->driver->name,"Linux")){
 	freopen("/dev/tty", "w", stderr);
     }
-#ifdef USE_OSD
     if(vo_font_save) {
       free(vo_font->pic_a[0]->bmp);
       free(vo_font->pic_a[0]);
@@ -526,11 +516,9 @@ uninit(void) {
       vo_font = vo_font_save;
       vo_font_save = NULL;
     }
-#endif
     aa_close(c);
 }
 
-#ifdef USE_OSD
 static void draw_alpha(int x,int y, int w,int h, unsigned char* src, unsigned char *srca, int stride){
     int i,j;
     for (i = 0; i < h; i++) {
@@ -553,11 +541,8 @@ static void clear_alpha(int x0,int y0, int w,int h) {
 }
 
 
-#endif
-
 static void
 draw_osd(void){
-#ifdef USE_OSD
     char * vo_osd_text_save;
     int vo_osd_progbar_type_save;
 
@@ -571,7 +556,6 @@ draw_osd(void){
     vo_draw_text(aa_scrwidth(c), aa_scrheight(c), draw_alpha);
     vo_osd_text=vo_osd_text_save;
     vo_osd_progbar_type=vo_osd_progbar_type_save;
-#endif
 }
 
 static int
diff --git a/libvo/vo_caca.c b/libvo/vo_caca.c
index 74342f6cb1..86c46fa7e7 100644
--- a/libvo/vo_caca.c
+++ b/libvo/vo_caca.c
@@ -284,12 +284,10 @@ static void uninit(void)
 
 static void draw_osd(void)
 {
-#ifdef USE_OSD
     if (vo_osd_progbar_type != -1)
 	osdpercent(MESSAGE_DURATION, 0, 255,
 		  vo_osd_progbar_value, __sub_osd_names[vo_osd_progbar_type],
 		  "");
-#endif
 }
 
 static int preinit(const char *arg)
@@ -318,11 +316,7 @@ static int preinit(const char *arg)
 static int query_format(uint32_t format)
 {
     if (format == IMGFMT_BGR24)
-      return
-#ifdef USE_OSD
-	VFCAP_OSD |
-#endif
-	VFCAP_CSP_SUPPORTED;
+      return VFCAP_OSD | VFCAP_CSP_SUPPORTED;
 
     return 0;
 }
-- 
cgit v1.2.3