Changeset 6059d32eaba8a12fe2b84d78780456e978fdc208

Show
Ignore:
Timestamp:
22/06/08 15:26:16 (4 months ago)
Author:
Rémi Denis-Courmont <rdenis@simphalempin.com>
git-committer:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1214141176 +0300
git-parent:

[19685d00b2e6230a42a52cef095740fe999e8239]

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

Remove superfluous locking

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/qt4/components/interface_widgets.cpp

    r19685d0 r6059d32  
    4848#include <QResizeEvent> 
    4949#include <QDate> 
    50 #include <QMutexLocker> 
    5150#ifdef Q_WS_X11 
    5251# include <X11/Xlib.h> 
    …… 
    6463    vlc_mutex_init( &lock ); 
    6564    p_vout = NULL; 
    66     handleReady = false; 
    6765    hide(); setMinimumSize( 16, 16 ); 
    6866    videoSize.rwidth() = -1; 
    …… 
    9492    XFlush( QX11Info::display() ); 
    9593#endif 
    96     QMutexLocker locker( &handleLock ); 
    97     handleReady = true; 
    98     handleWait.wakeAll(); 
    9994} 
    10095 
    …… 
    125120                           unsigned int *pi_width, unsigned int *pi_height ) 
    126121{ 
    127     QMutexLocker locker( &handleLock ); 
    128122    msg_Dbg( p_intf, "Video was requested %i, %i", *pi_x, *pi_y ); 
    129123    emit askVideoWidgetToShow(); 
    …… 
    134128    } 
    135129    p_vout = p_nvout; 
    136     while( !handleReady ) 
    137     { 
    138         msg_Dbg( p_intf, "embedded video pending (handle %p)", winId() ); 
    139         handleWait.wait( &handleLock ); 
    140     } 
    141130    msg_Dbg( p_intf, "embedded video ready (handle %p)", winId() ); 
    142131    return ( void* )winId(); 

  • modules/gui/qt4/components/interface_widgets.hpp

    r19685d0 r6059d32  
    4141#include <QWidget> 
    4242#include <QFrame> 
    43 #include <QMutex> 
    44 #include <QWaitCondition> 
    4543 
    4644#define VOLUME_MAX 200 
    …… 
    9290    vlc_mutex_t lock; 
    9391    QSize videoSize; 
    94     QMutex         handleLock; 
    95     QWaitCondition handleWait; 
    96     bool           handleReady; 
    9792 
    9893signals: