Skip to content

V
vlc-2-2
Commit a83cf23f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

XCB/global: no need to keep track of VLC actions

parent 9bf47274
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
modules/control/globalhotkeys/xcb.c
View file @ a83cf23f
......@@ -62,7 +62,7 @@ typedef struct
xcb_keycode_t *p_keys;
#endif
unsigned i_modifier;
int i_action;
uint32_t i_vlc;
} hotkey_mapping_t;
struct intf_sys_t
......@@ -307,7 +307,6 @@ static bool Mapping( intf_thread_t *p_intf )
p_hotkey->psz_action != NULL;
p_hotkey++ )
{
const int i_vlc_action = p_hotkey->i_action;
char varname[12 + strlen( p_hotkey->psz_action )];
sprintf( varname, "global-key-%s", p_hotkey->psz_action );
......@@ -357,7 +356,7 @@ static bool Mapping( intf_thread_t *p_intf )
p_map->p_keys = p_keys;
#endif
p_map->i_modifier = i_modifier|i_ignored;
p_map->i_action = i_vlc_action;
p_map->i_vlc = i_vlc_key;
active = true;
}
}
......@@ -432,8 +431,8 @@ static void *Thread( void *p_data )
if( p_map->i_x11 == e->detail &&
p_map->i_modifier == e->state )
{
var_SetInteger( p_intf->p_libvlc, "key-action",
p_map->i_action );
var_SetInteger( p_intf->p_libvlc, "global-key-pressed",
p_map->i_vlc );
break;
}
#else
......@@ -442,8 +441,8 @@ static void *Thread( void *p_data )
if( p_map->p_keys[j] == e->detail &&
p_map->i_modifier == e->state )
{
var_SetInteger( p_intf->p_libvlc, "key-action",
p_map->i_action );
var_SetInteger( p_intf->p_libvlc, "global-key-pressed",
p_map->i_vlc );
loop_break = true;
break;
}
......
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