[vlc-devel] [PATCH 03/13] actionid for hotkey

[Rémi Denis-Courmont]

Le 2015-09-16 16:49, Aaron Wang a écrit :
> ---
>  include/vlc_keys.h | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/include/vlc_keys.h b/include/vlc_keys.h
> index ea54950..8c058fa 100644
> --- a/include/vlc_keys.h
> +++ b/include/vlc_keys.h
> @@ -176,6 +176,8 @@ typedef enum vlc_action {
>      ACTIONID_SUBTITLE_TEXT_SCALE_NORMAL,
>      ACTIONID_SUBTITLE_TEXT_SCALE_UP,
>      ACTIONID_SUBTITLE_TEXT_SCALE_DOWN,
> +    ACTIONID_SUBTITLE_TRACK2,
> +    ACTIONID_SUBTITLE_TOGGLE2,
>      ACTIONID_INTF_TOGGLE_FSC,
>      ACTIONID_INTF_HIDE,
>      ACTIONID_INTF_BOSS,

This should be merged with patch 2. And as already noted, your current 
patch order breaks the sequential builds.

-- 
Rémi Denis-Courmont
http://www.remlab.net/