Commit c8ab1739 authored by Rémi Duraffort's avatar Rémi Duraffort

QT4_vlm: really fix #3938.

parent f6f5286a
...@@ -199,6 +199,11 @@ QString OpenDialog::getMRL( bool b_all ) ...@@ -199,6 +199,11 @@ QString OpenDialog::getMRL( bool b_all )
: itemsMRL[0]; : itemsMRL[0];
} }
QString OpenDialog::getOptions()
{
return ui.advancedLineInput->text();
}
/* Finish the dialog and decide if you open another one after */ /* Finish the dialog and decide if you open another one after */
void OpenDialog::setMenuAction() void OpenDialog::setMenuAction()
{ {
......
...@@ -71,6 +71,7 @@ public: ...@@ -71,6 +71,7 @@ public:
void showTab( int = OPEN_FILE_TAB ); void showTab( int = OPEN_FILE_TAB );
QString getMRL( bool b = true ); QString getMRL( bool b = true );
QString getOptions();
public slots: public slots:
void selectSlots(); void selectSlots();
......
This diff is collapsed.
...@@ -83,6 +83,8 @@ private: ...@@ -83,6 +83,8 @@ private:
Ui::Vlm ui; Ui::Vlm ui;
QString inputOptions;
QList<VLMAWidget *> vlmItems; QList<VLMAWidget *> vlmItems;
int currentIndex; int currentIndex;
...@@ -117,24 +119,28 @@ public: ...@@ -117,24 +119,28 @@ public:
VLMWrapper( vlm_t * ); VLMWrapper( vlm_t * );
virtual ~VLMWrapper(); virtual ~VLMWrapper();
static void AddBroadcast( const QString&, const QString&, const QString&, static void AddBroadcast( const QString&, const QString&,
bool b_enabled = true, const QString&, const QString&,
bool b_loop = false ); bool b_enabled = true, bool b_loop = false );
static void EditBroadcast( const QString&, const QString&, const QString&, static void EditBroadcast( const QString&, const QString&,
bool b_enabled = true, const QString&, const QString&,
bool b_loop = false ); bool b_enabled = true, bool b_loop = false );
static void EditSchedule( const QString&, const QString&, const QString&, static void EditSchedule( const QString&, const QString&,
QDateTime _schetime, QDateTime _schedate, const QString&, const QString&,
int _scherepeatnumber, int _repeatDays, QDateTime _schetime, QDateTime _schedate,
bool b_enabled = true, const QString& mux = "" ); int _scherepeatnumber, int _repeatDays,
static void AddVod( const QString&, const QString&, const QString&, bool b_enabled = true, const QString& mux = "" );
bool b_enabled = true, const QString& mux = "" ); static void AddVod( const QString&, const QString&,
static void EditVod( const QString&, const QString&, const QString&, const QString&, const QString&,
bool b_enabled = true, const QString& mux = "" ); bool b_enabled = true, const QString& mux = "" );
static void AddSchedule( const QString&, const QString&, const QString&, static void EditVod( const QString&, const QString&,
QDateTime _schetime, QDateTime _schedate, const QString&, const QString&,
int _scherepeatnumber, int _repeatDays, bool b_enabled = true, const QString& mux = "" );
bool b_enabled = true, const QString& mux = "" ); static void AddSchedule( const QString&, const QString&,
const QString&, const QString&,
QDateTime _schetime, QDateTime _schedate,
int _scherepeatnumber, int _repeatDays,
bool b_enabled = true, const QString& mux = "" );
static void ControlBroadcast( const QString&, int, unsigned int seek = 0 ); static void ControlBroadcast( const QString&, int, unsigned int seek = 0 );
static void EnableItem( const QString&, bool ); static void EnableItem( const QString&, bool );
...@@ -153,13 +159,15 @@ class VLMAWidget : public QGroupBox ...@@ -153,13 +159,15 @@ class VLMAWidget : public QGroupBox
Q_OBJECT Q_OBJECT
friend class VLMDialog; friend class VLMDialog;
public: public:
VLMAWidget( const QString& name, const QString& input, const QString& output, VLMAWidget( const QString& name, const QString& input,
bool _enable, VLMDialog *parent, int _type = QVLM_Broadcast ); const QString& inputOptions, const QString& output,
bool _enable, VLMDialog *parent, int _type = QVLM_Broadcast );
virtual void update() = 0; virtual void update() = 0;
protected: protected:
QLabel *nameLabel; QLabel *nameLabel;
QString name; QString name;
QString input; QString input;
QString inputOptions;
QString output; QString output;
bool b_enabled; bool b_enabled;
int type; int type;
...@@ -176,8 +184,9 @@ class VLMBroadcast : public VLMAWidget ...@@ -176,8 +184,9 @@ class VLMBroadcast : public VLMAWidget
Q_OBJECT Q_OBJECT
friend class VLMDialog; friend class VLMDialog;
public: public:
VLMBroadcast( const QString& name, const QString& input, const QString& output, VLMBroadcast( const QString& name, const QString& input,
bool _enable, bool _loop, VLMDialog *parent ); const QString& inputOptions, const QString& output,
bool _enable, bool _loop, VLMDialog *parent );
void update(); void update();
private: private:
bool b_looped; bool b_looped;
...@@ -194,7 +203,8 @@ class VLMVod : public VLMAWidget ...@@ -194,7 +203,8 @@ class VLMVod : public VLMAWidget
Q_OBJECT Q_OBJECT
friend class VLMDialog; friend class VLMDialog;
public: public:
VLMVod( const QString& name, const QString& input, const QString& output, VLMVod( const QString& name, const QString& input,
const QString& inputOptions, const QString& output,
bool _enable, const QString& _mux, VLMDialog *parent ); bool _enable, const QString& _mux, VLMDialog *parent );
void update(); void update();
private: private:
...@@ -207,9 +217,10 @@ class VLMSchedule : public VLMAWidget ...@@ -207,9 +217,10 @@ class VLMSchedule : public VLMAWidget
Q_OBJECT Q_OBJECT
friend class VLMDialog; friend class VLMDialog;
public: public:
VLMSchedule( const QString& name, const QString& input, const QString& output, VLMSchedule( const QString& name, const QString& input,
QDateTime schetime, QDateTime schedate, int repeatnumber, const QString& inputOptions, const QString& output,
int repeatdays, bool enabled, VLMDialog *parent ); QDateTime schetime, QDateTime schedate, int repeatnumber,
int repeatdays, bool enabled, VLMDialog *parent );
void update(); void update();
private: private:
QDateTime schetime; QDateTime schetime;
......
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