Changeset a9a790365bb678fddc63b3b0fb9c09a14661a611

Show
Ignore:
Timestamp:
24/08/08 14:50:42 (3 months ago)
Author:
Rémi Denis-Courmont <rdenis@simphalempin.com>
git-committer:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1219582242 +0300
git-parent:

[94c911fabf7c97ed428a6c2cbd5f831e80f8c3d7]

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

Work aroundWWFix VLM multiple thread join (closes #1907)

Educational advisory:
This commit is not suitable for developpers yet in training.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/input/vlm.c

    r0bb7a50 ra9a7903  
    156156    var_Get( p_vlm->p_libvlc, "vlm_mutex", &lockval ); 
    157157    vlc_mutex_lock( lockval.p_address ); 
    158     vlc_object_kill( p_vlm ); 
    159     vlc_thread_join( p_vlm ); 
     158    /* Parental advisory: terrific humongous horrible follows... 
     159     * This is so that vlc_object_destroy() (from vlc_object_release()) will 
     160     * NOT join our thread. See also vlm_Destructor(). 
     161     * -- Courmisch, 24/08/2008 */ 
     162    vlc_internals( p_vlm )->b_thread = false; 
    160163    vlc_object_release( p_vlm ); 
    161164    vlc_mutex_unlock( lockval.p_address ); 
    …… 
    175178    TAB_CLEAN( p_vlm->schedule, p_vlm->schedule ); 
    176179 
     180    vlc_object_kill( p_vlm ); 
     181    /* Continuation of the vlm_Delete() hack. -- Courmisch */ 
     182    vlc_internals( p_vlm )->b_thread = true; 
     183    vlc_thread_join( p_vlm ); 
    177184    vlc_mutex_destroy( &p_vlm->lock ); 
    178185}