Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv19010/libvo Modified Files: Makefile sub.h Log Message: changes made for vo_aa Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libvo/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile 12 Jul 2001 15:35:52 -0000 1.11 +++ Makefile 16 Aug 2001 15:18:46 -0000 1.12 @@ -10,7 +10,7 @@ SRCS += rgb15to16mmx.c yuv2rgb_mmx.c endif -CFLAGS = $(OPTFLAGS) -I. -I.. $(SDL_INC) $(X11_INC) $(EXTRA_INC) -DMPG12PLAY +CFLAGS = $(OPTFLAGS) -I. -I.. $(SDL_INC) $(X11_INC) $(EXTRA_INC) -DMPG12PLAY #-Wall # -I/usr/X11R6/include/ .SUFFIXES: .c .o Index: sub.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/sub.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sub.h 28 May 2001 15:12:14 -0000 1.5 +++ sub.h 16 Aug 2001 15:18:46 -0000 1.6 @@ -38,6 +38,25 @@ #define OSD_PB_END 0x12 #define OSD_PB_1 0x13 +/* now in textform */ +static char * osd_names[]={ + "Seekbar", + "Play", + "Pause", + "Stop", + "Rewind", + "Forward", + "Clock", + "Contrast", + "Saturation", + "Volume", + "Brightnes", + "Hue" +}; +static char * osd_names_short[] ={ "", "|>", "||", "[]", "<<" , ">>", "", "", "", "", "", ""}; + + + //extern void vo_draw_text_osd(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)); //extern void vo_draw_text_progbar(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)); //extern void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));