← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vlc/maverick

« back to all changes in this revision

Viewing changes to modules/gui/skins2/commands/cmd_dialogs.hpp

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2008-09-17 21:56:14 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20080917215614-tj0vx8xzd57e52t8
Tags: 0.9.2-1ubuntu1
https://launchpad.net/bugs/270404
https://launchpad.net/bugs/210354
https://launchpad.net/bugs/199870
https://launchpad.net/bugs/261567
* New Upstream Release, exception granted by
    - dktrkranz, norsetto, Hobbsee (via irc). LP: #270404

Changes done in ubuntu:

* add libxul-dev to build-depends
* make sure that vlc is build against libxul in configure. This doesn't
  change anything in the package, but makes it more robust if building
  in an 'unclean' chroot or when modifying the package.
* debian/control: make Vcs-* fields point to the motumedia branch
* add libx264-dev and libass-dev to build-depends
  LP: #210354, #199870
* actually enable libass support by passing --enable-libass to configure
* enable libdca: add libdca-dev to build depends and --enable-libdca
* install the x264 plugin.

Changes already in the pkg-multimedia branch in debian:

* don't install usr/share/vlc/mozilla in debian/mozilla-plugin-vlc.install  
* new upstream .desktop file now registers flash video mimetype LP: #261567
* add Xb-Npp-Applications to mozilla-plugin-vlc
* remove duplicate entries in debian/vlc-nox.install

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gui/skins2/commands/cmd_dialogs.hpp
2
2
 * cmd_dialogs.hpp
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2003 the VideoLAN team
5
 
 * $Id: d8ad6521d41de22f00987ba3bbdf8ad789b38cd2 $
 
5
 * $Id$
6
6
 *
7
7
 * Authors: Cyril Deguet     <asmax@via.ecp.fr>
8
8
 *          Olivier Teulière <ipkiss@via.ecp.fr>
29
29
#include "../src/dialogs.hpp"
30
30
#include "cmd_change_skin.hpp"
31
31
 
32
 
#include <vlc_interaction.h>
 
32
#include <vlc_interface.h>
33
33
 
34
34
template<int TYPE = 0> class CmdDialogs;
35
35
 
169
169
        /// This method does the real job of the command
170
170
        virtual void execute()
171
171
        {
172
 
            if( m_pDialog->i_type == INTERACT_PROGRESS )
173
 
            {
174
 
                 /// \todo Handle progress in the interface
175
 
            }
176
 
            else
177
 
            {
178
 
                /// Get the dialogs provider
179
 
                Dialogs *pDialogs = Dialogs::instance( getIntf() );
180
 
                if( pDialogs == NULL )
181
 
                {
182
 
                    return;
183
 
                }
184
 
                pDialogs->showInteraction( m_pDialog );
185
 
            }
 
172
            /// Get the dialogs provider
 
173
            Dialogs *pDialogs = Dialogs::instance( getIntf() );
 
174
            if( pDialogs == NULL )
 
175
            {
 
176
                return;
 
177
            }
 
178
            pDialogs->showInteraction( m_pDialog );
186
179
        }
187
180
 
188
181
        virtual string getType() const { return "interaction"; }