diff options
author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-22 19:21:16 +0000 |
---|---|---|
committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-22 19:21:16 +0000 |
commit | 544233bded74186eca2498e202ed82003c5e04be (patch) | |
tree | f6360316ae6a9a2b01bac7ff6494ee94bd655cf2 /libvo/vo_aa.c | |
parent | 6982f81d903afe3838cd743d5f0b50e10be2f2cc (diff) | |
download | mpv-544233bded74186eca2498e202ed82003c5e04be.tar.bz2 mpv-544233bded74186eca2498e202ed82003c5e04be.tar.xz |
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
Diffstat (limited to 'libvo/vo_aa.c')
-rw-r--r-- | libvo/vo_aa.c | 20 |
1 files changed, 2 insertions, 18 deletions
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 |