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