vlc | branch: master | Thomas Guillem <tho...@gllm.fr> | Thu Aug  3 15:10:37 
2017 +0200| [aece8a0cf52be94557d7094fdb45ccf4176e56c2] | committer: Hugo 
Beauzée-Luyssen

actions: rename struct vlc_actions to vlc_actions_t

Signed-off-by: Hugo Beauzée-Luyssen <h...@beauzee.fr>

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

 src/libvlc.h       | 6 ++----
 src/misc/actions.c | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/libvlc.h b/src/libvlc.h
index 59d6f2dfb3..7d7982157e 100644
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -29,9 +29,6 @@ extern const char psz_vlc_changeset[];
 
 typedef struct variable_t variable_t;
 
-/* Actions (hot keys) */
-struct vlc_actions;
-
 /*
  * OS-specific initialization
  */
@@ -175,6 +172,7 @@ void vlc_objres_remove(vlc_object_t *obj, void *data,
  */
 typedef struct vlc_dialog_provider vlc_dialog_provider;
 typedef struct vlc_keystore vlc_keystore;
+typedef struct vlc_actions_t vlc_actions_t;
 
 typedef struct libvlc_priv_t
 {
@@ -190,7 +188,7 @@ typedef struct libvlc_priv_t
     vlc_keystore      *p_memory_keystore; ///< memory keystore
     struct playlist_t *playlist; ///< Playlist for interfaces
     struct playlist_preparser_t *parser; ///< Input item meta data handler
-    struct vlc_actions *actions; ///< Hotkeys handler
+    vlc_actions_t *actions; ///< Hotkeys handler
 
     /* Exit callback */
     vlc_exit_t       exit;
diff --git a/src/misc/actions.c b/src/misc/actions.c
index e92b431358..84558273d7 100644
--- a/src/misc/actions.c
+++ b/src/misc/actions.c
@@ -399,7 +399,7 @@ static int keycmp (const void *a, const void *b)
     return (ka->key < kb->key) ? -1 : (ka->key > kb->key) ? +1 : 0;
 }
 
-struct vlc_actions
+struct vlc_actions_t
 {
     void *map; /* Key map */
     void *global_map; /* Grabbed/global key map */
@@ -511,7 +511,7 @@ int libvlc_InternalActionsInit (libvlc_int_t *libvlc)
 
     vlc_object_t *obj = VLC_OBJECT(libvlc);
     struct hotkey *keys;
-    struct vlc_actions *as = malloc (sizeof (*as) + ACTIONS_COUNT * sizeof 
(*keys));
+    vlc_actions_t *as = malloc (sizeof (*as) + ACTIONS_COUNT * sizeof (*keys));
 
     if (unlikely(as == NULL))
         return VLC_ENOMEM;
@@ -567,7 +567,7 @@ void libvlc_InternalActionsClean (libvlc_int_t *libvlc)
 {
     assert(libvlc != NULL);
 
-    struct vlc_actions *as = libvlc_priv(libvlc)->actions;
+    vlc_actions_t *as = libvlc_priv(libvlc)->actions;
     if (unlikely(as == NULL))
         return;
 

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to