<html><head></head><body><div class="gmail_quote">Le 3 août 2017 16:10:49 GMT+03:00, "Hugo Beauzée-Luyssen" <hugo@beauzee.fr> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">From: Thomas Guillem <thomas@gllm.fr><br /><br />---<br /> modules/control/gestures.c | 144 +++++<hr /><br /> 1 file changed, 16 insertions(+), 128 deletions(-)<br /><br />diff --git a/modules/control/gestures.c b/modules/control/gestures.c<br />index 4fc28910bb..990b237cd3 100644<br />--- a/modules/control/gestures.c<br />+++ b/modules/control/gestures.c<br />@@ -36,6 +36,7 @@<br /> #include <vlc_vout.h><br /> #include <vlc_playlist.h><br /> #include <vlc_input.h><br />+#include <vlc_actions.h><br /> #include <assert.h><br /> <br /> /*****************************************************************************<br />@@ -183,7 +184,6 @@ static void Close ( vlc_object_t *p_this )<br /> static void ProcessGesture( intf_thread_t *p_intf )<br /> {<br /> intf_sys_t *p_sys = p_intf->p_sys;<br />- playlist_t *p_playlist = pl_Get( p_intf );<br /> <br /> /* Do something */<br /> /* If you modify this, please try to follow this convention:<br />@@ -192,170 +192,58 @@ static void ProcessGesture( intf_thread_t *p_intf )<br /> switch( p_sys->i_pattern )<br /> {<br /> case LEFT:<br />- {<br />- msg_Dbg( p_intf, "Go backward in the movie!" );<br />-<br />- input_thread_t *p_input = playlist_CurrentInput( p_playlist );<br />- if( p_input == NULL )<br />- break;<br />-<br />- int it = var_InheritInteger( p_intf , "short-jump-size" );<br />- if( it > 0 )<br />- var_SetInteger( p_input, "time-offset", -CLOCK_FREQ * it );<br />- vlc_object_release( p_input );<br />+ vlc_actions_do( p_intf, ACTIONID_JUMP_FORWARD_SHORT, true );<br /> break;<br />- }<br /> <br /> case RIGHT:<br />- {<br />- msg_Dbg( p_intf, "Go forward in the movie!" );<br />-<br />- input_thread_t *p_input = playlist_CurrentInput( p_playlist );<br />- if( p_input == NULL )<br />- break;<br />-<br />- int it = var_InheritInteger( p_intf , "short-jump-size" );<br />- if( it > 0 )<br />- var_SetInteger( p_input, "time-offset", CLOCK_FREQ * it );<br />- vlc_object_release( p_input );<br />- break;<br />- }<br />+ vlc_actions_do( p_intf, ACTIONID_JUMP_FORWARD_SHORT, true );<br /> <br /> case GESTURE(LEFT,UP,NONE,NONE):<br />- msg_Dbg( p_intf, "Going slower." );<br />- var_TriggerCallback( p_playlist, "rate-slower" );<br />+ vlc_actions_do( p_intf, ACTIONID_SLOWER, true );<br /> break;<br /> <br /> case GESTURE(RIGHT,UP,NONE,NONE):<br />- msg_Dbg( p_intf, "Going faster." );<br />- var_TriggerCallback( p_playlist, "rate-faster" );<br />+ vlc_actions_do( p_intf, ACTIONID_FASTER, true );<br /> break;<br /> <br /> case GESTURE(LEFT,RIGHT,NONE,NONE):<br /> case GESTURE(RIGHT,LEFT,NONE,NONE):<br />- {<br />- msg_Dbg( p_intf, "Play/Pause" );<br />-<br />- input_thread_t *p_input = playlist_CurrentInput( p_playlist );<br />- if( p_input == NULL )<br />- break;<br />-<br />- int i_state = var_GetInteger( p_input, "state" );<br />- i_state = (i_state == PLAYING_S) ? PAUSE_S : PLAYING_S;<br />- var_SetInteger( p_input, "state", i_state );<br />- vlc_object_release( p_input );<br />+ vlc_actions_do( p_intf, ACTIONID_PLAY_PAUSE, true );<br /> break;<br />- }<br /> <br /> case GESTURE(LEFT,DOWN,NONE,NONE):<br />- playlist_Prev( p_playlist );<br />+ vlc_actions_do( p_intf, ACTIONID_PREV, true );<br /> break;<br /> <br /> case GESTURE(RIGHT,DOWN,NONE,NONE):<br />- playlist_Next( p_playlist );<br />+ vlc_actions_do( p_intf, ACTIONID_NEXT, true );<br /> break;<br /> <br /> case UP:<br />- msg_Dbg(p_intf, "Louder");<br />- playlist_VolumeUp( p_playlist, 1, NULL );<br />+ vlc_actions_do( p_intf, ACTIONID_VOL_UP, true );<br /> break;<br /> <br /> case DOWN:<br />- msg_Dbg(p_intf, "Quieter");<br />- playlist_VolumeDown( p_playlist, 1, NULL );<br />+ vlc_actions_do( p_intf, ACTIONID_VOL_DOWN, true );<br /> break;<br /> <br /> case GESTURE(UP,DOWN,NONE,NONE):<br /> case GESTURE(DOWN,UP,NONE,NONE):<br />- msg_Dbg( p_intf, "Mute sound" );<br />- playlist_MuteToggle( p_playlist );<br />+ vlc_actions_do( p_intf, ACTIONID_VOL_MUTE, true );<br /> break;<br /> <br /> case GESTURE(UP,RIGHT,NONE,NONE):<br />- {<br />- input_thread_t *p_input = playlist_CurrentInput( p_playlist );<br />- if( p_input == NULL )<br />- break;<br />-<br />- vlc_value_t list, list2;<br />- var_Change( p_input, "audio-es", VLC_VAR_GETCHOICES,<br />- &list, &list2 );<br />-<br />- if( list.p_list->i_count > 1 )<br />- {<br />- int i_audio_es = var_GetInteger( p_input, "audio-es" );<br />- int i;<br />-<br />- for( i = 0; i < list.p_list->i_count; i++ )<br />- if( i_audio_es == list.p_list->p_values[i].i_int )<br />- break;<br />- /* value of audio-es was not in choices list */<br />- if( i == list.p_list->i_count )<br />- {<br />- msg_Warn( p_input,<br />- "invalid current audio track, selecting 0" );<br />- i = 0;<br />- }<br />- else if( i == list.p_list->i_count - 1 )<br />- i = 1;<br />- else<br />- i++;<br />- var_SetInteger( p_input, "audio-es",<br />- list.p_list->p_values[i].i_int );<br />- }<br />- var_FreeList( &list, &list2 );<br />- vlc_object_release( p_input );<br />+ vlc_actions_do( p_intf, ACTIONID_AUDIO_TRACK, true );<br /> break;<br />- }<br /> <br /> case GESTURE(DOWN,RIGHT,NONE,NONE):<br />- {<br />- input_thread_t *p_input = playlist_CurrentInput( p_playlist );<br />- if( p_input == NULL )<br />- break;<br />-<br />- vlc_value_t list, list2;<br />- var_Change( p_input, "spu-es", VLC_VAR_GETCHOICES,<br />- &list, &list2 );<br />-<br />- if( list.p_list->i_count > 1 )<br />- {<br />- int i_audio_es = var_GetInteger( p_input, "spu-es" );<br />- int i;<br />-<br />- for( i = 0; i < list.p_list->i_count; i++ )<br />- if( i_audio_es == list.p_list->p_values[i].i_int )<br />- break;<br />- /* value of audio-es was not in choices list */<br />- if( i == list.p_list->i_count )<br />- {<br />- msg_Warn( p_input,<br />- "invalid current subtitle track, selecting 0" );<br />- i = 0;<br />- }<br />- else if( i == list.p_list->i_count - 1 )<br />- i = 1;<br />- else<br />- i++;<br />- var_SetInteger( p_input, "audio-es",<br />- list.p_list->p_values[i].i_int );<br />- }<br />- var_FreeList( &list, &list2 );<br />- vlc_object_release( p_input );<br />- break;<br />- }<br />+ vlc_actions_do( p_intf, ACTIONID_SUBTITLE_TRACK, true );<br /> <br /> case GESTURE(UP,LEFT,NONE,NONE):<br />- {<br />- bool val = var_ToggleBool( pl_Get( p_intf ), "fullscreen" );<br />- if( p_sys->p_vout )<br />- var_SetBool( p_sys->p_vout, "fullscreen", val );<br />- break;<br />- }<br />+ vlc_actions_do( p_intf, ACTIONID_TOGGLE_FULLSCREEN, true );<br /> <br /> case GESTURE(DOWN,LEFT,NONE,NONE):<br />- /* FIXME: Should close the vout!"*/<br />- libvlc_Quit( p_intf->obj.libvlc );<br />+ vlc_actions_do( p_intf, ACTIONID_QUIT, true );<br /> break;<br /> <br /> case GESTURE(DOWN,LEFT,UP,RIGHT):<br />@@ -477,7 +365,7 @@ static int InputEvent( vlc_object_t *p_this, char const *psz_var,<br /> /* intf-event is serialized against itself and is the sole user of<br /> * p_sys->p_vout. So there is no need to acquire the lock currently. */<br /> if( p_sys->p_vout != NULL )<br />- { /* /!\ Beware of lock inversion with var_DelCallback() /!\ */<br />+ { /* /!\ Beware of lock inversion with var_DelCallback() /!\ */<br /> var_DelCallback( p_sys->p_vout, "mouse-moved", MovedEvent,<br /> p_intf );<br /> var_DelCallback( p_sys->p_vout, "mouse-button-down", ButtonEvent,</pre></blockquote></div><br clear="all">Same as 15<br>
-- <br>
Rémi Denis-Courmont<br>
Typed on an inconvenient virtual keyboard</body></html>