Skip to content

V
vlc
Commit 619f831b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

New gestures actions.

parent 02334891
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 3 deletions
modules/control/gestures.c
View file @ 619f831b
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc_interface.h> #include <vlc_interface.h>
#include <vlc_vout.h> #include <vlc_vout.h>
#include <vlc_aout.h>
#include <vlc_playlist.h> #include <vlc_playlist.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
...@@ -148,11 +149,13 @@ void E_(Close) ( vlc_object_t *p_this ) ...@@ -148,11 +149,13 @@ void E_(Close) ( vlc_object_t *p_this )
static void RunIntf( intf_thread_t *p_intf ) static void RunIntf( intf_thread_t *p_intf )
{ {
playlist_t * p_playlist = NULL; playlist_t * p_playlist = NULL;
vlc_mutex_lock( &p_intf->change_lock ); vlc_mutex_lock( &p_intf->change_lock );
p_intf->p_sys->p_vout = NULL; p_intf->p_sys->p_vout = NULL;
vlc_mutex_unlock( &p_intf->change_lock ); vlc_mutex_unlock( &p_intf->change_lock );
input_thread_t * p_input = p_intf->p_sys->p_input;
if( InitThread( p_intf ) < 0 ) if( InitThread( p_intf ) < 0 )
{ {
msg_Err( p_intf, "can't initialize interface thread" ); msg_Err( p_intf, "can't initialize interface thread" );
...@@ -170,10 +173,57 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -170,10 +173,57 @@ static void RunIntf( intf_thread_t *p_intf )
*/ */
if( p_intf->p_sys->b_got_gesture ) if( p_intf->p_sys->b_got_gesture )
{ {
vlc_value_t val;
int i_interval = 0;
/* Do something */ /* Do something */
/* 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_intf->p_sys->i_pattern )
{ {
case LEFT: case LEFT:
i_interval = config_GetInt( p_intf , "short-jump-size" );
if ( i_interval > 0 ) {
val.i_time = ( (mtime_t)( -i_interval ) * 1000000L);
var_Set( p_intf, "time-offset", val );
}
msg_Dbg(p_intf, "Go backward in the movie!");
break;
case RIGHT:
i_interval = config_GetInt( p_intf , "short-jump-size" );
if ( i_interval > 0 ) {
val.i_time = ( (mtime_t)( i_interval ) * 1000000L);
var_Set( p_intf, "time-offset", val );
}
msg_Dbg(p_intf, "Go forward in the movie!");
break;
case GESTURE(LEFT,UP,NONE,NONE):
/*FIXME BF*/
msg_Dbg(p_intf, "Going slower.");
break;
case GESTURE(RIGHT,UP,NONE,NONE):
/*FIXME FF*/
msg_Dbg(p_intf, "Going faster.");
break;
case GESTURE(LEFT,RIGHT,NONE,NONE):
case GESTURE(RIGHT,LEFT,NONE,NONE):
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");
break;
case GESTURE(LEFT,DOWN,NONE,NONE):
p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE ); FIND_ANYWHERE );
if( p_playlist == NULL ) if( p_playlist == NULL )
...@@ -184,7 +234,7 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -184,7 +234,7 @@ static void RunIntf( intf_thread_t *p_intf )
playlist_Prev( p_playlist ); playlist_Prev( p_playlist );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
break; break;
case RIGHT: case GESTURE(RIGHT,DOWN,NONE,NONE):
p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE ); FIND_ANYWHERE );
if( p_playlist == NULL ) if( p_playlist == NULL )
...@@ -195,18 +245,124 @@ static void RunIntf( intf_thread_t *p_intf ) ...@@ -195,18 +245,124 @@ static void RunIntf( intf_thread_t *p_intf )
playlist_Next( p_playlist ); playlist_Next( p_playlist );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
break; break;
case UP:
{
audio_volume_t i_newvol;
aout_VolumeUp( p_intf, 1, &i_newvol );
msg_Dbg(p_intf, "Louder");
}
break;
case DOWN:
{
audio_volume_t i_newvol;
aout_VolumeDown( p_intf, 1, &i_newvol );
msg_Dbg(p_intf, "Quieter");
}
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");
}
break;
case GESTURE(UP,RIGHT,NONE,NONE): case GESTURE(UP,RIGHT,NONE,NONE):
{
vlc_value_t val, list, list2;
int i_count, i;
var_Get( p_input, "audio-es", &val );
var_Change( p_input, "audio-es", VLC_VAR_GETCHOICES,
&list, &list2 );
i_count = list.p_list->i_count;
if( i_count <= 1 )
{
continue;
}
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++;
}
}
break;
case GESTURE(DOWN,RIGHT,NONE,NONE):
{
vlc_value_t val, list, list2;
int i_count, i;
var_Get( p_input, "spu-es", &val );
var_Change( p_input, "spu-es", VLC_VAR_GETCHOICES,
&list, &list2 );
i_count = list.p_list->i_count;
if( i_count <= 1 )
{
continue;
}
for( i = 0; i < i_count; i++ )
{
if( val.i_int == list.p_list->p_values[i].i_int )
{
break;
}
}
/* value of spu-es was not in choices list */
if( i == i_count )
{
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;
}
}
break;
case GESTURE(UP,LEFT,NONE,NONE):
if (p_intf->p_sys->p_vout ) if (p_intf->p_sys->p_vout )
{ {
((vout_thread_t *)p_intf->p_sys->p_vout)->i_changes |= ((vout_thread_t *)p_intf->p_sys->p_vout)->i_changes |=
VOUT_FULLSCREEN_CHANGE; VOUT_FULLSCREEN_CHANGE;
} }
break; break;
case GESTURE(DOWN,RIGHT,NONE,NONE): case GESTURE(DOWN,LEFT,NONE,NONE):
/* FIXME: Should close the vout!"*/ /* FIXME: Should close the vout!"*/
p_intf->p_libvlc->b_die = VLC_TRUE; p_intf->p_libvlc->b_die = VLC_TRUE;
break; break;
case GESTURE(DOWN,LEFT,UP,RIGHT): 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; break;
default: default:
......
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