[xine-cvs] HG: gxine: Not good to have gamma support depend on the presence of sharpness support.

[Darren S. <li...@yo...>]

# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1270993126 -3600
# Node ID e64f402dbb2981133fb5f45890a3baeb10756ea4
# Parent  27b73b8337ff7d3d7a91a0496837af665fea5a08
Not good to have gamma support depend on the presence of sharpness support.

diff --git a/src/settings.c b/src/settings.c
--- a/src/settings.c
+++ b/src/settings.c
@@ -56,8 +56,10 @@
   { N_("Saturation"),	"gxine-settings-saturation",	Control_SATURATION },
   { N_("Contrast"),	"gxine-settings-contrast",	Control_CONTRAST },
   { N_("Brightness"),	"gxine-settings-brightness",	Control_BRIGHTNESS },
+#ifdef XINE_PARAM_VO_GAMMA
+  { N_("Gamma"),	"gxine-settings-gamma",		Control_GAMMA },
+#endif
 #ifdef XINE_PARAM_VO_SHARPNESS
-  { N_("Gamma"),	"gxine-settings-gamma",		Control_GAMMA },
   { N_("Sharpness"),	"gxine-settings-sharpness",	Control_SHARPNESS },
   { N_("Noise reduction"), "gxine-settings-noise-reduce", Control_NOISE_REDUCE },
 #endif
diff --git a/src/ui.c b/src/ui.c
--- a/src/ui.c
+++ b/src/ui.c
@@ -188,9 +188,11 @@
   [Control_SATURATION]		= { 32768,       0,  65535,  100,  1000, 0, "gui.vo_saturation",	 "vo_saturation", XINE_PARAM_VO(SATURATION) },
   [Control_CONTRAST]		= { 32768,       0,  65535,  100,  1000, 0, "gui.vo_contrast",		 "vo_contrast",   XINE_PARAM_VO(CONTRAST) },
   [Control_BRIGHTNESS]		= { 32768,       0,  65535,  100,  1000, 0, "gui.vo_brightness",	 "vo_brightness", XINE_PARAM_VO(BRIGHTNESS) },
-#ifdef XINE_PARAM_VO_SHARPNESS
+#ifdef XINE_PARAM_VO_GAMMA
   /* 5957 == (1000 - 100) * 65536 / (10000 - 100); range (on rv370) is 100..10000 */
   [Control_GAMMA]		= {  5957,       0,  65535,  100,  1000, 0, "gui.vo_gamma",		 "vo_gamma",	  XINE_PARAM_VO(GAMMA) },
+#endif
+#ifdef XINE_PARAM_VO_SHARPNESS
   [Control_SHARPNESS]		= { 32768,       0,  65535,  100,  1000, 0, "gui.vo_sharpness",		 "vo_sharpness",  XINE_PARAM_VO(SHARPNESS) },
   [Control_NOISE_REDUCE]	= {     0,       0,  65535,  100,  1000, 0, "gui.vo_noise_reduction",	 "vo_noise_reduction", XINE_PARAM_VO(NOISE_REDUCTION) },
 #endif
diff --git a/src/ui.h b/src/ui.h
--- a/src/ui.h
+++ b/src/ui.h
@@ -79,8 +79,10 @@
   Control_SATURATION,
   Control_CONTRAST,
   Control_BRIGHTNESS,
+#ifdef XINE_PARAM_VO_GAMMA
+  Control_GAMMA,
+#endif
 #ifdef XINE_PARAM_VO_SHARPNESS
-  Control_GAMMA,
   Control_SHARPNESS,
   Control_NOISE_REDUCE,
 #endif
diff --git a/src/xml_widgets.c b/src/xml_widgets.c
--- a/src/xml_widgets.c
+++ b/src/xml_widgets.c
@@ -736,8 +736,10 @@
     { SLIDER,	Control_SATURATION,	TN_("Saturation"), "" },
     { SLIDER,	Control_CONTRAST,	TN_("Contrast"), "" },
     { SLIDER,	Control_BRIGHTNESS,	TN_("Brightness"), "" },
+#ifdef XINE_PARAM_VO_GAMMA
+    { SLIDER,	Control_GAMMA,		TN_("Gamma"), "" },
+#endif
 #ifdef XINE_PARAM_VO_SHARPNESS
-    { SLIDER,	Control_GAMMA,		TN_("Gamma"), "" },
     { SLIDER,	Control_SHARPNESS,	TN_("Sharpness"), "" },
     { SLIDER,	Control_NOISE_REDUCE,	TN_("Noise reduction"), "" },
 #endif