← Back to branch summary

~ubuntu-branches/ubuntu/natty/vlc/natty

« back to all changes in this revision

Viewing changes to modules/gui/qt4/dialogs/vlm.hpp

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-06-25 01:09:16 UTC
  • mfrom: (1.1.30 upstream)
  • Revision ID: james.westby@ubuntu.com-20100625010916-asxhep2mutg6g6pd
Tags: 1.1.0-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - build and install the libx264 plugin
  - add Xb-Npp header to vlc package
  - Add apport hook to include more vlc dependencies in bug reports
* Drop xulrunner patches.
* Drop 502_xulrunner_191.diff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gui/qt4/dialogs/vlm.hpp
2
2
 * vlm.hpp : VLM Management
3
3
 ****************************************************************************
4
4
 * Copyright ( C ) 2006 the VideoLAN team
5
 
 * $Id: 3a13b7ac88b3e277c58435f76c7949b619e58a38 $
 
5
 * $Id: bcb89dc53ea857d8aebe51f782ec6e8c24373e9a $
6
6
 *
7
7
 * Authors: Jean-François Massol <jf.massol@gmail.com>
8
8
 *          Jean-Baptiste Kempf <jb@videolan.org>
35
35
 
36
36
#include "ui/vlm.h"
37
37
#include "util/qvlcframe.hpp"
 
38
#include "util/singleton.hpp"
38
39
#include <QDateTime>
39
40
 
40
41
enum{
67
68
class VLMWrapper;
68
69
 
69
70
 
70
 
class VLMDialog : public QVLCDialog
 
71
class VLMDialog : public QVLCDialog, public Singleton<VLMDialog>
71
72
{
72
 
    Q_OBJECT;
 
73
    Q_OBJECT
 
74
 
73
75
public:
74
 
    static VLMDialog * getInstance( intf_thread_t *p_intf )
75
 
    {
76
 
        if( !instance)
77
 
             instance = new VLMDialog( (QWidget *)p_intf->p_sys->p_mi, p_intf );
78
 
        return instance;
79
 
    };
80
 
    virtual ~VLMDialog();
81
76
    void toggleVisible();
82
77
 
83
78
    VLMWrapper *vlmWrapper;
84
79
    vlm_t *p_vlm;
85
80
private:
86
 
    VLMDialog( QWidget *, intf_thread_t * );
87
 
    static VLMDialog *instance;
 
81
    VLMDialog( intf_thread_t * );
 
82
    virtual ~VLMDialog();
 
83
 
88
84
    Ui::Vlm ui;
89
85
 
90
86
    QList<VLMAWidget *> vlmItems;
111
107
    void selectOutput();
112
108
    bool exportVLMConf();
113
109
    bool importVLMConf();
 
110
 
 
111
    friend class    Singleton<VLMDialog>;
114
112
};
115
113
 
116
114
class VLMWrapper