Changeset 651e249197e50e39b02c011d77f0e0f1373ba590

Show
Ignore:
Timestamp:
05/02/08 18:25:10 (2 months ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1209745510 +0300
git-parent:

[89d56df65a72b099ce6a10bc35c8f4e71dce4f5f]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1209745510 +0300
Message:

Use var_AcquireMutex for the quicktime lock.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc_main.h

    r89d56df r651e249  
    7777 
    7878    vlc_mutex_t            config_lock;    ///< Lock for the config file 
    79 #ifdef __APPLE__ 
    80     vlc_mutex_t            quicktime_lock; ///< QT is not thread safe on OSX 
    81 #endif 
    8279 
    8380    /* Structure storing the action name / key associations */ 

  • modules/gui/macosx/voutqt.m

    r449fd28 r651e249  
    166166    } 
    167167 
    168     /* Damn QT isn't thread safe. so keep a lock in the p_libvlc object */ 
    169     vlc_mutex_lock( &p_vout->p_libvlc->quicktime_lock ); 
     168    /* Damn QT isn't thread safe, so keep a process-wide lock */ 
     169    vlc_mutex_t *p_qtlock = var_AcquireMutex( "quicktime_mutex" ); 
    170170 
    171171    /* Can we find the right chroma ? */ 
    …… 
    180180                        nil, &p_vout->p_sys->img_dc ); 
    181181    } 
    182     vlc_mutex_unlock( &p_vout->p_libvlc->quicktime_lock ); 
     182    vlc_mutex_unlock( p_qtlock ); 
    183183  
    184184    if( err == noErr && p_vout->p_sys->img_dc != 0 ) 

  • src/libvlc-common.c

    r77d07c4 r651e249  
    213213    vlc_mutex_init( p_libvlc, &p_libvlc->config_lock ); 
    214214#ifdef __APPLE__ 
    215     vlc_mutex_init( p_libvlc, &p_libvlc->quicktime_lock ); 
    216215    vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW ); 
    217216#endif