X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Fhotkeys.c;h=f79b0ea2c83f9d8ec2613b8c0bc55ddcdeefd8ca;hb=04804702d97e0667fdf05ed3ceeae6759fe732d4;hp=83428d09ae3b9d04096cfa8ec8c02ffe4939c09c;hpb=015ae8d010ef34de4876b17d0eb323534f1510be;p=vlc diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index 83428d09ae..f79b0ea2c8 100644 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -30,7 +30,8 @@ # include "config.h" #endif -#include +#include +#include #include #include #include @@ -51,12 +52,8 @@ *****************************************************************************/ struct intf_sys_t { - vlc_mutex_t change_lock; /* mutex to keep the callback - * and the main loop from - * stepping on each others - * toes */ - int p_keys[ BUFFER_SIZE ]; /* buffer that contains - * keyevents */ + int p_actions[ BUFFER_SIZE ]; /* buffer that contains + * action events */ int i_size; /* number of events in buffer */ int p_channels[ CHANNELS_NUMBER ]; /* contains registered * channel IDs */ @@ -70,11 +67,11 @@ struct intf_sys_t static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); static void Run ( intf_thread_t * ); -static int GetKey ( intf_thread_t *); -static int KeyEvent( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); -static int ActionKeyCB( vlc_object_t *, char const *, +static int GetAction( intf_thread_t *); +static int ActionEvent( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); +static int SpecialKeyEvent( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); static void PlayBookmark( intf_thread_t *, int ); static void SetBookmark ( intf_thread_t *, int ); static void DisplayPosition( intf_thread_t *, vout_thread_t *, input_thread_t * ); @@ -97,8 +94,8 @@ static void ClearChannels ( intf_thread_t *, vout_thread_t * ); #define BOOKMARK_LONGTEXT N_("Define playlist bookmarks.") vlc_module_begin(); - set_shortname( _("Hotkeys") ); - set_description( _("Hotkeys management interface") ); + set_shortname( N_("Hotkeys") ); + set_description( N_("Hotkeys management interface") ); set_capability( "interface", 0 ); set_callbacks( Open, Close ); vlc_module_end(); @@ -111,11 +108,11 @@ static int Open( vlc_object_t *p_this ) intf_thread_t *p_intf = (intf_thread_t *)p_this; MALLOC_ERR( p_intf->p_sys, intf_sys_t ); - vlc_mutex_init( p_intf, &p_intf->p_sys->change_lock ); p_intf->p_sys->i_size = 0; p_intf->pf_run = Run; - var_AddCallback( p_intf->p_libvlc, "key-pressed", KeyEvent, p_intf ); + var_AddCallback( p_intf->p_libvlc, "key-pressed", SpecialKeyEvent, p_intf ); + var_AddCallback( p_intf->p_libvlc, "key-action", ActionEvent, p_intf ); return VLC_SUCCESS; } @@ -126,9 +123,9 @@ static void Close( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; - var_DelCallback( p_intf->p_libvlc, "key-pressed", KeyEvent, p_intf ); + var_DelCallback( p_intf->p_libvlc, "key-action", ActionEvent, p_intf ); + var_DelCallback( p_intf->p_libvlc, "key-pressed", SpecialKeyEvent, p_intf ); - vlc_mutex_destroy( &p_intf->p_sys->change_lock ); /* Destroy structure */ free( p_intf->p_sys ); } @@ -138,80 +135,27 @@ static void Close( vlc_object_t *p_this ) *****************************************************************************/ static void Run( intf_thread_t *p_intf ) { - input_thread_t *p_input = NULL; vout_thread_t *p_vout = NULL; - vout_thread_t *p_last_vout = NULL; - struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys; vlc_value_t val; int i; playlist_t *p_playlist = pl_Yield( p_intf ); /* Initialize hotkey structure */ - for( i = 0; p_hotkeys[i].psz_action != NULL; i++ ) + for( struct hotkey *p_hotkey = p_intf->p_libvlc->p_hotkeys; + p_hotkey->psz_action != NULL; + p_hotkey++ ) { - var_Create( p_intf->p_libvlc, p_hotkeys[i].psz_action, - VLC_VAR_HOTKEY | VLC_VAR_DOINHERIT ); - - var_AddCallback( p_intf->p_libvlc, p_hotkeys[i].psz_action, - ActionKeyCB, NULL ); - var_Get( p_intf->p_libvlc, p_hotkeys[i].psz_action, &val ); - var_Set( p_intf->p_libvlc, p_hotkeys[i].psz_action, val ); + p_hotkey->i_key = config_GetInt( p_intf, p_hotkey->psz_action ); } - for( vlc_bool_t b_quit = VLC_FALSE ; !b_quit; ) + for( ;; ) { - int i_key, i_action; - int i_times = 0; - - /* Sleep a bit */ - /* msleep( INTF_IDLE_SLEEP ); */ - - i_action = 0; - i_key = GetKey( p_intf ); + input_thread_t *p_input; + vout_thread_t *p_last_vout; + int i_action = GetAction( p_intf ); - /* Special action for mouse event */ - /* FIXME: This should probably be configurable */ - /* FIXME: rework hotkeys handling to allow more than 1 event - * to trigger one same action */ - switch (i_key & KEY_SPECIAL) - { - case KEY_MOUSEWHEELUP: - i_action = ACTIONID_VOL_UP; - break; - case KEY_MOUSEWHEELDOWN: - i_action = ACTIONID_VOL_DOWN; - break; - case KEY_MOUSEWHEELLEFT: - i_action = ACTIONID_JUMP_BACKWARD_EXTRASHORT; - break; - case KEY_MOUSEWHEELRIGHT: - i_action = ACTIONID_JUMP_FORWARD_EXTRASHORT; - break; - default: break; - } - - /* No mouse action, find action triggered by hotkey */ - if(!i_action) - { - for( i = 0; i_key != -1 && p_hotkeys[i].psz_action != NULL; i++ ) - { - if( p_hotkeys[i].i_key == i_key ) - { - i_action = p_hotkeys[i].i_action; - i_times = p_hotkeys[i].i_times; - /* times key pressed within max. delta time */ - p_hotkeys[i].i_times = 0; - break; - } - } - } - - if( !i_action ) - { - b_quit = vlc_object_lock_and_wait( p_intf ); - /* No key pressed, sleep a bit more */ - continue; - } + if( i_action == -1 ) + break; /* die */ /* Update the input */ PL_LOCK; @@ -234,6 +178,7 @@ static void Run( intf_thread_t *p_intf ) } } + /* Quit */ if( i_action == ACTIONID_QUIT ) { if( p_playlist ) @@ -248,6 +193,7 @@ static void Run( intf_thread_t *p_intf ) vlc_object_release( p_input ); continue; } + /* Volume and audio actions */ else if( i_action == ACTIONID_VOL_UP ) { audio_volume_t i_newvol; @@ -278,10 +224,12 @@ static void Run( intf_thread_t *p_intf ) } } } + /* Interface showing */ else if( i_action == ACTIONID_INTF_SHOW ) - var_SetBool( p_playlist, "intf-show", VLC_TRUE ); + var_SetBool( p_intf->p_libvlc, "intf-show", true ); else if( i_action == ACTIONID_INTF_HIDE ) - var_SetBool( p_playlist, "intf-show", VLC_FALSE ); + var_SetBool( p_intf->p_libvlc, "intf-show", false ); + /* Video Output actions */ else if( i_action == ACTIONID_SNAPSHOT ) { if( p_vout ) vout_Control( p_vout, VOUT_SNAPSHOT ); @@ -305,7 +253,25 @@ static void Run( intf_thread_t *p_intf ) { if( p_vout && var_GetBool( p_vout, "fullscreen" ) ) { - var_SetBool( p_vout, "fullscreen", VLC_FALSE ); + var_SetBool( p_vout, "fullscreen", false ); + } + } + else if( i_action == ACTIONID_ZOOM_QUARTER || + i_action == ACTIONID_ZOOM_HALF || + i_action == ACTIONID_ZOOM_ORIGINAL || + i_action == ACTIONID_ZOOM_DOUBLE ) + { + if( p_vout ) + { + if( i_action == ACTIONID_ZOOM_QUARTER ) + val.f_float = 0.25; + if( i_action == ACTIONID_ZOOM_HALF ) + val.f_float = 0.5; + if( i_action == ACTIONID_ZOOM_ORIGINAL ) + val.f_float = 1; + if( i_action == ACTIONID_ZOOM_DOUBLE ) + val.f_float = 2; + var_Set( p_vout, "zoom", val ); } } else if( i_action == ACTIONID_WALLPAPER ) @@ -323,25 +289,26 @@ static void Run( intf_thread_t *p_intf ) var_Set( p_playlist, "directx-wallpaper", val ); } } + /* Playlist actions */ else if( i_action == ACTIONID_LOOP ) { /* Toggle Normal -> Loop -> Repeat -> Normal ... */ vlc_value_t val2; var_Get( p_playlist, "loop", &val ); var_Get( p_playlist, "repeat", &val2 ); - if( val2.b_bool == VLC_TRUE ) + if( val2.b_bool == true ) { - val.b_bool = VLC_FALSE; - val2.b_bool = VLC_FALSE; + val.b_bool = false; + val2.b_bool = false; } - else if( val.b_bool == VLC_TRUE ) + else if( val.b_bool == true ) { - val.b_bool = VLC_FALSE; - val2.b_bool = VLC_TRUE; + val.b_bool = false; + val2.b_bool = true; } else { - val.b_bool = VLC_TRUE; + val.b_bool = true; } var_Set( p_playlist, "loop", val ); var_Set( p_playlist, "repeat", val2 ); @@ -352,24 +319,6 @@ static void Run( intf_thread_t *p_intf ) val.b_bool = !val.b_bool; var_Set( p_playlist, "random", val ); } - else if( i_action == ACTIONID_ZOOM_QUARTER || - i_action == ACTIONID_ZOOM_HALF || - i_action == ACTIONID_ZOOM_ORIGINAL || - i_action == ACTIONID_ZOOM_DOUBLE ) - { - if( p_vout ) - { - if( i_action == ACTIONID_ZOOM_QUARTER ) - val.f_float = 0.25; - if( i_action == ACTIONID_ZOOM_HALF ) - val.f_float = 0.5; - if( i_action == ACTIONID_ZOOM_ORIGINAL ) - val.f_float = 1; - if( i_action == ACTIONID_ZOOM_DOUBLE ) - val.f_float = 2; - var_Set( p_vout, "zoom", val ); - } - } else if( i_action == ACTIONID_PLAY_PAUSE ) { val.i_int = PLAYING_S; @@ -397,13 +346,58 @@ static void Run( intf_thread_t *p_intf ) playlist_Play( p_playlist ); } } + else if( i_action == ACTIONID_AUDIODEVICE_CYCLE ) + { + vlc_value_t val, list, list2; + int i_count, i; + + aout_instance_t *p_aout = + vlc_object_find( p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE ); + var_Get( p_aout, "audio-device", &val ); + var_Change( p_aout, "audio-device", VLC_VAR_GETCHOICES, + &list, &list2 ); + i_count = list.p_list->i_count; + + /* Not enough device to switch between */ + 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; + } + } + if( i == i_count ) + { + msg_Warn( p_aout, + "invalid current audio device, selecting 0" ); + var_Set( p_aout, "audio-device", + list.p_list->p_values[0] ); + i = 0; + } + else if( i == i_count -1 ) + { + var_Set( p_aout, "audio-device", + list.p_list->p_values[0] ); + i = 0; + } + else + { + var_Set( p_aout, "audio-device", + list.p_list->p_values[i+1] ); + i++; + } + vout_OSDMessage( p_intf, DEFAULT_CHAN, + _("Audio Device: %s"), + list2.p_list->p_values[i].psz_string); + vlc_object_release( p_aout ); + } + /* Input options */ else if( p_input ) { - /* FIXME --fenrir - * How to get a valid value ? - * That's not that easy with some special stream - */ - vlc_bool_t b_seekable = VLC_TRUE; + bool b_seekable = var_GetBool( p_input, "seekable" ); int i_interval =0; if( i_action == ACTIONID_PAUSE ) @@ -424,8 +418,7 @@ static void Run( intf_thread_t *p_intf ) #define SET_TIME( a, b ) \ i_interval = config_GetInt( p_input, a "-jump-size" ); \ if( i_interval > 0 ) { \ - val.i_time = ( (mtime_t)(i_interval * b) * 1000000L \ - * ((mtime_t)(1 << i_times))); \ + val.i_time = (mtime_t)(i_interval * b) * 1000000L; \ var_Set( p_input, "time-offset", val ); \ DisplayPosition( p_intf, p_vout, p_input ); \ } @@ -504,54 +497,6 @@ static void Run( intf_thread_t *p_intf ) _("Audio track: %s"), list2.p_list->p_values[i].psz_string ); } - else if( i_action == ACTIONID_AUDIODEVICE_CYCLE && p_vout) - { - vlc_value_t val, list, list2; - int i_count, i; - aout_instance_t *p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE ); - var_Get( p_aout, "audio-device", &val ); - var_Change( p_aout, "audio-device", 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; - } - } - if( i == i_count ) - { - msg_Warn( p_aout, - "invalid current audio device, selecting 0" ); - var_Set( p_aout, "audio-device", - list.p_list->p_values[0] ); - i = 0; - - } - else if( i == i_count -1 ) - { - var_Set( p_aout, "audio-device", - list.p_list->p_values[0] ); - i = 0; - - } - else - { - var_Set( p_aout, "audio-device", - list.p_list->p_values[i+1] ); - i++; - } - vout_OSDMessage( VLC_OBJECT(p_input), - DEFAULT_CHAN, - _("Audio Device: %s"), - list2.p_list->p_values[i].psz_string); - vlc_object_release( p_aout ); - } else if( i_action == ACTIONID_SUBTITLE_TRACK ) { vlc_value_t val, list, list2; @@ -619,6 +564,8 @@ static void Run( intf_thread_t *p_intf ) vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, _("Aspect ratio: %s"), text_list.p_list->p_values[i].psz_string ); + + var_Change( p_vout, "aspect-ratio", VLC_VAR_FREELIST, &val_list, &text_list ); } free( val.psz_string ); } @@ -645,6 +592,8 @@ static void Run( intf_thread_t *p_intf ) vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, _("Crop: %s"), text_list.p_list->p_values[i].psz_string ); + + var_Change( p_vout, "crop", VLC_VAR_FREELIST, &val_list, &text_list ); } free( val.psz_string ); } @@ -671,6 +620,8 @@ static void Run( intf_thread_t *p_intf ) vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, _("Deinterlace mode: %s"), text_list.p_list->p_values[i].psz_string ); + + var_Change( p_vout, "deinterlace", VLC_VAR_FREELIST, &val_list, &text_list ); } free( val.psz_string ); } @@ -701,6 +652,8 @@ static void Run( intf_thread_t *p_intf ) vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, _("Zoom mode: %s"), text_list.p_list->p_values[i].var.psz_name ); + + var_Change( p_vout, "zoom", VLC_VAR_FREELIST, &val_list, &text_list ); } } else if( i_action == ACTIONID_CROP_TOP && p_vout ) @@ -857,7 +810,6 @@ static void Run( intf_thread_t *p_intf ) { osd_MenuActivate( VLC_OBJECT(p_intf) ); } - } if( p_vout ) vlc_object_release( p_vout ); @@ -867,87 +819,97 @@ static void Run( intf_thread_t *p_intf ) pl_Release( p_intf ); } -static int GetKey( intf_thread_t *p_intf) +static int GetAction( intf_thread_t *p_intf ) { - vlc_mutex_lock( &p_intf->p_sys->change_lock ); - if ( p_intf->p_sys->i_size == 0 ) + intf_sys_t *p_sys = p_intf->p_sys; + int i_ret = -1; + + vlc_object_lock( p_intf ); + while( p_sys->i_size == 0 ) { - vlc_mutex_unlock( &p_intf->p_sys->change_lock ); - return -1; + if( !vlc_object_alive( p_intf ) ) + goto out; + vlc_object_wait( p_intf ); } + + i_ret = p_sys->p_actions[ 0 ]; + p_sys->i_size--; + for( int i = 0; i < p_sys->i_size; i++ ) + p_sys->p_actions[i] = p_sys->p_actions[i + 1]; + +out: + vlc_object_unlock( p_intf ); + return i_ret; +} + +static int PutAction( intf_thread_t *p_intf, int i_action ) +{ + intf_sys_t *p_sys = p_intf->p_sys; + int i_ret = VLC_EGENERIC; + + vlc_object_lock( p_intf ); + if ( p_sys->i_size >= BUFFER_SIZE ) + msg_Warn( p_intf, "event buffer full, dropping key actions" ); else - { - int i_return = p_intf->p_sys->p_keys[ 0 ]; - int i; - p_intf->p_sys->i_size--; - for ( i = 0; i < BUFFER_SIZE - 1; i++) - { - p_intf->p_sys->p_keys[ i ] = p_intf->p_sys->p_keys[ i + 1 ]; - } - vlc_mutex_unlock( &p_intf->p_sys->change_lock ); - return i_return; - } + p_sys->p_actions[p_sys->i_size++] = i_action; + + vlc_object_signal_unlocked( p_intf ); + vlc_object_unlock( p_intf ); + return i_ret; } /***************************************************************************** - * KeyEvent: callback for keyboard events + * SpecialKeyEvent: callback for mouse events *****************************************************************************/ -static int KeyEvent( vlc_object_t *p_this, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +static int SpecialKeyEvent( vlc_object_t *libvlc, char const *psz_var, + vlc_value_t oldval, vlc_value_t newval, + void *p_data ) { - VLC_UNUSED(psz_var); VLC_UNUSED(oldval); intf_thread_t *p_intf = (intf_thread_t *)p_data; - if ( !newval.i_int ) - { - msg_Warn( p_this, "Received invalid key event %d", newval.i_int ); - return VLC_EGENERIC; - } - vlc_mutex_lock( &p_intf->p_sys->change_lock ); - if ( p_intf->p_sys->i_size == BUFFER_SIZE ) - { - msg_Warn( p_intf, "event buffer full, dropping keypress" ); - vlc_mutex_unlock( &p_intf->p_sys->change_lock ); - return VLC_EGENERIC; - } - else + int i_action; + + (void)libvlc; + (void)psz_var; + (void)oldval; + + /* Special action for mouse event */ + /* FIXME: This should probably be configurable */ + /* FIXME: rework hotkeys handling to allow more than 1 event + * to trigger one same action */ + switch (newval.i_int & KEY_SPECIAL) { - p_intf->p_sys->p_keys[ p_intf->p_sys->i_size ] = newval.i_int; - p_intf->p_sys->i_size++; + case KEY_MOUSEWHEELUP: + i_action = ACTIONID_VOL_UP; + break; + case KEY_MOUSEWHEELDOWN: + i_action = ACTIONID_VOL_DOWN; + break; + case KEY_MOUSEWHEELLEFT: + i_action = ACTIONID_JUMP_BACKWARD_EXTRASHORT; + break; + case KEY_MOUSEWHEELRIGHT: + i_action = ACTIONID_JUMP_FORWARD_EXTRASHORT; + break; + default: + return VLC_SUCCESS; } - vlc_mutex_lock( &p_intf->object_lock ); - vlc_cond_signal( &p_intf->object_wait ); - vlc_mutex_unlock( &p_intf->object_lock ); - vlc_mutex_unlock( &p_intf->p_sys->change_lock ); - return VLC_SUCCESS; + return PutAction( p_intf, i_action ); } -static int ActionKeyCB( vlc_object_t *p_this, char const *psz_var, +/***************************************************************************** + * ActionEvent: callback for hotkey actions + *****************************************************************************/ +static int ActionEvent( vlc_object_t *libvlc, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - VLC_UNUSED(oldval); VLC_UNUSED(p_data); - libvlc_int_t *p_libvlc = (libvlc_int_t *)p_this; - struct hotkey *p_hotkeys = p_libvlc->p_hotkeys; - mtime_t i_date; - int i; + intf_thread_t *p_intf = (intf_thread_t *)p_data; - for( i = 0; p_hotkeys[i].psz_action != NULL; i++ ) - { - if( !strcmp( p_hotkeys[i].psz_action, psz_var ) ) - { - p_hotkeys[i].i_key = newval.i_int; - /* do hotkey accounting */ - i_date = mdate(); - if( (p_hotkeys[i].i_delta_date > 0) && - (p_hotkeys[i].i_delta_date <= (i_date - p_hotkeys[i].i_last_date) ) ) - p_hotkeys[i].i_times = 0; - else - p_hotkeys[i].i_times++; - p_hotkeys[i].i_last_date = i_date; - } - } + (void)libvlc; + (void)psz_var; + (void)oldval; - return VLC_SUCCESS; + return PutAction( p_intf, newval.i_int ); } static void PlayBookmark( intf_thread_t *p_intf, int i_num ) @@ -967,7 +929,7 @@ static void PlayBookmark( intf_thread_t *p_intf, int i_num ) if( !strcmp( psz_bookmark, psz_uri ) ) { free( psz_uri ); - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE, + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, NULL, p_item ); break; } @@ -1024,7 +986,7 @@ static void DisplayPosition( intf_thread_t *p_intf, vout_thread_t *p_vout, vout_OSDMessage( p_input, POSITION_TEXT_CHAN, psz_time ); } - if( !p_vout->p_parent_intf || p_vout->b_fullscreen ) + if( !p_vout->p_window || p_vout->b_fullscreen ) { var_Get( p_input, "position", &pos ); vout_OSDSlider( VLC_OBJECT( p_input ), POSITION_WIDGET_CHAN, @@ -1041,7 +1003,7 @@ static void DisplayVolume( intf_thread_t *p_intf, vout_thread_t *p_vout, } ClearChannels( p_intf, p_vout ); - if( !p_vout->p_parent_intf || p_vout->b_fullscreen ) + if( !p_vout->p_window || p_vout->b_fullscreen ) { vout_OSDSlider( VLC_OBJECT( p_vout ), VOLUME_WIDGET_CHAN, i_vol*100/AOUT_VOLUME_MAX, OSD_VERT_SLIDER );