Changeset 78984fbe8eb7538aef18dae48972ec6a446d77bb

Timestamp:

10/26/03 14:10:05 (5 years ago)

Author:

Sigmund Augdal Helberg <sigmunau@videolan.org>

git-committer:

Sigmund Augdal Helberg <sigmunau@videolan.org> 1067173805 +0000

git-parent:

[54167ecfaa603fd199627944650aacced2e16e6c]

git-author:

Sigmund Augdal Helberg <sigmunau@videolan.org> 1067173805 +0000

Message:

modules/access/dvdplay/intf.c:

• use new key-pressed in p_vlc, and not the one in p_vout
  

src/video_output/video_output.c:

• do not create the key-pressed variable in p_vout
  

Files:

• modules/access/dvdplay/intf.c (modified) (9 diffs)
• src/video_output/video_output.c (modified) (2 diffs)

modules/access/dvdplay/intf.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-7 2003/08/13 01:45:13 gbazin
+8 2003/10/26 13:10:05 sigmunau
- *
- * Authors: St�ane Borel <stef@via.ecp.fr>
@@ -81 +81 @@
-
-    p_intf->pf_run = RunIntf;
-
+
+
-    p_intf->p_sys->m_still_time = 0;
-    p_intf->p_sys->b_inf_still = 0;
@@ -95 +96 @@
-{
-    intf_thread_t *p_intf = (intf_thread_t *)p_this;
-
+
-    /* Destroy structure */
-    free( p_intf->p_sys );
@@ -109 +110 @@
-    mtime_t             mtime = 0;
-    mtime_t             mlast = 0;
+    int i_nav_up = config_GetInt( p_intf, "nav-up-key" );
+    int i_nav_down = config_GetInt( p_intf, "nav-down-key" );
+    int i_nav_left = config_GetInt( p_intf, "nav-left-key" );
+    int i_nav_right = config_GetInt( p_intf, "nav-right-key" );
+    int i_nav_activate = config_GetInt( p_intf, "nav-activate-key" );
-
-    if( InitThread( p_intf ) < 0 )
@@ -215 +221 @@
-         * keyboard event
-         */
-vout && p_
+
-        {
-            vlc_value_t val;
@@ -222 +228 @@
-            p_intf->p_sys->b_key_pressed = VLC_FALSE;
-            
-vout
-psz_string
-
-!strcmp( val.psz_string, "LEFT" )
+intf->p_vlc
+i_int
+
+val.i_int == i_nav_left
-                {
-                    p_intf->p_sys->control.type = DVDCtrlLeftButtonSelect;
-                }
-!strcmp( val.psz_string, "RIGHT" )
+val.i_int == i_nav_right
-                {
-                    p_intf->p_sys->control.type = DVDCtrlRightButtonSelect;
-                }
-!strcmp( val.psz_string, "UP" )
+val.i_int == i_nav_up
-                {
-                    p_intf->p_sys->control.type = DVDCtrlUpperButtonSelect;
-                }
-!strcmp( val.psz_string, "DOWN" )
+val.i_int == i_nav_down
-                {
-                    p_intf->p_sys->control.type = DVDCtrlLowerButtonSelect;
-                }
-!strcmp( val.psz_string, "ENTER" )
+val.i_int == i_nav_activate
-                {
-                    p_intf->p_sys->control.type = DVDCtrlButtonActivate;
@@ -274 +280 @@
-            var_DelCallback( p_vout, "mouse-moved", MouseEvent, p_intf );
-            var_DelCallback( p_vout, "mouse-clicked", MouseEvent, p_intf );
-            var_DelCallback( p_vout, "key-pressed", KeyEvent, p_intf );
-            vlc_object_release( p_vout );
-            p_vout = NULL;
@@ -287 +292 @@
-                var_AddCallback( p_vout, "mouse-moved", MouseEvent, p_intf );
-                var_AddCallback( p_vout, "mouse-clicked", MouseEvent, p_intf );
-                var_AddCallback( p_vout, "key-pressed", KeyEvent, p_intf );
-            }
-        }
@@ -299 +303 @@
-        var_DelCallback( p_vout, "mouse-moved", MouseEvent, p_intf );
-        var_DelCallback( p_vout, "mouse-clicked", MouseEvent, p_intf );
-        var_DelCallback( p_vout, "key-pressed", KeyEvent, p_intf );
-        vlc_object_release( p_vout );
-    }

src/video_output/video_output.c

@@ -6 +6 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-8 2003/10/08 10:07:22 zorglub
+9 2003/10/26 13:10:05 sigmunau
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -284 +284 @@
-    var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL );
-    var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER );
-    var_Create( p_vout, "key-pressed", VLC_VAR_STRING );
-
-    var_Create( p_vout, "intf-change", VLC_VAR_BOOL );