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

Qt4 - Fix previous commit.

parent b3819c32
...@@ -30,10 +30,11 @@ ...@@ -30,10 +30,11 @@
#include "dialogs/sout.hpp" #include "dialogs/sout.hpp"
#include <vlc_streaming.h> #include <vlc_streaming.h>
#include <iostream>
#include <QString> #include <QString>
#include <QFileDialog> #include <QFileDialog>
SoutDialog* SoutDialog::instance = NULL;
SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf,
bool _transcode_only ) : QVLCDialog( parent, _p_intf ) bool _transcode_only ) : QVLCDialog( parent, _p_intf )
{ {
......
...@@ -39,8 +39,7 @@ class SoutDialog : public QVLCDialog ...@@ -39,8 +39,7 @@ class SoutDialog : public QVLCDialog
{ {
Q_OBJECT; Q_OBJECT;
public: public:
static SoutDialog * getInstance( QWidget *parent, static SoutDialog* getInstance( QWidget *parent, intf_thread_t *p_intf,
intf_thread_t *p_intf,
bool transcode_only ) bool transcode_only )
{ {
if( !instance ) if( !instance )
...@@ -55,18 +54,17 @@ public: ...@@ -55,18 +54,17 @@ public:
} }
} }
return instance; return instance;
}; }
virtual ~SoutDialog(); virtual ~SoutDialog(){}
QString getMrl(){ return mrl; } QString getMrl(){ return mrl; }
private: private:
Ui::Sout ui;
static SoutDialog *instance;
SoutDialog( QWidget* parent, intf_thread_t *, SoutDialog( QWidget* parent, intf_thread_t *,
bool _transcode_only = false ); bool _transcode_only = false );
static SoutDialog *instance;
Ui::Sout ui;
QPushButton *okButton; QPushButton *okButton;
QString mrl; QString mrl;
bool b_transcode_only; bool b_transcode_only;
......
...@@ -446,7 +446,6 @@ void DialogsProvider::openThenTranscodingDialogs() ...@@ -446,7 +446,6 @@ void DialogsProvider::openThenTranscodingDialogs()
->showTab( 0 ); ->showTab( 0 );
} }
/**************************************************************************** /****************************************************************************
* Menus / Interaction * 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