Commit 327ecc39 authored by Thomas Guillem's avatar Thomas Guillem Committed by Hugo Beauzée-Luyssen

actions: rename vlc_GetActionId to vlc_actions_get_id

Signed-off-by: default avatarHugo Beauzée-Luyssen <hugo@beauzee.fr>
parent aece8a0c
......@@ -247,7 +247,12 @@ typedef enum vlc_action_id {
} vlc_action_id_t;
VLC_API vlc_action_id_t vlc_GetActionId(const char *psz_key) VLC_USED;
/**
* Get the action ID from an action key name
* \return the action ID or ACTIONID_NONE on error.
*/
VLC_API vlc_action_id_t
vlc_actions_get_id(const char *psz_key_name);
struct hotkey
{
......
......@@ -308,7 +308,7 @@ LRESULT CALLBACK WMHOTKEYPROC( HWND hwnd, UINT uMsg, WPARAM wParam,
return 0;
/* search for key associated with VLC */
vlc_action_id_t action = vlc_GetActionId( psz_atomName );
vlc_action_id_t action = vlc_actions_get_id( psz_atomName );
if( action != ACTIONID_NONE )
{
var_SetInteger( p_intf->obj.libvlc,
......
......@@ -195,7 +195,7 @@ static void Process( intf_thread_t *p_intf )
{
if( !strncmp( "key-", c, 4 ) )
{
vlc_action_id_t i_key = vlc_GetActionId( c );
vlc_action_id_t i_key = vlc_actions_get_id( c );
if( i_key )
var_SetInteger( p_intf->obj.libvlc, "key-action", i_key );
else
......
......@@ -715,7 +715,7 @@ static void *Run( void *data )
else if( !strcmp( psz_cmd, "key" ) || !strcmp( psz_cmd, "hotkey" ) )
{
var_SetInteger( p_intf->obj.libvlc, "key-action",
vlc_GetActionId( psz_arg ) );
vlc_actions_get_id( psz_arg ) );
}
else switch( psz_cmd[0] )
{
......
......@@ -147,7 +147,7 @@ static int vlclua_mwait( lua_State *L )
static int vlclua_action_id( lua_State *L )
{
vlc_action_id_t i_key = vlc_GetActionId( luaL_checkstring( L, 1 ) );
vlc_action_id_t i_key = vlc_actions_get_id( luaL_checkstring( L, 1 ) );
if (i_key == 0)
return 0;
lua_pushnumber( L, i_key );
......
......@@ -510,6 +510,7 @@ video_format_GetTransform
video_format_IsSimilar
video_format_Setup
video_format_Print
vlc_actions_get_id
vlc_b64_decode
vlc_b64_decode_binary
vlc_b64_decode_binary_to_buffer
......@@ -571,7 +572,6 @@ vlc_fourcc_IsYUV
vlc_fourcc_GetRGBFallback
vlc_fourcc_GetYUVFallback
vlc_fourcc_AreUVPlanesSwapped
vlc_GetActionId
vlc_getaddrinfo
vlc_getaddrinfo_i11e
vlc_getnameinfo
......
......@@ -593,7 +593,8 @@ static int actcmp(const void *key, const void *ent)
* Get the action ID from the action name in the configuration subsystem.
* @return the action ID or ACTIONID_NONE on error.
*/
vlc_action_id_t vlc_GetActionId (const char *name)
vlc_action_id_t
vlc_actions_get_id (const char *name)
{
const struct action *act;
......
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