← Back to branch summary

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

« back to all changes in this revision

Viewing changes to modules/gui/qt4/qt4.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/qt4.cpp
2
2
 * qt4.cpp : QT4 interface
3
3
 ****************************************************************************
4
4
 * Copyright © 2006-2009 the VideoLAN team
5
 
 * $Id: 962992191f58631c8fb18dffcd16c35e460f9ada $
 
5
 * $Id: 49e77329083d5b6bd7b4cf94c7fe8e28abb1bb2e $
6
6
 *
7
7
 * Authors: Clément Stenac <zorglub@videolan.org>
8
8
 *          Jean-Baptiste Kempf <jb@videolan.org>
550
550
    msg_Dbg (obj, "requesting video...");
551
551
 
552
552
#if defined (Q_WS_X11)
553
 
    wnd->handle.xid = p_mi->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
554
 
                                          &wnd->width, &wnd->height);
 
553
    wnd->handle.xid = p_mi->getVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
 
554
                                      &wnd->width, &wnd->height);
555
555
    if (!wnd->handle.xid)
556
556
        return VLC_EGENERIC;
557
557
 
558
558
#elif defined (WIN32)
559
 
    wnd->handle.hwnd = p_mi->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
560
 
                                           &wnd->width, &wnd->height);
 
559
    wnd->handle.hwnd = p_mi->getVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
 
560
                                       &wnd->width, &wnd->height);
561
561
    if (!wnd->handle.hwnd)
562
562
        return VLC_EGENERIC;
563
563