Renamed the "contrast" variable used between dvdnav and the video output

 so it doesn't conflict with the one from the adjust filter

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index da1d81da030d91fcfb15c69b8a2d430b782e498b..e7f5adf371db87972a5a0530338e898e8f864ae7 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -313,7 +313,7 @@ static int Open( vlc_object_t *p_this )
     var_Create( p_sys->p_input, "x-end", VLC_VAR_INTEGER );
     var_Create( p_sys->p_input, "y-end", VLC_VAR_INTEGER );
     var_Create( p_sys->p_input, "color", VLC_VAR_ADDRESS );
-    var_Create( p_sys->p_input, "contrast", VLC_VAR_ADDRESS );
+    var_Create( p_sys->p_input, "menu-contrast", VLC_VAR_ADDRESS );
     var_Create( p_sys->p_input, "highlight", VLC_VAR_BOOL );
     var_Create( p_sys->p_input, "highlight-mutex", VLC_VAR_MUTEX );
 
@@ -347,7 +347,7 @@ static void Close( vlc_object_t *p_this )
     var_Destroy( p_sys->p_input, "y-start" );
     var_Destroy( p_sys->p_input, "y-end" );
     var_Destroy( p_sys->p_input, "color" );
-    var_Destroy( p_sys->p_input, "contrast" );
+    var_Destroy( p_sys->p_input, "menu-contrast" );
 
     vlc_object_release( p_sys->p_input );
 
@@ -911,7 +911,7 @@ static void ButtonUpdate( demux_t *p_demux )
             val.i_int = hl.ey; var_Set( p_sys->p_input, "y-end", val );
 
             val.p_address = (void *)p_sys->alpha;
-            var_Set( p_sys->p_input, "contrast", val );
+            var_Set( p_sys->p_input, "menu-contrast", val );
 
             val.b_bool = VLC_TRUE; var_Set( p_sys->p_input, "highlight", val );
             vlc_mutex_unlock( p_mutex );

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 393d2089828437b4b578d81e68edb0dd92418de3..8ed320e1c37ebcdf8903c8619aaa130d1c95bd87 100644 (file)
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -987,7 +987,7 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object )
     }
 #endif
 
-    if( var_Get( p_object, "contrast", &val ) == VLC_SUCCESS )
+    if( var_Get( p_object, "menu-contrast", &val ) == VLC_SUCCESS )
     {
         int i;
         for( i = 0; i < 4; i++ )