*****************************************************************************/
struct intf_sys_t
{
- vlc_object_t * p_vout;
+ vlc_mutex_t lock;
+ vout_thread_t *p_vout;
bool b_got_gesture;
bool b_button_pressed;
int i_mouse_x, i_mouse_y;
// Configure the module
p_intf->pf_run = RunIntf;
+ vlc_mutex_init( &p_sys->lock );
p_sys->p_vout = NULL;
p_sys->b_got_gesture = false;
p_sys->b_button_pressed = false;
}
/* Destroy structure */
+ vlc_mutex_destroy( &p_intf->p_sys->lock );
free( p_intf->p_sys );
}
*****************************************************************************/
static void RunIntf( intf_thread_t *p_intf )
{
+ intf_sys_t *p_sys = p_intf->p_sys;
playlist_t * p_playlist = NULL;
int canc = vlc_savecancel();
input_thread_t *p_input;
/* Main loop */
while( vlc_object_alive( p_intf ) )
{
- vlc_mutex_lock( &p_intf->change_lock );
+ vlc_mutex_lock( &p_sys->lock );
/*
* mouse cursor
*/
- if( p_intf->p_sys->b_got_gesture )
+ if( p_sys->b_got_gesture )
{
vlc_value_t val;
int i_interval = 0;
/* If you modify this, please try to follow this convention:
Start with LEFT, RIGHT for playback related commands
and UP, DOWN, for other commands */
- switch( p_intf->p_sys->i_pattern )
+ switch( p_sys->i_pattern )
{
case LEFT:
- // Get the current input
+ msg_Dbg( p_intf, "Go backward in the movie!" );
p_playlist = pl_Hold( p_intf );
p_input = playlist_CurrentInput( p_playlist );
pl_Release( p_intf );
- if( !p_input )
- break;
-
- i_interval = config_GetInt( p_intf , "short-jump-size" );
- if ( i_interval > 0 )
+ if( p_input )
{
- val.i_time = ( (mtime_t)( -i_interval ) * 1000000L);
- var_Set( p_input, "time-offset", val );
+ i_interval = config_GetInt( p_intf , "short-jump-size" );
+ if ( i_interval > 0 )
+ {
+ val.i_time = ( (mtime_t)( -i_interval ) * 1000000L);
+ var_Set( p_input, "time-offset", val );
+ }
+ vlc_object_release( p_input );
}
- vlc_object_release( p_input );
- msg_Dbg(p_intf, "Go backward in the movie!");
break;
case RIGHT:
+ msg_Dbg( p_intf, "Go forward in the movie!" );
p_playlist = pl_Hold( p_intf );
p_input = playlist_CurrentInput( p_playlist );
pl_Release( p_intf );
- if( !p_input )
- break;
- i_interval = config_GetInt( p_intf , "short-jump-size" );
- if ( i_interval > 0 )
+ if( p_input )
{
- val.i_time = ( (mtime_t)( i_interval ) * 1000000L);
- var_Set( p_input, "time-offset", val );
+ i_interval = config_GetInt( p_intf , "short-jump-size" );
+ if ( i_interval > 0 )
+ {
+ val.i_time = ( (mtime_t)( i_interval ) * 1000000L);
+ var_Set( p_input, "time-offset", val );
+ }
+ vlc_object_release( p_input );
}
- vlc_object_release( p_input );
- msg_Dbg(p_intf, "Go forward in the movie!");
break;
+
case GESTURE(LEFT,UP,NONE,NONE):
- /*FIXME BF*/
- msg_Dbg(p_intf, "Going slower.");
+ msg_Dbg( p_intf, "Going slower." );
+ p_playlist = pl_Hold( p_intf );
+ p_input = playlist_CurrentInput( p_playlist );
+ pl_Release( p_intf );
+ if( p_input )
+ {
+ var_SetVoid( p_input, "rate-slower" );
+ vlc_object_release( p_input );
+ }
break;
+
case GESTURE(RIGHT,UP,NONE,NONE):
- /*FIXME FF*/
- msg_Dbg(p_intf, "Going faster.");
+ msg_Dbg( p_intf, "Going faster." );
+ p_playlist = pl_Hold( p_intf );
+ p_input = playlist_CurrentInput( p_playlist );
+ pl_Release( p_intf );
+ if( p_input )
+ {
+ var_SetVoid( p_input, "rate-faster" );
+ vlc_object_release( p_input );
+ }
break;
+
case GESTURE(LEFT,RIGHT,NONE,NONE):
case GESTURE(RIGHT,LEFT,NONE,NONE):
- {
- p_playlist = pl_Hold( p_intf );
- p_input = playlist_CurrentInput( p_playlist );
- pl_Release( p_intf );
-
- if( !p_input )
- break;
+ msg_Dbg( p_intf, "Play/Pause" );
+ p_playlist = pl_Hold( p_intf );
+ p_input = playlist_CurrentInput( p_playlist );
+ pl_Release( p_intf );
- val.i_int = PLAYING_S;
- if( p_input )
- {
- var_Get( p_input, "state", &val);
- if( val.i_int == PAUSE_S )
- {
- val.i_int = PLAYING_S;
- }
- else
- {
- val.i_int = PAUSE_S;
- }
- var_Set( p_input, "state", val);
- }
- msg_Dbg(p_intf, "Play/Pause");
+ if( p_input )
+ {
+ var_Get( p_input, "state", &val);
+ val.i_int = ( val.i_int != PLAYING_S ) ? PLAYING_S : PAUSE_S;
+ var_Set( p_input, "state", val);
vlc_object_release( p_input );
}
break;
+
case GESTURE(LEFT,DOWN,NONE,NONE):
p_playlist = pl_Hold( p_intf );
playlist_Prev( p_playlist );
pl_Release( p_intf );
break;
+
case GESTURE(RIGHT,DOWN,NONE,NONE):
p_playlist = pl_Hold( p_intf );
playlist_Next( p_playlist );
pl_Release( p_intf );
break;
+
case UP:
- {
- audio_volume_t i_newvol;
- aout_VolumeUp( p_intf, 1, &i_newvol );
- msg_Dbg(p_intf, "Louder");
- }
+ msg_Dbg(p_intf, "Louder");
+ aout_VolumeUp( p_intf, 1, NULL );
break;
+
case DOWN:
- {
- audio_volume_t i_newvol;
- aout_VolumeDown( p_intf, 1, &i_newvol );
- msg_Dbg(p_intf, "Quieter");
- }
+ msg_Dbg(p_intf, "Quieter");
+ aout_VolumeDown( p_intf, 1, NULL );
break;
+
case GESTURE(UP,DOWN,NONE,NONE):
case GESTURE(DOWN,UP,NONE,NONE):
- {
- audio_volume_t i_newvol = -1;
- aout_VolumeMute( p_intf, &i_newvol );
- msg_Dbg(p_intf, "Mute sound");
- }
+ msg_Dbg( p_intf, "Mute sound" );
+ aout_VolumeMute( p_intf, NULL );
break;
+
case GESTURE(UP,RIGHT,NONE,NONE):
{
vlc_value_t val, list, list2;
for( i = 0; i < i_count; i++ )
{
if( val.i_int == list.p_list->p_values[i].i_int )
- {
break;
- }
- }
- /* value of audio-es was not in choices list */
- if( i == i_count )
- {
- msg_Warn( p_input,
- "invalid current audio track, selecting 0" );
- var_Set( p_input, "audio-es",
- list.p_list->p_values[0] );
- i = 0;
- }
- else if( i == i_count - 1 )
- {
- var_Set( p_input, "audio-es",
- list.p_list->p_values[1] );
- i = 1;
}
- else
- {
- var_Set( p_input, "audio-es",
- list.p_list->p_values[i+1] );
- i++;
- }
- vlc_object_release( p_input );
+ /* value of audio-es was not in choices list */
+ if( i == i_count )
+ {
+ msg_Warn( p_input,
+ "invalid current audio track, selecting 0" );
+ i = 0;
+ }
+ else if( i == i_count - 1 )
+ i = 1;
+ else
+ i++;
+ var_Set( p_input, "audio-es", list.p_list->p_values[i] );
+ vlc_object_release( p_input );
}
break;
case GESTURE(DOWN,RIGHT,NONE,NONE):
{
msg_Warn( p_input,
"invalid current subtitle track, selecting 0" );
- var_Set( p_input, "spu-es", list.p_list->p_values[0] );
i = 0;
}
else if( i == i_count - 1 )
- {
- var_Set( p_input, "spu-es", list.p_list->p_values[0] );
i = 0;
- }
else
- {
- var_Set( p_input, "spu-es",
- list.p_list->p_values[i+1] );
- i = i + 1;
- }
+ i++;
+ var_Set( p_input, "spu-es", list.p_list->p_values[i] );
vlc_object_release( p_input );
}
break;
+
case GESTURE(UP,LEFT,NONE,NONE):
- if (p_intf->p_sys->p_vout )
+ if( p_sys->p_vout )
{
- ((vout_thread_t *)p_intf->p_sys->p_vout)->i_changes |=
- VOUT_FULLSCREEN_CHANGE;
+ var_Get( p_sys->p_vout, "fullscreen", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_sys->p_vout, "fullscreen", val );
}
break;
+
case GESTURE(DOWN,LEFT,NONE,NONE):
/* FIXME: Should close the vout!"*/
libvlc_Quit( p_intf->p_libvlc );
break;
case GESTURE(DOWN,LEFT,UP,RIGHT):
case GESTURE(UP,RIGHT,DOWN,LEFT):
- msg_Dbg(p_intf, "a square was drawn!" );
+ msg_Dbg( p_intf, "a square was drawn!" );
break;
default:
break;
}
- p_intf->p_sys->i_num_gestures = 0;
- p_intf->p_sys->i_pattern = 0;
- p_intf->p_sys->b_got_gesture = false;
+ p_sys->i_num_gestures = 0;
+ p_sys->i_pattern = 0;
+ p_sys->b_got_gesture = false;
}
/*
* video output
*/
- if( p_intf->p_sys->p_vout && !vlc_object_alive (p_intf->p_sys->p_vout) )
+ if( p_sys->p_vout && !vlc_object_alive( p_sys->p_vout ) )
{
- var_DelCallback( p_intf->p_sys->p_vout, "mouse-moved",
+ var_DelCallback( p_sys->p_vout, "mouse-moved",
MouseEvent, p_intf );
- var_DelCallback( p_intf->p_sys->p_vout, "mouse-button-down",
+ var_DelCallback( p_sys->p_vout, "mouse-button-down",
MouseEvent, p_intf );
- vlc_object_release( p_intf->p_sys->p_vout );
- p_intf->p_sys->p_vout = NULL;
+ vlc_object_release( p_sys->p_vout );
+ p_sys->p_vout = NULL;
}
- if( p_intf->p_sys->p_vout == NULL )
+ if( p_sys->p_vout == NULL )
{
- p_intf->p_sys->p_vout = vlc_object_find( p_intf,
- VLC_OBJECT_VOUT, FIND_ANYWHERE );
- if( p_intf->p_sys->p_vout )
+ p_playlist = pl_Hold( p_intf );
+ p_input = playlist_CurrentInput( p_playlist );
+ pl_Release( p_intf );
+ if( p_input )
{
- var_AddCallback( p_intf->p_sys->p_vout, "mouse-moved",
+ p_sys->p_vout = input_GetVout( p_input );
+ vlc_object_release( p_input );
+ }
+ if( p_sys->p_vout )
+ {
+ var_AddCallback( p_sys->p_vout, "mouse-moved",
MouseEvent, p_intf );
- var_AddCallback( p_intf->p_sys->p_vout, "mouse-button-down",
+ var_AddCallback( p_sys->p_vout, "mouse-button-down",
MouseEvent, p_intf );
}
}
- vlc_mutex_unlock( &p_intf->change_lock );
+ vlc_mutex_unlock( &p_sys->lock );
/* Wait a bit */
msleep( INTF_IDLE_SLEEP );
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
VLC_UNUSED(p_this); VLC_UNUSED(oldval);
- vlc_value_t val;
int pattern = 0;
signed int i_horizontal, i_vertical;
intf_thread_t *p_intf = (intf_thread_t *)p_data;
+ intf_sys_t *p_sys = p_intf->p_sys;
- vlc_mutex_lock( &p_intf->change_lock );
+ vlc_mutex_lock( &p_sys->lock );
/* don't process new gestures before the last events are processed */
- if( p_intf->p_sys->b_got_gesture )
+ if( p_sys->b_got_gesture )
{
- vlc_mutex_unlock( &p_intf->change_lock );
+ vlc_mutex_unlock( &p_sys->lock );
return VLC_SUCCESS;
}
- if( !strcmp(psz_var, "mouse-moved" ) && p_intf->p_sys->b_button_pressed )
+ if( !strcmp( psz_var, "mouse-moved" ) && p_sys->b_button_pressed )
{
- var_Get( p_intf->p_sys->p_vout, "mouse-x", &val );
- p_intf->p_sys->i_mouse_x = val.i_int;
- var_Get( p_intf->p_sys->p_vout, "mouse-y", &val );
- p_intf->p_sys->i_mouse_y = val.i_int;
- i_horizontal = p_intf->p_sys->i_mouse_x -
- p_intf->p_sys->i_last_x;
- i_horizontal = i_horizontal / p_intf->p_sys->i_threshold;
- i_vertical = p_intf->p_sys->i_mouse_y
- - p_intf->p_sys->i_last_y;
- i_vertical = i_vertical / p_intf->p_sys->i_threshold;
+ p_sys->i_mouse_x = var_GetInteger( p_sys->p_vout, "mouse-x" );
+ p_sys->i_mouse_y = var_GetInteger( p_sys->p_vout, "mouse-y" );
+ i_horizontal = p_sys->i_mouse_x - p_sys->i_last_x;
+ i_horizontal = i_horizontal / p_sys->i_threshold;
+ i_vertical = p_sys->i_mouse_y - p_sys->i_last_y;
+ i_vertical = i_vertical / p_sys->i_threshold;
if( i_horizontal < 0 )
{
}
if( pattern )
{
- p_intf->p_sys->i_last_y = p_intf->p_sys->i_mouse_y;
- p_intf->p_sys->i_last_x = p_intf->p_sys->i_mouse_x;
- if( gesture( p_intf->p_sys->i_pattern,
- p_intf->p_sys->i_num_gestures - 1 ) != pattern )
+ p_sys->i_last_y = p_sys->i_mouse_y;
+ p_sys->i_last_x = p_sys->i_mouse_x;
+ if( gesture( p_sys->i_pattern, p_sys->i_num_gestures - 1 )
+ != pattern )
{
- p_intf->p_sys->i_pattern |=
- pattern << ( p_intf->p_sys->i_num_gestures * 4 );
- p_intf->p_sys->i_num_gestures++;
+ p_sys->i_pattern |= pattern << ( p_sys->i_num_gestures * 4 );
+ p_sys->i_num_gestures++;
}
}
}
- if( !strcmp( psz_var, "mouse-button-down" )
- && newval.i_int & p_intf->p_sys->i_button_mask
- && !p_intf->p_sys->b_button_pressed )
- {
- p_intf->p_sys->b_button_pressed = true;
- var_Get( p_intf->p_sys->p_vout, "mouse-x", &val );
- p_intf->p_sys->i_last_x = val.i_int;
- var_Get( p_intf->p_sys->p_vout, "mouse-y", &val );
- p_intf->p_sys->i_last_y = val.i_int;
- }
- if( !strcmp( psz_var, "mouse-button-down" )
- && !( newval.i_int & p_intf->p_sys->i_button_mask )
- && p_intf->p_sys->b_button_pressed )
+ else if( !strcmp( psz_var, "mouse-button-down" ) )
{
- p_intf->p_sys->b_button_pressed = false;
- p_intf->p_sys->b_got_gesture = true;
+ if( (newval.i_int & p_sys->i_button_mask) && !p_sys->b_button_pressed )
+ {
+ p_sys->b_button_pressed = true;
+ p_sys->i_last_x = var_GetInteger( p_sys->p_vout, "mouse-x" );
+ p_sys->i_last_y = var_GetInteger( p_sys->p_vout, "mouse-y" );
+ }
+ else if( !( newval.i_int & p_sys->i_button_mask ) && p_sys->b_button_pressed )
+ {
+ p_sys->b_button_pressed = false;
+ p_sys->b_got_gesture = true;
+ }
}
- vlc_mutex_unlock( &p_intf->change_lock );
+ vlc_mutex_unlock( &p_sys->lock );
return VLC_SUCCESS;
}
projects / vlc / blobdiff