Changeset f016819850d9d4896a3944bd0e94b73f648ec85b

Timestamp:

27/03/08 19:03:05 (6 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1206640985 +0200

git-parent:

[a859dede77cff629f2f98b84ded198f492bc5222]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1206640985 +0200

Message:

Revert "ActionKeyCB: remove completely."

This reverts commit a859dede77cff629f2f98b84ded198f492bc5222.

Files:

• modules/control/hotkeys.c (modified) (3 diffs)

modules/control/hotkeys.c

@@ -74 +74 @@
-static int  KeyEvent( vlc_object_t *, char const *,
-                      vlc_value_t, vlc_value_t, void * );
+static int  ActionKeyCB( vlc_object_t *, char const *,
+                         vlc_value_t, vlc_value_t, void * );
-static void PlayBookmark( intf_thread_t *, int );
-static void SetBookmark ( intf_thread_t *, int );
@@ -147 +149 @@
-    /* Initialize hotkey structure */
-    for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
-
+
+
+
+
+
+
+
+
+
-
-    for( vlc_bool_t b_quit = VLC_FALSE ; !b_quit; )
@@ -918 +928 @@
-}
-
+static int ActionKeyCB( vlc_object_t *libvlc, char const *psz_var,
+                        vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+    mtime_t i_date;
+    struct hotkey *p_hotkey = p_data;
+
+    (void)libvlc; (void)psz_var; (void)oldval;
+
+    p_hotkey->i_key = newval.i_int;
+
+    /* do hotkey accounting */
+    i_date = mdate();
+    if( (p_hotkey->i_delta_date > 0) &&
+        (p_hotkey->i_delta_date <= (i_date - p_hotkey->i_last_date) ) )
+        p_hotkey->i_times = 0;
+    else
+        p_hotkey->i_times++;
+    p_hotkey->i_last_date = i_date;
+
+    return VLC_SUCCESS;
+}
+
-static void PlayBookmark( intf_thread_t *p_intf, int i_num )
-{