← Back to branch summary

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

« back to all changes in this revision

Viewing changes to modules/gui/skins2/vars/playtree.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/vars/playtree.hpp
1
1
/*****************************************************************************
2
2
 * playtree.hpp
3
3
 *****************************************************************************
4
 
 * Copyright (C) 2005 VideoLAN
5
 
 * $Id: 3fcf12d8e3731a048c43771c4ccf3f887b614ba3 $
 
4
 * Copyright (C) 2005 the VideoLAN team
 
5
 * $Id$
6
6
 *
7
7
 * Authors: Antoine Cellerier <dionoea@videolan.org>
 
8
 *          Clément Stenac <zorglub@videolan.org>
8
9
 *
9
10
 * This program is free software; you can redistribute it and/or modify
10
11
 * it under the terms of the GNU General Public License as published by
57
58
    private:
58
59
        /// VLC playlist object
59
60
        playlist_t *m_pPlaylist;
60
 
        /// Iconv handle
61
 
        vlc_iconv_t iconvHandle;
62
61
 
63
62
        /// Build the list from the VLC playlist
64
63
        void buildTree();