Skip to content

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

hotkeys: user var_Inherit (partial)

parent 1f2a1a8d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/control/hotkeys.c
View file @ 5530c16d
......@@ -121,7 +121,7 @@ static int Open( vlc_object_t *p_this )
p_sys->p_last_vout = NULL;
p_intf->p_sys->i_mousewheel_mode =
config_GetInt( p_intf, "hotkeys-mousewheel-mode" );
var_InheritInteger( p_intf, "hotkeys-mousewheel-mode" );
var_AddCallback( p_intf->p_libvlc, "key-pressed", SpecialKeyEvent, p_intf );
var_AddCallback( p_intf->p_libvlc, "key-action", ActionEvent, p_intf );
......@@ -385,7 +385,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
&& b_seekable )
{
#define SET_TIME( a, b ) \
i_interval = config_GetInt( p_input, a "-jump-size" ); \
i_interval = var_InheritInteger( p_input, a "-jump-size" ); \
if( i_interval > 0 ) { \
mtime_t i_time = (mtime_t)(i_interval * b) * 1000000L; \
var_SetTime( p_input, "time-offset", i_time ); \
......
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