1 files changed, 19 insertions, 33 deletions

diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c
index 5046a8b9ec..d0807dc132 100644
--- a/libvo/vo_aa.c
+++ b/libvo/vo_aa.c
@@ -96,7 +96,9 @@ static struct SwsContext *sws=NULL;
 int aaopt_osdcolor = AA_SPECIAL;
 int aaopt_subcolor = AA_SPECIAL;
 
-void
+static unsigned char vo_osd_text[64];
+
+static void
 resize(void){
     /* 
      * this function is called by aa lib if windows resizes
@@ -192,15 +194,10 @@ osdpercent(int duration, int deko, int min, int max, int val, const char * desc,
 static void
 printosdtext(void)
 {
-  if(osd_text_length > 0 && !vo_osd_text) {
-    memset(c->textbuffer,' ',osd_text_length);
-    memset(c->attrbuffer,0,osd_text_length);
-    osd_text_length = 0;
-  }
     /* 
      * places the mplayer status osd
      */
-  if (vo_osd_text && vo_osd_text[0] != 0) {
+  if (vo_osd_text[0] != 0) {
     int len;
     if(vo_osd_text[0] < 32) {
       len = strlen(sub_osd_names_short[vo_osd_text[0]]) + strlen(vo_osd_text+1) + 2;
@@ -544,18 +541,18 @@ static void clear_alpha(int x0,int y0, int w,int h) {
 
 static void
 draw_osd(void){
-    char * vo_osd_text_save;
+    char vo_osd_text_save;
     int vo_osd_progbar_type_save;
 
     printosdprogbar();
     /* let vo_draw_text only write subtitle */
-    vo_osd_text_save=vo_osd_text; /* we have to save the osd_text */
-    vo_osd_text=NULL;
+    vo_osd_text_save = global_osd->osd_text[0];
+    global_osd->osd_text[0] = 0;
     vo_osd_progbar_type_save=vo_osd_progbar_type;
     vo_osd_progbar_type=-1;
     vo_remove_text(aa_scrwidth(c), aa_scrheight(c),clear_alpha);
     vo_draw_text(aa_scrwidth(c), aa_scrheight(c), draw_alpha);
-    vo_osd_text=vo_osd_text_save;
+    global_osd->osd_text[0] = vo_osd_text_save;
     vo_osd_progbar_type=vo_osd_progbar_type_save;
 }
 
@@ -728,37 +725,26 @@ static int preinit(const char *arg)
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
     return query_format(*((uint32_t*)data));
   case VOCTRL_SET_EQUALIZER: {
-    va_list ap;
-    int val;
-
-    va_start(ap, data);
-    val = va_arg(ap, int);
-    va_end(ap);
-
-    if(strcmp((char*)data,"contrast") == 0)
-      p->contrast = ( val + 100 ) * 64 / 100;
-    else if(strcmp((char*)data,"brightness") == 0)
-      p->bright = ( val + 100) * 128 / 100;
+    struct voctrl_set_equalizer_args *args = data;
+    if (strcmp(args->name, "contrast") == 0)
+      p->contrast = (args->value + 100) * 64 / 100;
+    else if (strcmp(args->name, "brightness") == 0)
+      p->bright = (args->value + 100) * 128 / 100;
     return VO_TRUE;
   }
   case VOCTRL_GET_EQUALIZER: {
-    va_list ap;
-    int* val;
-
-    va_start(ap, data);
-    val = va_arg(ap, int*);
-    va_end(ap);
+    struct voctrl_get_equalizer_args *args = data;
 
-    if(strcmp((char*)data,"contrast") == 0)
-      *val = (p->contrast - 64) * 100 / 64;
-    else if(strcmp((char*)data,"brightness") == 0)
-      *val = (p->bright - 128) * 100 / 128;
+    if (strcmp(args->name, "contrast") == 0)
+      *args->valueptr = (p->contrast - 64) * 100 / 64;
+    else if (strcmp(args->name, "brightness") == 0)
+      *args->valueptr = (p->bright - 128) * 100 / 128;
 
     return VO_TRUE;
   }