← Back to branch summary

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

« back to all changes in this revision

Viewing changes to modules/gui/qt4/dialogs/sout.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/dialogs/sout.cpp
3
3
 ****************************************************************************
4
4
 * Copyright (C) 2007-2009 the VideoLAN team
5
5
 *
6
 
 * $Id: 72759a8b83fa87d33e79f213273a44e3170f1c50 $
 
6
 * $Id: a72a4c5a9869deea3ea1e7f378bcdf04eadd43fc $
7
7
 *
8
8
 * Authors: Clément Stenac <zorglub@videolan.org>
9
9
 *          Jean-Baptiste Kempf <jb@videolan.org>
34
34
#include <QString>
35
35
#include <QFileDialog>
36
36
#include <QToolButton>
 
37
#include <assert.h>
37
38
 
38
39
SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString& inputMRL )
39
40
           : QVLCDialog( parent,  _p_intf )
182
183
                index = ui.destTab->addTab( idb, "Icecast" );
183
184
                CONNECT( idb, mrlUpdated(), this, updateMRL() );
184
185
            }
 
186
            break;
 
187
        default:
 
188
            assert(0);
185
189
    }
186
190
 
187
191
    ui.destTab->setCurrentIndex( index );