[vlc-devel] commit: hotkeys: user var_Inherit (partial) ( Rémi Denis-Courmont )

git version control git at videolan.org
Wed Dec 30 20:52:22 CET 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Dec 30 21:27:24 2009 +0200| [5530c16d55878130e5feaaa2f54cfa6b2dd02164] | committer: Rémi Denis-Courmont 

hotkeys: user var_Inherit (partial)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5530c16d55878130e5feaaa2f54cfa6b2dd02164
---

 modules/control/hotkeys.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 8b12520..3667f42 100644
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -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 ); \




More information about the vlc-devel mailing list