Commit 25ed7261 authored by Eric Petit's avatar Eric Petit
Browse files

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

 so it doesn't conflict with the one from the adjust filter
parent 118a5aa5
...@@ -313,7 +313,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -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, "x-end", VLC_VAR_INTEGER );
var_Create( p_sys->p_input, "y-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, "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", VLC_VAR_BOOL );
var_Create( p_sys->p_input, "highlight-mutex", VLC_VAR_MUTEX ); var_Create( p_sys->p_input, "highlight-mutex", VLC_VAR_MUTEX );
...@@ -347,7 +347,7 @@ static void Close( vlc_object_t *p_this ) ...@@ -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-start" );
var_Destroy( p_sys->p_input, "y-end" ); var_Destroy( p_sys->p_input, "y-end" );
var_Destroy( p_sys->p_input, "color" ); 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 ); vlc_object_release( p_sys->p_input );
...@@ -911,7 +911,7 @@ static void ButtonUpdate( demux_t *p_demux ) ...@@ -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.i_int = hl.ey; var_Set( p_sys->p_input, "y-end", val );
val.p_address = (void *)p_sys->alpha; 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 ); val.b_bool = VLC_TRUE; var_Set( p_sys->p_input, "highlight", val );
vlc_mutex_unlock( p_mutex ); vlc_mutex_unlock( p_mutex );
......
...@@ -987,7 +987,7 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object ) ...@@ -987,7 +987,7 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object )
} }
#endif #endif
if( var_Get( p_object, "contrast", &val ) == VLC_SUCCESS ) if( var_Get( p_object, "menu-contrast", &val ) == VLC_SUCCESS )
{ {
int i; int i;
for( i = 0; i < 4; i++ ) for( i = 0; i < 4; i++ )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment