← 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/controller_widget.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/controller_widget.cpp
2
2
 * Controller_widget.cpp : Controller Widget for the controllers
3
3
 ****************************************************************************
4
4
 * Copyright (C) 2006-2008 the VideoLAN team
5
 
 * $Id: 449e1972ee2af8ce0fccbd525ae98c659d024d61 $
 
5
 * $Id: dc2983df34b291da27e33815f78a43ce3db480e7 $
6
6
 *
7
7
 * Authors: Jean-Baptiste Kempf <jb@videolan.org>
8
8
 *
42
42
 
43
43
SoundWidget::SoundWidget( QWidget *_parent, intf_thread_t * _p_intf,
44
44
                          bool b_shiny, bool b_special )
45
 
                         : QWidget( _parent ), b_my_volume( false ),
46
 
                           p_intf( _p_intf)
 
45
                         : QWidget( _parent ), p_intf( _p_intf),
 
46
                           b_my_volume( false )
47
47
{
48
48
    /* We need a layout for this widget */
49
49
    QHBoxLayout *layout = new QHBoxLayout( this );