← Back to branch summary

~ubuntu-branches/ubuntu/lucid/vlc/lucid-security

« back to all changes in this revision

Viewing changes to modules/gui/qt4/components/interface_widgets.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2009-09-25 14:44:17 UTC
  • mfrom: (3.5.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090925144417-87vomt575d0agvqa
Tags: 1.0.2-1ubuntu1
https://launchpad.net/bugs/435524
* Merge from Debian unstable (LP: #435524), remaining changes:
  - build against xulrunner-dev instead of iceape-dev
  - build against libx264-dev and install libx264 plugin
  - add Xb-Npp header to vlc package
  - recommend vlc-plugin-pulse for vlc

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gui/qt4/components/interface_widgets.cpp
2
2
 * interface_widgets.cpp : Custom widgets for the main interface
3
3
 ****************************************************************************
4
4
 * Copyright (C) 2006-2008 the VideoLAN team
5
 
 * $Id: 6b35a3609744cf4c80845c5c42f9c67ba75ae7d4 $
 
5
 * $Id: 895d5286fcd7c4b26c8f4a4551f50bf541692957 $
6
6
 *
7
7
 * Authors: Clément Stenac <zorglub@videolan.org>
8
8
 *          Jean-Baptiste Kempf <jb@videolan.org>
45
45
#ifdef Q_WS_X11
46
46
# include <X11/Xlib.h>
47
47
# include <qx11info_x11.h>
 
48
static void videoSync( void )
 
49
{
 
50
    /* Make sure the X server has processed all requests.
 
51
     * This protects other threads using distinct connections from getting
 
52
     * the video widget window in an inconsistent states. */
 
53
    XSync( QX11Info::display(), False );
 
54
}
 
55
#else
 
56
# define videoSync() (void)0
48
57
#endif
49
58
 
50
59
#include <math.h>
113
122
        return NULL;
114
123
    }
115
124
    p_vout = p_nvout;
 
125
 
 
126
    videoSync();
116
127
#ifndef NDEBUG
117
128
    msg_Dbg( p_intf, "embedded video ready (handle %p)", (void *)winId() );
118
129
#endif
129
140
    videoSize.rheight() = h;
130
141
    if( !isVisible() ) show();
131
142
    updateGeometry(); // Needed for deinterlace
 
143
    videoSync();
132
144
}
133
145
 
134
146
void VideoWidget::release( void )