Changeset 810e9accee5e25309f75cfcd9873a4543385865a

Timestamp:

09/29/05 16:28:51 (3 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

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

git-parent:

[0e79f464081441bb979427207931010ad694691a]

git-author:

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

Message:

remove trailing whitespace

Files:

• src/osd/osd.c (modified) (13 diffs)

src/osd/osd.c

@@ -65 +65 @@
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
-
+
-    if( ( p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE ) ) == NULL )
-    {
-        vlc_value_t val;
-
+
-        msg_Dbg( p_this, "creating osd menu object" );
-        if( ( p_osd = vlc_object_create( p_this, VLC_OBJECT_OSDMENU ) ) == NULL )
@@ -81 +81 @@
-        if( osd_ConfigLoader( p_this, psz_file, &p_osd ) )
-            goto error;
-
+
-        /* Setup default button (first button) */
-        p_osd->p_state->p_visible = p_osd->p_button;
@@ -97 +97 @@
-        osd_UpdateState( p_osd->p_state, p_osd->i_x, p_osd->i_y,
-                         p_osd->i_width, p_osd->i_height, NULL );
-
+
-        vlc_object_yield( p_osd );
-        vlc_object_attach( p_osd, p_this->p_vlc );
-
+
-        /* Signal when an update of OSD menu is needed */
-        var_Create( p_osd, "osd-menu-update", VLC_VAR_BOOL );
@@ -107 +107 @@
-        val.b_bool = VLC_FALSE;
-        var_Set( p_osd, "osd-menu-update", val );
-        
+
-    }
-    vlc_mutex_unlock( lockval.p_address );
-    return p_osd;
-
+
-error:
-    msg_Err( p_this, "creating osd menu object failed" );
-    vlc_mutex_unlock( lockval.p_address );
-    vlc_object_destroy( p_osd );
-    
+
-}
-
@@ -124 +124 @@
-
-    if( !p_osd || !p_this ) return;
-
-
-
-
-    
+
+
+
+
+
-    if( p_osd->i_refcount > 0 )
-    {
-        
-
-    
+
+
+
-
-    var_Destroy( p_osd, "osd-menu-visible" );
-    var_Destroy( p_osd, "osd-menu-update" );
-
+
-    osd_ConfigUnload( p_this, &p_osd );
-    vlc_object_detach( p_osd );
-    vlc_object_destroy( p_osd );
-    p_osd = NULL;
-
-        
+
+
-}
-
@@ -172 +172 @@
-
-    if( i_steps < 0 ) i_steps = 0;
-
+
-    for( i=0; (i < i_steps) && (p_current != NULL); i++ )
-    
+
-        p_temp = p_current->p_next;
-        if( !p_temp ) return p_current;
@@ -198 +198 @@
-    osd_button_t *p_button = NULL;
-    vlc_value_t lockval;
-
+
-    if( ( p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE ) ) == NULL )
-    {
-        msg_Err( p_this, "osd_MenuNext failed" );
-        return;
-        
+
-
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
@@ -210 +210 @@
-#if defined(OSD_MENU_DEBUG)
-    msg_Dbg( p_osd, "menu on" );
-            
+
-    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 );
-        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,
-                p_osd->p_state->p_visible->p_current_state->p_pic->p[Y_PLANE].i_visible_pitch,
-                p_osd->p_state->p_visible->p_current_state->p_pic->p[Y_PLANE].i_visible_lines,
-                
+
-        osd_SetMenuUpdate( p_osd, VLC_TRUE );
-    }
-    osd_SetMenuVisible( p_osd, VLC_TRUE );
-
-
-
-
-
+
+
+
+
+
-void __osd_MenuHide( vlc_object_t *p_this )
-{
-    osd_menu_t *p_osd = NULL;
-    vlc_value_t lockval;
-
+
-    if( ( p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE ) ) == NULL )
-    {
@@ -245 +245 @@
-        return;
-    }
-
+
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
@@ -499 +499 @@
-    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 )
-    {
@@ -517 +517 @@
-    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
-    vlc_mutex_lock( lockval.p_address );
-
+
-    p_button = p_osd->p_state->p_visible;
-    if( p_button )
@@ -527 +527 @@
-                p_osd->p_state->p_visible = p_button->p_down;
-        }
-
+
-        if( p_button->b_range && p_osd->p_state->p_visible->b_range ) 
-        {
@@ -546 +546 @@
-                p_osd->p_state->p_visible->p_current_state->p_pic );
-        osd_SetMenuUpdate( p_osd, VLC_TRUE );
- 
+
-         * then perform "menu select" on every menu navigation
-         */