Changeset 5f8906e3671bfc9909197b98151794242d385f79

Show
Ignore:
Timestamp:
03/09/08 21:35:06 (3 months ago)
Author:
Rémi Denis-Courmont <rdenis@simphalempin.com>
git-committer:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1220470506 +0300
git-parent:

[20caf7888627c636c34dcaedfc1be00f5730950c]

git-author:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1220467928 +0300
Message:

No point in checking vlc_object_alive there

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/access/vcdx/intf.c

    r00b9584 r5f8906e  
    299299 
    300300 
    301       /* Wait a bit */ 
    302       msleep( INTF_IDLE_SLEEP ); 
     301        /* Wait a bit */ 
     302        msleep( INTF_IDLE_SLEEP ); 
    303303    } 
    304304 
    …… 
    318318{ 
    319319    /* We might need some locking here */ 
    320     if( vlc_object_alive (p_intf) ) 
    321     { 
    322         input_thread_t * p_input; 
    323  
    324         p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_PARENT ); 
    325  
    326         /* Maybe the input just died */ 
    327         if( p_input == NULL ) 
    328         { 
    329             return VLC_EGENERIC; 
    330         } 
    331  
    332         vlc_mutex_lock( &p_intf->change_lock ); 
    333  
    334         p_intf->p_sys->p_input     = p_input; 
    335         p_intf->p_sys->p_vcdplayer = NULL; 
    336  
    337         p_intf->p_sys->b_move  = false; 
    338         p_intf->p_sys->b_click = false; 
    339         p_intf->p_sys->b_key_pressed = false; 
    340  
    341         vlc_mutex_unlock( &p_intf->change_lock ); 
    342  
    343         return VLC_SUCCESS; 
    344     } 
    345     else 
    346     { 
     320    input_thread_t * p_input; 
     321 
     322    p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_PARENT ); 
     323 
     324    /* Maybe the input just died */ 
     325    if( p_input == NULL ) 
    347326        return VLC_EGENERIC; 
    348     } 
     327 
     328    vlc_mutex_lock( &p_intf->change_lock ); 
     329 
     330    p_intf->p_sys->p_input     = p_input; 
     331    p_intf->p_sys->p_vcdplayer = NULL; 
     332 
     333    p_intf->p_sys->b_move  = false; 
     334    p_intf->p_sys->b_click = false; 
     335    p_intf->p_sys->b_key_pressed = false; 
     336 
     337    vlc_mutex_unlock( &p_intf->change_lock ); 
    349338} 
    350339