changes made for vo_aa

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1553 b3059339-0415-0410-9bf9-f77b7e298cf2

DOCS/documentation.html

@@ -964,13 +964,15 @@ Table of Contents
   If ./configure detects aalib installed, the aalib libvo driver will be built.
   
   You can use some keys in the AA Window to change rendering options:
-        1 : switch fast rendering on/off
-        2 : set dithering mode (none, error distribution, floyd steinberg)
-        3 : invert image
-        4 : decrease contrast
-        5 : increase contrast
-        6 : decrease brightness
-        7 : increase brightness
+        1 : decrease contrast
+        2 : increase contrast
+        3 : decrease brightness
+        4 : increase brightness
+	5 : switch fast rendering on/off
+        6 : set dithering mode (none, error distribution, floyd steinberg)
+        7 : invert image
+	a : toggles between aa and mplayer control)
+
   
 
   The following command line options can be used:

libvo/Makefile

@@ -10,7 +10,7 @@ ifeq ($(TARGET_ARCH_X86),yes)
 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

libvo/sub.h

@@ -38,6 +38,25 @@ extern subtitle* vo_sub;
 #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));