changeset 13341:0c41c3728568

fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me

--- a/libmpcodecs/vd.c	Wed Sep 15 10:47:03 2004 +0000
+++ b/libmpcodecs/vd.c	Wed Sep 15 11:26:45 2004 +0000
@@ -126,6 +126,17 @@
 int vo_flags=0;
 int vd_use_slices=1;
 
+/** global variables for gamma, brightness, contrast, saturation and hue 
+    modified by mplayer.c and Gui/mplayer/gtk/eq.c:
+    ranges -100 - 100
+    1000 if the vo default should be used
+*/   
+int vo_gamma_gamma = 1000;
+int vo_gamma_brightness = 1000;
+int vo_gamma_contrast = 1000;
+int vo_gamma_saturation = 1000;
+int vo_gamma_hue = 1000;
+
 extern vd_functions_t* mpvdec; // FIXME!
 extern int divx_quality;
 
@@ -306,6 +317,18 @@
     }
 
     sh->vf_inited=1;
+
+    if (vo_gamma_gamma != 1000)
+        set_video_colors(sh, "gamma", vo_gamma_gamma);
+    if (vo_gamma_brightness != 1000)
+        set_video_colors(sh, "brightness", vo_gamma_brightness);
+    if (vo_gamma_contrast != 1000)
+        set_video_colors(sh, "contrast", vo_gamma_contrast);
+    if (vo_gamma_saturation != 1000)
+        set_video_colors(sh, "saturation", vo_gamma_saturation);
+    if (vo_gamma_hue != 1000)
+        set_video_colors(sh, "hue", vo_gamma_hue);
+
     return 1;
 }
 

--- a/mplayer.c	Wed Sep 15 10:47:03 2004 +0000
+++ b/mplayer.c	Wed Sep 15 11:26:45 2004 +0000
@@ -318,12 +318,11 @@
 
 char* current_module=NULL; // for debugging
 
-// also modified by Gui/mplayer/gtk/eq.c:
-int vo_gamma_gamma = 1000;
-int vo_gamma_brightness = 1000;
-int vo_gamma_contrast = 1000;
-int vo_gamma_saturation = 1000;
-int vo_gamma_hue = 1000;
+extern int vo_gamma_gamma;
+extern int vo_gamma_brightness;
+extern int vo_gamma_contrast;
+extern int vo_gamma_saturation;
+extern int vo_gamma_hue;
 
 // ---
 
@@ -1755,19 +1754,6 @@
 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============
 
 current_module="init_vo";
-    if (sh_video)
-    {
-        if (vo_gamma_gamma != 1000)
-          set_video_colors (sh_video, "gamma", vo_gamma_gamma);
-	if (vo_gamma_brightness != 1000)
-	    set_video_colors(sh_video, "brightness", vo_gamma_brightness);
-	if (vo_gamma_contrast != 1000)
-	    set_video_colors(sh_video, "contrast", vo_gamma_contrast);
-	if (vo_gamma_saturation != 1000)
-	    set_video_colors(sh_video, "saturation", vo_gamma_saturation);
-	if (vo_gamma_hue != 1000)
-	    set_video_colors(sh_video, "hue", vo_gamma_hue);
-    }
 
    if(vo_flags & 0x08 && vo_spudec)
       spudec_set_hw_spu(vo_spudec,video_out);