Commit e59d7e85 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

access_filter_dump: use key-action

parent 88226a80
...@@ -121,7 +121,7 @@ static int Open (vlc_object_t *obj) ...@@ -121,7 +121,7 @@ static int Open (vlc_object_t *obj)
} }
p_sys->tmp_max = ((int64_t)var_CreateGetInteger (access, "dump-margin")) << 20; p_sys->tmp_max = ((int64_t)var_CreateGetInteger (access, "dump-margin")) << 20;
var_AddCallback (access->p_libvlc, "key-pressed", KeyHandler, access); var_AddCallback (access->p_libvlc, "key-action", KeyHandler, access);
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -135,7 +135,7 @@ static void Close (vlc_object_t *obj) ...@@ -135,7 +135,7 @@ static void Close (vlc_object_t *obj)
access_t *access = (access_t *)obj; access_t *access = (access_t *)obj;
access_sys_t *p_sys = access->p_sys; access_sys_t *p_sys = access->p_sys;
var_DelCallback (access->p_libvlc, "key-pressed", KeyHandler, access); var_DelCallback (access->p_libvlc, "key-action", KeyHandler, access);
if (p_sys->stream != NULL) if (p_sys->stream != NULL)
fclose (p_sys->stream); fclose (p_sys->stream);
...@@ -327,16 +327,7 @@ static int KeyHandler (vlc_object_t *obj, char const *varname, ...@@ -327,16 +327,7 @@ static int KeyHandler (vlc_object_t *obj, char const *varname,
(void)oldval; (void)oldval;
(void)obj; (void)obj;
for (struct hotkey *key = access->p_libvlc->p_hotkeys; if (newval.i_int == ACTIONID_DUMP)
key->psz_action != NULL; key++) Trigger (access);
{
if (key->i_key == newval.i_int)
{
if (key->i_action == ACTIONID_DUMP)
Trigger ((access_t *)data);
break;
}
}
return VLC_SUCCESS; return VLC_SUCCESS;
} }
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