/*****************************************************************************
* gestures.c: control vlc with mouse gestures
*****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
+ * Copyright (C) 2004-2009 the VideoLAN team
* $Id$
*
* Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_vout.h>
-#include <vlc_aout.h>
#include <vlc_playlist.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <vlc_input.h>
+#include <assert.h>
/*****************************************************************************
* intf_sys_t: description and status of interface
*****************************************************************************/
struct intf_sys_t
{
- vlc_object_t * p_vout;
- bool b_got_gesture;
- bool b_button_pressed;
- int i_mouse_x, i_mouse_y;
+ vlc_mutex_t lock;
+ input_thread_t *p_input;
+ vout_thread_t *p_vout;
+ bool b_button_pressed;
int i_last_x, i_last_y;
unsigned int i_pattern;
- int i_num_gestures;
+ unsigned int i_num_gestures;
int i_threshold;
int i_button_mask;
};
#define NONE 0
#define GESTURE( a, b, c, d ) (a | ( b << 4 ) | ( c << 8 ) | ( d << 12 ))
-int Open ( vlc_object_t * );
-void Close ( vlc_object_t * );
-static int InitThread ( intf_thread_t *p_intf );
-static void EndThread ( intf_thread_t *p_intf );
-static int MouseEvent ( vlc_object_t *, char const *,
- vlc_value_t, vlc_value_t, void * );
-
-/* Exported functions */
-static void RunIntf ( intf_thread_t *p_intf );
+static int Open ( vlc_object_t * );
+static void Close ( vlc_object_t * );
/*****************************************************************************
* Module descriptor
#define BUTTON_LONGTEXT N_( \
"Trigger button for mouse gestures." )
-static const char *button_list[] = { "left", "middle", "right" };
-static const char *button_list_text[] =
+#define BUTTON_DEFAULT "left"
+
+static const char *const button_list[] = { "left", "middle", "right" };
+static const char *const button_list_text[] =
{ N_("Left"), N_("Middle"), N_("Right") };
-vlc_module_begin();
- set_shortname( N_("Gestures"));
- set_category( CAT_INTERFACE );
- set_subcategory( SUBCAT_INTERFACE_CONTROL );
- add_integer( "gestures-threshold", 30, NULL,
- THRESHOLD_TEXT, THRESHOLD_LONGTEXT, true );
- add_string( "gestures-button", "right", NULL,
- BUTTON_TEXT, BUTTON_LONGTEXT, false );
- change_string_list( button_list, button_list_text, 0 );
- set_description( N_("Mouse gestures control interface") );
-
- set_capability( "interface", 0 );
- set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+ set_shortname( N_("Gestures"))
+ set_category( CAT_INTERFACE )
+ set_subcategory( SUBCAT_INTERFACE_CONTROL )
+ add_integer( "gestures-threshold", 30,
+ THRESHOLD_TEXT, THRESHOLD_LONGTEXT, true )
+ add_string( "gestures-button", BUTTON_DEFAULT,
+ BUTTON_TEXT, BUTTON_LONGTEXT, false )
+ change_string_list( button_list, button_list_text )
+ set_description( N_("Mouse gestures control interface") )
+
+ set_capability( "interface", 0 )
+ set_callbacks( Open, Close )
+vlc_module_end ()
+
+static int PlaylistEvent( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+static int InputEvent( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+static int MovedEvent( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+static int ButtonEvent( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
/*****************************************************************************
* OpenIntf: initialize interface
*****************************************************************************/
-int Open ( vlc_object_t *p_this )
+static int Open ( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
/* Allocate instance and initialize some members */
- p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
- if( p_intf->p_sys == NULL )
- {
- return( 1 );
- };
+ intf_sys_t *p_sys = p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
+ if( unlikely(p_sys == NULL) )
+ return VLC_ENOMEM;
+
+ // Configure the module
+ vlc_mutex_init( &p_sys->lock );
+ p_sys->p_input = NULL;
+ p_sys->p_vout = NULL;
+ p_sys->b_button_pressed = false;
+ p_sys->i_threshold = var_InheritInteger( p_intf, "gestures-threshold" );
+
+ // Choose the tight button to use
+ char *psz_button = var_InheritString( p_intf, "gestures-button" );
+ if( psz_button && !strcmp( psz_button, "left" ) )
+ p_sys->i_button_mask = 1;
+ else if( psz_button && !strcmp( psz_button, "middle" ) )
+ p_sys->i_button_mask = 2;
+ else // psz_button == "right"
+ p_sys->i_button_mask = 4;
+ free( psz_button );
+
+ p_sys->i_pattern = 0;
+ p_sys->i_num_gestures = 0;
+
+ var_AddCallback( pl_Get(p_intf), "input-current", PlaylistEvent, p_intf );
- p_intf->pf_run = RunIntf;
-
- return( 0 );
+ return VLC_SUCCESS;
}
/*****************************************************************************
* gesture: return a subpattern within a pattern
*****************************************************************************/
-static int gesture( int i_pattern, int i_num )
+static inline unsigned gesture( unsigned i_pattern, unsigned i_num )
{
return ( i_pattern >> ( i_num * 4 ) ) & 0xF;
}
-/*****************************************************************************
- * input_from_playlist: don't forget to release the return value
- * Also this function should really be available from core.
- *****************************************************************************/
-static input_thread_t * input_from_playlist ( playlist_t *p_playlist )
-{
- input_thread_t * p_input;
-
- PL_LOCK;
- p_input = p_playlist->p_input;
- if( p_input )
- vlc_object_yield( p_input );
- PL_UNLOCK;
-
- return p_input;
-}
-
/*****************************************************************************
* CloseIntf: destroy dummy interface
*****************************************************************************/
-void Close ( vlc_object_t *p_this )
+static void Close ( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
+ intf_sys_t *p_sys = p_intf->p_sys;
- /* Destroy structure */
- free( p_intf->p_sys );
-}
-
-
-/*****************************************************************************
- * RunIntf: main loop
- *****************************************************************************/
-static void RunIntf( intf_thread_t *p_intf )
-{
- playlist_t * p_playlist = NULL;
+ /* Destroy the callbacks (the order matters!) */
+ var_DelCallback( pl_Get(p_intf), "input-current", PlaylistEvent, p_intf );
- vlc_mutex_lock( &p_intf->change_lock );
- p_intf->p_sys->p_vout = NULL;
- vlc_mutex_unlock( &p_intf->change_lock );
+ if( p_sys->p_input != NULL )
+ var_DelCallback( p_sys->p_input, "intf-event", InputEvent, p_intf );
- if( InitThread( p_intf ) < 0 )
+ if( p_sys->p_vout )
{
- msg_Err( p_intf, "can't initialize interface thread" );
- return;
+ var_DelCallback( p_sys->p_vout, "mouse-moved", MovedEvent, p_intf );
+ var_DelCallback( p_sys->p_vout, "mouse-button-down",
+ ButtonEvent, p_intf );
+ vlc_object_release( p_sys->p_vout );
}
- msg_Dbg( p_intf, "interface thread initialized" );
- /* Main loop */
- while( !intf_ShouldDie( p_intf ) )
- {
- vlc_mutex_lock( &p_intf->change_lock );
+ /* Destroy structure */
+ vlc_mutex_destroy( &p_sys->lock );
+ free( p_sys );
+}
- /*
- * mouse cursor
- */
- if( p_intf->p_sys->b_got_gesture )
+static void ProcessGesture( intf_thread_t *p_intf )
+{
+ intf_sys_t *p_sys = p_intf->p_sys;
+ playlist_t *p_playlist = pl_Get( p_intf );
+
+ /* 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_sys->i_pattern )
+ {
+ case LEFT:
{
- vlc_value_t val;
- int i_interval = 0;
- /* 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 )
- {
- 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):
- {
- input_thread_t * p_input;
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( !p_playlist )
- break;
-
- p_input = input_from_playlist( p_playlist );
- vlc_object_release( p_playlist );
-
- if( !p_input )
- break;
-
- 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");
- vlc_object_release( p_input );
- }
- break;
- case GESTURE(LEFT,DOWN,NONE,NONE):
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist == NULL )
- {
- break;
- }
+ msg_Dbg( p_intf, "Go backward in the movie!" );
- playlist_Prev( p_playlist );
- vlc_object_release( p_playlist );
+ input_thread_t *p_input = playlist_CurrentInput( p_playlist );
+ if( p_input == NULL )
break;
- case GESTURE(RIGHT,DOWN,NONE,NONE):
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist == NULL )
- {
- break;
- }
- playlist_Next( p_playlist );
- vlc_object_release( p_playlist );
- 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):
- {
- input_thread_t * p_input;
- vlc_value_t val, list, list2;
- int i_count, i;
-
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( !p_playlist )
- break;
-
- p_input = input_from_playlist( p_playlist );
-
- vlc_object_release( p_playlist );
-
- if( !p_input )
- break;
-
- 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 )
- {
- vlc_object_release( p_input );
- break;
- }
- 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 );
- }
- break;
- case GESTURE(DOWN,RIGHT,NONE,NONE):
- {
- input_thread_t * p_input;
- vlc_value_t val, list, list2;
- int i_count, i;
-
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( !p_playlist )
- break;
-
- p_input = input_from_playlist( p_playlist );
- vlc_object_release( p_playlist );
-
- if( !p_input )
- break;
-
- 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 )
- {
- vlc_object_release( p_input );
- break;
- }
- 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;
- }
- vlc_object_release( p_input );
- }
- break;
- case GESTURE(UP,LEFT,NONE,NONE):
- if (p_intf->p_sys->p_vout )
- {
- ((vout_thread_t *)p_intf->p_sys->p_vout)->i_changes |=
- VOUT_FULLSCREEN_CHANGE;
- }
- break;
- case GESTURE(DOWN,LEFT,NONE,NONE):
- /* FIXME: Should close the vout!"*/
- vlc_object_kill( 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!" );
- 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;
+ int it = var_InheritInteger( p_intf , "short-jump-size" );
+ if( it > 0 )
+ var_SetTime( p_input, "time-offset", -CLOCK_FREQ * it );
+ vlc_object_release( p_input );
+ break;
}
- /*
- * video output
- */
- if( p_intf->p_sys->p_vout && p_intf->p_sys->p_vout->b_die )
+ case RIGHT:
{
- var_DelCallback( p_intf->p_sys->p_vout, "mouse-moved",
- MouseEvent, p_intf );
- var_DelCallback( p_intf->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;
+ msg_Dbg( p_intf, "Go forward in the movie!" );
+
+ input_thread_t *p_input = playlist_CurrentInput( p_playlist );
+ if( p_input == NULL )
+ break;
+
+ int it = var_InheritInteger( p_intf , "short-jump-size" );
+ if( it > 0 )
+ var_SetTime( p_input, "time-offset", CLOCK_FREQ * it );
+ vlc_object_release( p_input );
+ break;
}
- if( p_intf->p_sys->p_vout == NULL )
+ case GESTURE(LEFT,UP,NONE,NONE):
+ msg_Dbg( p_intf, "Going slower." );
+ var_TriggerCallback( p_playlist, "rate-slower" );
+ break;
+
+ case GESTURE(RIGHT,UP,NONE,NONE):
+ msg_Dbg( p_intf, "Going faster." );
+ var_TriggerCallback( p_playlist, "rate-faster" );
+ break;
+
+ case GESTURE(LEFT,RIGHT,NONE,NONE):
+ case GESTURE(RIGHT,LEFT,NONE,NONE):
{
- p_intf->p_sys->p_vout = vlc_object_find( p_intf,
- VLC_OBJECT_VOUT, FIND_ANYWHERE );
- if( p_intf->p_sys->p_vout )
- {
- var_AddCallback( p_intf->p_sys->p_vout, "mouse-moved",
- MouseEvent, p_intf );
- var_AddCallback( p_intf->p_sys->p_vout, "mouse-button-down",
- MouseEvent, p_intf );
- }
+ msg_Dbg( p_intf, "Play/Pause" );
+
+ input_thread_t *p_input = playlist_CurrentInput( p_playlist );
+ if( p_input == NULL )
+ break;
+
+ int i_state = var_GetInteger( p_input, "state" );
+ i_state = (i_state == PLAYING_S) ? PAUSE_S : PLAYING_S;
+ var_SetInteger( p_input, "state", i_state );
+ vlc_object_release( p_input );
+ break;
}
- vlc_mutex_unlock( &p_intf->change_lock );
+ case GESTURE(LEFT,DOWN,NONE,NONE):
+ playlist_Prev( p_playlist );
+ break;
- /* Wait a bit */
- msleep( INTF_IDLE_SLEEP );
- }
+ case GESTURE(RIGHT,DOWN,NONE,NONE):
+ playlist_Next( p_playlist );
+ break;
- EndThread( p_intf );
-}
+ case UP:
+ msg_Dbg(p_intf, "Louder");
+ playlist_VolumeUp( p_playlist, 1, NULL );
+ break;
-/*****************************************************************************
- * InitThread:
- *****************************************************************************/
-static int InitThread( intf_thread_t * p_intf )
-{
- char *psz_button;
- /* we might need some locking here */
- if( !intf_ShouldDie( p_intf ) )
- {
- /* p_intf->change_lock locking strategy:
- * - Every access to p_intf->p_sys are locked threw p_intf->change_lock
- * - make sure there won't be cross increment/decrement ref count
- * of p_intf->p_sys members p_intf->change_lock should be locked
- * during those operations */
- vlc_mutex_lock( &p_intf->change_lock );
-
- p_intf->p_sys->b_got_gesture = false;
- p_intf->p_sys->b_button_pressed = false;
- p_intf->p_sys->i_threshold =
- config_GetInt( p_intf, "gestures-threshold" );
- psz_button = config_GetPsz( p_intf, "gestures-button" );
- if ( !strcmp( psz_button, "left" ) )
+ case DOWN:
+ msg_Dbg(p_intf, "Quieter");
+ playlist_VolumeDown( p_playlist, 1, NULL );
+ break;
+
+ case GESTURE(UP,DOWN,NONE,NONE):
+ case GESTURE(DOWN,UP,NONE,NONE):
+ msg_Dbg( p_intf, "Mute sound" );
+ playlist_MuteToggle( p_playlist );
+ break;
+
+ case GESTURE(UP,RIGHT,NONE,NONE):
{
- p_intf->p_sys->i_button_mask = 1;
+ input_thread_t *p_input = playlist_CurrentInput( p_playlist );
+ if( p_input == NULL )
+ break;
+
+ vlc_value_t list, list2;
+ var_Change( p_input, "audio-es", VLC_VAR_GETCHOICES,
+ &list, &list2 );
+
+ if( list.p_list->i_count > 1 )
+ {
+ int i_audio_es = var_GetInteger( p_input, "audio-es" );
+ int i;
+
+ for( i = 0; i < list.p_list->i_count; i++ )
+ if( i_audio_es == list.p_list->p_values[i].i_int )
+ break;
+ /* value of audio-es was not in choices list */
+ if( i == list.p_list->i_count )
+ {
+ msg_Warn( p_input,
+ "invalid current audio track, selecting 0" );
+ i = 0;
+ }
+ else if( i == list.p_list->i_count - 1 )
+ i = 1;
+ else
+ i++;
+ var_SetInteger( p_input, "audio-es",
+ list.p_list->p_values[i].i_int );
+ }
+ var_FreeList( &list, &list2 );
+ vlc_object_release( p_input );
+ break;
}
- else if ( !strcmp( psz_button, "middle" ) )
+
+ case GESTURE(DOWN,RIGHT,NONE,NONE):
{
- p_intf->p_sys->i_button_mask = 2;
+ input_thread_t *p_input = playlist_CurrentInput( p_playlist );
+ if( p_input == NULL )
+ break;
+
+ vlc_value_t list, list2;
+ var_Change( p_input, "spu-es", VLC_VAR_GETCHOICES,
+ &list, &list2 );
+
+ if( list.p_list->i_count > 1 )
+ {
+ int i_audio_es = var_GetInteger( p_input, "spu-es" );
+ int i;
+
+ for( i = 0; i < list.p_list->i_count; i++ )
+ if( i_audio_es == list.p_list->p_values[i].i_int )
+ break;
+ /* value of audio-es was not in choices list */
+ if( i == list.p_list->i_count )
+ {
+ msg_Warn( p_input,
+ "invalid current subtitle track, selecting 0" );
+ i = 0;
+ }
+ else if( i == list.p_list->i_count - 1 )
+ i = 1;
+ else
+ i++;
+ var_SetInteger( p_input, "audio-es",
+ list.p_list->p_values[i].i_int );
+ }
+ var_FreeList( &list, &list2 );
+ vlc_object_release( p_input );
+ break;
}
- else if ( !strcmp( psz_button, "right" ) )
+
+ case GESTURE(UP,LEFT,NONE,NONE):
{
- p_intf->p_sys->i_button_mask = 4;
+ bool val = var_ToggleBool( pl_Get( p_intf ), "fullscreen" );
+ if( p_sys->p_vout )
+ var_SetBool( p_sys->p_vout, "fullscreen", val );
+ break;
}
- p_intf->p_sys->i_pattern = 0;
- p_intf->p_sys->i_num_gestures = 0;
- vlc_mutex_unlock( &p_intf->change_lock );
+ case GESTURE(DOWN,LEFT,NONE,NONE):
+ /* FIXME: Should close the vout!"*/
+ libvlc_Quit( p_intf->p_libvlc );
+ break;
- return 0;
- }
- else
- {
- return -1;
+ case GESTURE(DOWN,LEFT,UP,RIGHT):
+ case GESTURE(UP,RIGHT,DOWN,LEFT):
+ msg_Dbg( p_intf, "a square was drawn!" );
+ break;
}
-}
-/*****************************************************************************
- * EndThread:
- *****************************************************************************/
-static void EndThread( intf_thread_t * p_intf )
-{
- vlc_mutex_lock( &p_intf->change_lock );
-
- if( p_intf->p_sys->p_vout )
- {
- var_DelCallback( p_intf->p_sys->p_vout, "mouse-moved",
- MouseEvent, p_intf );
- var_DelCallback( p_intf->p_sys->p_vout, "mouse-button-down",
- MouseEvent, p_intf );
- vlc_object_release( p_intf->p_sys->p_vout );
- }
-
- vlc_mutex_unlock( &p_intf->change_lock );
+ p_sys->i_num_gestures = 0;
+ p_sys->i_pattern = 0;
}
-/*****************************************************************************
- * MouseEvent: callback for mouse events
- *****************************************************************************/
-static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
+static int MovedEvent( vlc_object_t *p_this, char const *psz_var,
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 );
+ (void) p_this; (void) psz_var; (void) oldval;
- /* don't process new gestures before the last events are processed */
- if( p_intf->p_sys->b_got_gesture )
+ vlc_mutex_lock( &p_sys->lock );
+ if( p_sys->b_button_pressed )
{
- vlc_mutex_unlock( &p_intf->change_lock );
- return VLC_SUCCESS;
- }
+ int i_horizontal = newval.coords.x - p_sys->i_last_x;
+ int i_vertical = newval.coords.y - p_sys->i_last_y;
+ unsigned int pattern = 0;
- if( !strcmp(psz_var, "mouse-moved" ) && p_intf->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;
+ i_horizontal /= p_sys->i_threshold;
+ i_vertical /= p_sys->i_threshold;
if( i_horizontal < 0 )
{
msg_Dbg( p_intf, "down gesture (%d)", i_vertical );
pattern = DOWN;
}
+
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_x = newval.coords.x;
+ p_sys->i_last_y = newval.coords.y;
+ if( p_sys->i_num_gestures > 0
+ && gesture( p_sys->i_pattern, p_sys->i_num_gestures - 1 )
+ != pattern )
+ {
+ p_sys->i_pattern |= pattern << ( p_sys->i_num_gestures * 4 );
+ p_sys->i_num_gestures++;
+ }
+ else if( p_sys->i_num_gestures == 0 )
{
- 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++;
}
}
}
- if( !strcmp( psz_var, "mouse-button-down" )
- && newval.i_int & p_intf->p_sys->i_button_mask
- && !p_intf->p_sys->b_button_pressed )
+ vlc_mutex_unlock( &p_sys->lock );
+
+ return VLC_SUCCESS;
+}
+
+static int ButtonEvent( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t val, void *p_data )
+{
+ intf_thread_t *p_intf = p_data;
+ intf_sys_t *p_sys = p_intf->p_sys;
+
+ (void) psz_var; (void) oldval;
+
+ vlc_mutex_lock( &p_sys->lock );
+ if( val.i_int & p_sys->i_button_mask )
{
- 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( !p_sys->b_button_pressed )
+ {
+ p_sys->b_button_pressed = true;
+ var_GetCoords( p_this, "mouse-moved",
+ &p_sys->i_last_x, &p_sys->i_last_y );
+ }
}
- 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
{
- p_intf->p_sys->b_button_pressed = false;
- p_intf->p_sys->b_got_gesture = true;
+ if( p_sys->b_button_pressed )
+ {
+ p_sys->b_button_pressed = false;
+ ProcessGesture( p_intf );
+ }
}
+ vlc_mutex_unlock( &p_sys->lock );
+
+ return VLC_SUCCESS;
+}
+
+static int InputEvent( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t val, void *p_data )
+{
+ input_thread_t *p_input = (input_thread_t *)p_this;
+ intf_thread_t *p_intf = p_data;
+ intf_sys_t *p_sys = p_intf->p_sys;
+
+ (void) psz_var; (void) oldval;
+
+ switch( val.i_int )
+ {
+ case INPUT_EVENT_VOUT:
+ /* intf-event is serialized against itself and is the sole user of
+ * p_sys->p_vout. So there is no need to acquire the lock currently. */
+ if( p_sys->p_vout != NULL )
+ { /* /!\ Beware of lock inversion with var_DelCallback() /!\ */
+ var_DelCallback( p_sys->p_vout, "mouse-moved", MovedEvent,
+ p_intf );
+ var_DelCallback( p_sys->p_vout, "mouse-button-down", ButtonEvent,
+ p_intf );
+ vlc_object_release( p_sys->p_vout );
+ }
+
+ p_sys->p_vout = input_GetVout( p_input );
+ if( p_sys->p_vout != NULL )
+ {
+ var_AddCallback( p_sys->p_vout, "mouse-moved", MovedEvent,
+ p_intf );
+ var_AddCallback( p_sys->p_vout, "mouse-button-down", ButtonEvent,
+ p_intf );
+ }
+ break;
+ }
+ return VLC_SUCCESS;
+}
+
+static int PlaylistEvent( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t val, void *p_data )
+{
+ intf_thread_t *p_intf = p_data;
+ intf_sys_t *p_sys = p_intf->p_sys;
+ input_thread_t *p_input = val.p_address;
+
+ (void) p_this; (void) psz_var;
+
+ if( p_sys->p_input != NULL )
+ {
+ assert( p_sys->p_input == oldval.p_address );
+ var_DelCallback( p_sys->p_input, "intf-event", InputEvent, p_intf );
+ }
+
+ p_sys->p_input = p_input;
- vlc_mutex_unlock( &p_intf->change_lock );
+ if( p_input != NULL )
+ var_AddCallback( p_input, "intf-event", InputEvent, p_intf );
return VLC_SUCCESS;
}
projects / vlc / blobdiff