Commit 6db8acaa authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - Fix previous commit.

parent b3819c32
......@@ -30,10 +30,11 @@
#include "dialogs/sout.hpp"
#include <vlc_streaming.h>
#include <iostream>
#include <QString>
#include <QFileDialog>
SoutDialog* SoutDialog::instance = NULL;
SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf,
bool _transcode_only ) : QVLCDialog( parent, _p_intf )
{
......
......@@ -39,8 +39,7 @@ class SoutDialog : public QVLCDialog
{
Q_OBJECT;
public:
static SoutDialog * getInstance( QWidget *parent,
intf_thread_t *p_intf,
static SoutDialog* getInstance( QWidget *parent, intf_thread_t *p_intf,
bool transcode_only )
{
if( !instance )
......@@ -55,18 +54,17 @@ public:
}
}
return instance;
};
}
virtual ~SoutDialog();
virtual ~SoutDialog(){}
QString getMrl(){ return mrl; }
private:
Ui::Sout ui;
static SoutDialog *instance;
SoutDialog( QWidget* parent, intf_thread_t *,
bool _transcode_only = false );
static SoutDialog *instance;
Ui::Sout ui;
QPushButton *okButton;
QString mrl;
bool b_transcode_only;
......
......@@ -446,7 +446,6 @@ void DialogsProvider::openThenTranscodingDialogs()
->showTab( 0 );
}
/****************************************************************************
* Menus / Interaction
****************************************************************************/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment