Changeset ef8cc37104e6db0cb6d37ab9197758c89b4bb8ae

Timestamp:

18/09/05 12:03:10 (3 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1127037790 +0000

git-parent:

[266e4aa0177e922ad0819982d5ed5db9fce62f10]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1127037790 +0000

Message:

Forward port of revision 12566: Ignore menu select|right|left|up|down when OSD Menu is not visible

Files:

• include/vlc_osd.h (modified) (1 diff)
• src/osd/osd.c (modified) (19 diffs)

include/vlc_osd.h

@@ -403 +403 @@
-{
-    vlc_value_t val;
-
+
-    val.b_bool = p_osd->p_state->b_update = b_value;
-    var_Set( p_osd, "osd-menu-update", val );

src/osd/osd.c

@@ -41 +41 @@
-static inline osd_state_t *osd_VolumeStateChange( osd_state_t *, int );
-static int osd_VolumeStep( vlc_object_t *, int, int );
+static vlc_bool_t osd_isVisible( osd_menu_t *p_osd );
+
+static vlc_bool_t osd_isVisible( osd_menu_t *p_osd )
+{
+    vlc_value_t val;
+
+    var_Get( p_osd, "osd-menu-visible", &val );
+    return val.b_bool;
+}
-
-/*****************************************************************************
@@ -257 +266 @@
-    osd_button_t *p_button = NULL;
-    vlc_value_t lockval;
-
+
-    if( ( p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE ) ) == NULL )
-    {
@@ -263 +272 @@
-        return;
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-#if defined(OSD_MENU_DEBUG)
-    msg_Dbg( p_osd, "select" );
@@ -280 +295 @@
-        __osd_MenuUp( p_this );   /* "menu select" means go to menu item above. */
-        return;
-    
+
-    if( p_button && p_button->p_down)
-    
+
-        vlc_object_release( (vlc_object_t*) p_osd );
-        vlc_mutex_unlock( lockval.p_address );
@@ -305 +320 @@
-    }
-    vlc_object_release( (vlc_object_t*) p_osd );
-            
-           
+
+
-
-void __osd_MenuNext( vlc_object_t *p_this )
@@ -313 +328 @@
-    osd_button_t *p_button = NULL;
-    vlc_value_t lockval;
-
+
-    if( ( p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE ) ) == NULL )
-    {
@@ -319 +334 @@
-        return;
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    p_button = p_osd->p_state->p_visible;
-    if( p_button )
@@ -332 +353 @@
-        else
-            p_osd->p_state->p_visible = p_osd->p_button;
-
+
-        if( !p_osd->p_state->p_visible->b_range ) 
-            p_osd->p_state->p_visible->p_current_state =
-                osd_StateChange( p_osd->p_state->p_visible->p_states, OSD_BUTTON_SELECT );
-
+
-        osd_UpdateState( p_osd->p_state, 
-                p_osd->p_state->p_visible->i_x, p_osd->p_state->p_visible->i_y,
@@ -345 +366 @@
-    }
-#if defined(OSD_MENU_DEBUG)
-            
-
-
+
+
+
-    vlc_object_release( (vlc_object_t*) p_osd );
-    vlc_mutex_unlock( lockval.p_address );
@@ -357 +378 @@
-    osd_button_t *p_button = NULL;
-    vlc_value_t lockval;
-
+
-    if( ( p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE ) ) == NULL )
-    {
@@ -364 +385 @@
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
-    p_button = p_osd->p_state->p_visible;
-    if( p_button )
-                    
+
-        if( !p_button->b_range ) 
-            p_button->p_current_state = osd_StateChange( p_button->p_states, OSD_BUTTON_UNSELECT );
@@ -375 +402 @@
-            p_osd->p_state->p_visible = p_button->p_prev;
-        else
-                
-
+
+
-        if( !p_osd->p_state->p_visible->b_range ) 
-            p_osd->p_state->p_visible->p_current_state =
-                osd_StateChange( p_osd->p_state->p_visible->p_states, OSD_BUTTON_SELECT );
-
+
-        osd_UpdateState( p_osd->p_state, 
-                p_osd->p_state->p_visible->i_x, p_osd->p_state->p_visible->i_y,
@@ -389 +416 @@
-    }
-#if defined(OSD_MENU_DEBUG)
-            
-
-
+
+
+
-    vlc_object_release( (vlc_object_t*) p_osd );
-    vlc_mutex_unlock( lockval.p_address );
@@ -401 +428 @@
-    osd_button_t *p_button = NULL;
-    vlc_value_t lockval;
-    
+
-    vlc_value_t val;
-#endif
-
+
-    if( ( p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE ) ) == NULL )
-    {
@@ -410 +437 @@
-        return;
-    }
-
+
+
+
+
+
+
+
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
@@ -421 +454 @@
-            p_button->p_current_state = osd_StateChange( p_button->p_states, OSD_BUTTON_SELECT );
-            if( p_button->p_up )
-                    
-
-
+
+
+
-        if( p_button->b_range && p_osd->p_state->p_visible->b_range ) 
-                    
+
-            osd_state_t *p_temp = p_osd->p_state->p_visible->p_current_state;
-            if( p_temp && p_temp->p_next )
@@ -431 +464 @@
-        }
-        else if( !p_osd->p_state->p_visible->b_range )
-    
+
-            p_osd->p_state->p_visible->p_current_state =
-                osd_StateChange( p_osd->p_state->p_visible->p_states, OSD_BUTTON_SELECT );
- 
-
+
+
-        osd_UpdateState( p_osd->p_state, 
-                p_osd->p_state->p_visible->i_x, p_osd->p_state->p_visible->i_y,
@@ -454 +487 @@
-    }
-#if defined(OSD_MENU_DEBUG)
-            
-            
-
+
+
+
-    vlc_object_release( (vlc_object_t*) p_osd );
-    vlc_mutex_unlock( lockval.p_address );
@@ -475 +508 @@
-        return;
-    }
-
+
+
+
+
+
+
+
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );