[vlc-commits] actions: rename vlc_GetActionId to vlc_actions_get_id

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Aug  3 15:10:38 2017 +0200| [327ecc39de0d4ea503bcd8f36efbe781d3d5bae4] | committer: Hugo Beauzée-Luyssen

actions: rename vlc_GetActionId to vlc_actions_get_id

Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=327ecc39de0d4ea503bcd8f36efbe781d3d5bae4
---

 include/vlc_actions.h                 | 7 ++++++-
 modules/control/globalhotkeys/win32.c | 2 +-
 modules/control/lirc.c                | 2 +-
 modules/control/oldrc.c               | 2 +-
 modules/lua/libs/misc.c               | 2 +-
 src/libvlccore.sym                    | 2 +-
 src/misc/actions.c                    | 3 ++-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/include/vlc_actions.h b/include/vlc_actions.h
index 6a0f2e1853..c69f33ac7b 100644
--- a/include/vlc_actions.h
+++ b/include/vlc_actions.h
@@ -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
 {
diff --git a/modules/control/globalhotkeys/win32.c b/modules/control/globalhotkeys/win32.c
index 56a28b517f..fdde1f1b78 100644
--- a/modules/control/globalhotkeys/win32.c
+++ b/modules/control/globalhotkeys/win32.c
@@ -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,
diff --git a/modules/control/lirc.c b/modules/control/lirc.c
index 7352c5eed8..aa5accbc82 100644
--- a/modules/control/lirc.c
+++ b/modules/control/lirc.c
@@ -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
diff --git a/modules/control/oldrc.c b/modules/control/oldrc.c
index 150e4b0723..66402293a5 100644
--- a/modules/control/oldrc.c
+++ b/modules/control/oldrc.c
@@ -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] )
         {
diff --git a/modules/lua/libs/misc.c b/modules/lua/libs/misc.c
index 1bc0dcad94..a0472e82a2 100644
--- a/modules/lua/libs/misc.c
+++ b/modules/lua/libs/misc.c
@@ -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 );
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index bcf8ec6b76..06893a19ef 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -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
diff --git a/src/misc/actions.c b/src/misc/actions.c
index 84558273d7..d92b13849c 100644
--- a/src/misc/actions.c
+++ b/src/misc/actions.c
@@ -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;