Commit 97675912 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: Integration of this convertion dialog in THEDP.

parent 728ebfa0
...@@ -140,7 +140,7 @@ void ConvertDialog::close() ...@@ -140,7 +140,7 @@ void ConvertDialog::close()
{ {
hide(); hide();
QString mrl = "sout=#" + profile->getTranscode(); mrl = "sout=#" + profile->getTranscode();
if( deinterBox->isChecked() ) if( deinterBox->isChecked() )
{ {
mrl.remove( '}' ); mrl.remove( '}' );
......
...@@ -37,12 +37,14 @@ public: ...@@ -37,12 +37,14 @@ public:
ConvertDialog( QWidget *, intf_thread_t * ); ConvertDialog( QWidget *, intf_thread_t * );
virtual ~ConvertDialog(){} virtual ~ConvertDialog(){}
QString getMrl() {return mrl;}
private: private:
QLineEdit *fileLine; QLineEdit *fileLine;
QCheckBox *displayBox; QCheckBox *displayBox, *deinterBox;
QCheckBox *deinterBox;
VLCProfileSelector *profile; VLCProfileSelector *profile;
QString mrl;
private slots: private slots:
virtual void close(); virtual void close();
virtual void cancel(); virtual void cancel();
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include "dialogs/extended.hpp" #include "dialogs/extended.hpp"
#include "dialogs/vlm.hpp" #include "dialogs/vlm.hpp"
#include "dialogs/sout.hpp" #include "dialogs/sout.hpp"
#include "dialogs/convert.hpp"
#include "dialogs/open.hpp" #include "dialogs/open.hpp"
#include "dialogs/openurl.hpp" #include "dialogs/openurl.hpp"
#include "dialogs/help.hpp" #include "dialogs/help.hpp"
...@@ -566,11 +567,21 @@ void DialogsProvider::saveAPlaylist() ...@@ -566,11 +567,21 @@ void DialogsProvider::saveAPlaylist()
void DialogsProvider::streamingDialog( QWidget *parent, QString mrl, void DialogsProvider::streamingDialog( QWidget *parent, QString mrl,
bool b_transcode_only ) bool b_transcode_only )
{ {
SoutDialog *s = SoutDialog::getInstance( parent, p_intf, b_transcode_only ); const char *psz_option;
if( !b_transcode_only )
{
SoutDialog *s = SoutDialog::getInstance( parent, p_intf, b_transcode_only );
if( s->exec() == QDialog::Accepted )
psz_option = qtu( s->getMrl() );
}else {
ConvertDialog *s = new ConvertDialog( parent, p_intf );
if( s->exec() == QDialog::Accepted )
psz_option = qtu( s->getMrl() );
}
if( s->exec() == QDialog::Accepted ) if( !EMPTY_STR( psz_option ) )
{ {
const char *psz_option = qtu( s->getMrl() );
msg_Dbg( p_intf, "Sout mrl %s", psz_option ); msg_Dbg( p_intf, "Sout mrl %s", psz_option );
playlist_AddExt( THEPL, qtu( mrl ), _("Streaming"), playlist_AddExt( THEPL, qtu( mrl ), _("Streaming"),
......
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