Changeset 381646bbb8c15d32a4c5975dbe1ce5ec0c269683

Timestamp:

27/03/08 19:46:22 (8 months ago)

Author:

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

git-committer:

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

git-parent:

[a7db90c636021ad806c0ff6aa491f7d875051574]

git-author:

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

Message:

MKV: use key-action

Files:

• modules/demux/mkv.cpp (modified) (7 diffs)

modules/demux/mkv.cpp

@@ -1282 +1282 @@
-    vlc_bool_t      b_moved;
-    vlc_bool_t      b_clicked;
-vlc_bool_t      b_key
+int             i_key_action
-
-} event_thread_t;
@@ -2713 +2713 @@
-}
-
-psz_var
-vlc_value_t oldval
+
+      vlc_value_t
-{
-    event_thread_t *p_ev = (event_thread_t *) p_data;
-    vlc_mutex_lock( &p_ev->lock );
-b_key = VLC_TRUE
+i_key_action = newval.i_int
-    vlc_mutex_unlock( &p_ev->lock );
-    msg_Dbg( p_this, "Event Key");
@@ -2733 +2733 @@
-    p_ev->b_moved   = VLC_FALSE;
-    p_ev->b_clicked = VLC_FALSE;
-b_key     = VLC_FALSE
+i_key_action = 0
-
-    /* catch all key event */
-pressed
+action
-
-    /* main loop */
@@ -2751 +2751 @@
-
-        /* KEY part */
-
-
-
-
-
+
+
+
-
-            msg_Dbg( p_ev->p_demux, "Handle Key Event");
@@ -2763 +2761 @@
-            pci_t *pci = (pci_t *) &p_sys->pci_packet;
-
-            var_Get( p_ev->p_libvlc, "key-pressed", &valk );
-            for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
-            {
-                if( p_hotkeys[i].i_key == valk.i_int )
-                {
-                    i_action = p_hotkeys[i].i_action;
-                }
-            }
-
-            uint16 i_curr_button = p_sys->dvd_interpretor.GetSPRM( 0x88 );
-
-i
+p_ev->i_key
-            {
-            case ACTIONID_NAV_LEFT:
@@ -2888 +2877 @@
-                break;
-            }
-b_key = VLC_FALSE
+i_key_action = 0
-            vlc_mutex_unlock( &p_ev->lock );
-        }
@@ -3038 +3027 @@
-        vlc_object_release( p_vout );
-    }
-pressed
+action
-
-    vlc_mutex_destroy( &p_ev->lock );