Skip to content

V
vlc-1.1
Commit 7b3cb7d9 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

x11: fix compiler warnings.

parent 0bed6fc3
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 9 deletions
modules/video_output/x11/xcommon.c
View file @ 7b3cb7d9
...@@ -1302,9 +1302,7 @@ static int ManageVideo( vout_thread_t *p_vout ) ...@@ -1302,9 +1302,7 @@ static int ManageVideo( vout_thread_t *p_vout )
var_Set( p_vout, "mouse-button-down", val ); var_Set( p_vout, "mouse-button-down", val );
var_SetBool( p_vout, "mouse-clicked", true ); var_SetBool( p_vout, "mouse-clicked", true );
var_SetBool( p_vout->p_libvlc, "intf-popupmenu", false );
vlc_value_t val; val.b_bool = false;
var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
} }
break; break;
...@@ -1326,8 +1324,7 @@ static int ManageVideo( vout_thread_t *p_vout ) ...@@ -1326,8 +1324,7 @@ static int ManageVideo( vout_thread_t *p_vout )
val.i_int &= ~4; val.i_int &= ~4;
var_Set( p_vout, "mouse-button-down", val ); var_Set( p_vout, "mouse-button-down", val );
vlc_value_t val; val.b_bool = true; var_SetBool( p_vout->p_libvlc, "intf-popupmenu", true );
var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
} }
break; break;
...@@ -1349,7 +1346,6 @@ static int ManageVideo( vout_thread_t *p_vout ) ...@@ -1349,7 +1346,6 @@ static int ManageVideo( vout_thread_t *p_vout )
else if( xevent.type == MotionNotify ) else if( xevent.type == MotionNotify )
{ {
unsigned int i_width, i_height, i_x, i_y; unsigned int i_width, i_height, i_x, i_y;
vlc_value_t val;
/* somewhat different use for vout_PlacePicture: /* somewhat different use for vout_PlacePicture:
* here the values are needed to give to mouse coordinates * here the values are needed to give to mouse coordinates
...@@ -1384,8 +1380,7 @@ static int ManageVideo( vout_thread_t *p_vout ) ...@@ -1384,8 +1380,7 @@ static int ManageVideo( vout_thread_t *p_vout )
var_Set( p_vout, "mouse-y", val ); var_Set( p_vout, "mouse-y", val );
val.b_bool = true; var_SetBool( p_vout, "mouse-moved", true );
var_Set( p_vout, "mouse-moved", val );
p_vout->p_sys->i_time_mouse_last_moved = mdate(); p_vout->p_sys->i_time_mouse_last_moved = mdate();
if( ! p_vout->p_sys->b_mouse_pointer_visible ) if( ! p_vout->p_sys->b_mouse_pointer_visible )
...@@ -2795,7 +2790,7 @@ static int InitDisplay( vout_thread_t *p_vout ) ...@@ -2795,7 +2790,7 @@ static int InitDisplay( vout_thread_t *p_vout )
if( p_vout->p_sys->i_shm_opcode ) if( p_vout->p_sys->i_shm_opcode )
{ {
int major, minor; int minor;
Bool pixmaps; Bool pixmaps;
XShmQueryVersion( p_vout->p_sys->p_display, &major, &minor, XShmQueryVersion( p_vout->p_sys->p_display, &major, &minor,
......
Markdown is supported
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