← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-11-12 15:29:11 UTC
  • mfrom: (3.5.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091112152911-skpz5ubpg18zjedp
Tags: 1.0.3-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
  - backport patch "402_increase_pulseaudio_score.diff"

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gui/qt4/components/simple_preferences.cpp
2
2
 * simple_preferences.cpp : "Simple preferences"
3
3
 ****************************************************************************
4
4
 * Copyright (C) 2006-2008 the VideoLAN team
5
 
 * $Id: 4a3b369b16bb3628a7428e551288b33e207d2b62 $
 
5
 * $Id: 7e7cd39e6f9b6fb64e62ed8e8f493c1b4f9a1e34 $
6
6
 *
7
7
 * Authors: Clément Stenac <zorglub@videolan.org>
8
8
 *          Antoine Cellerier <dionoea@videolan.org>
830
830
                            : Qt::Unchecked );
831
831
 
832
832
    i_temp = 0;
833
 
    aTo( ".asx" ); aTo( ".b4s" ); aTo( ".m3u" ); aTo( ".pls" ); aTo( ".vlc" );
 
833
    aTo( ".asx" ); aTo( ".b4s" ); aTo( ".ifo" ); aTo( ".m3u" ); aTo( ".pls" ); aTo( ".vlc" );
834
834
    aTo( ".xspf" );
835
835
    otherType->setCheckState( 0, ( i_temp > 0 ) ?
836
836
                              ( ( i_temp == audioType->childCount() ) ?