Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
aece8a0c
Commit
aece8a0c
authored
Aug 03, 2017
by
Thomas Guillem
Committed by
Hugo Beauzée-Luyssen
Aug 09, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
actions: rename struct vlc_actions to vlc_actions_t
Signed-off-by:
Hugo Beauzée-Luyssen
<
hugo@beauzee.fr
>
parent
fa27e5e4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
+5
-7
src/libvlc.h
src/libvlc.h
+2
-4
src/misc/actions.c
src/misc/actions.c
+3
-3
No files found.
src/libvlc.h
View file @
aece8a0c
...
...
@@ -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
;
...
...
src/misc/actions.c
View file @
aece8a0c
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment