[vlc-devel] commit: Qt: Integration of this convertion dialog in THEDP. ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Mar  2 02:20:45 2009 +0100| [9767591258114201e00aee0168c8d4c0ae4bfd4a] | committer: Jean-Baptiste Kempf 

Qt: Integration of this convertion dialog in THEDP.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9767591258114201e00aee0168c8d4c0ae4bfd4a
---

 modules/gui/qt4/dialogs/convert.cpp  |    2 +-
 modules/gui/qt4/dialogs/convert.hpp  |    6 ++++--
 modules/gui/qt4/dialogs_provider.cpp |   17 ++++++++++++++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt4/dialogs/convert.cpp b/modules/gui/qt4/dialogs/convert.cpp
index e548c03..369346e 100644
--- a/modules/gui/qt4/dialogs/convert.cpp
+++ b/modules/gui/qt4/dialogs/convert.cpp
@@ -140,7 +140,7 @@ void ConvertDialog::close()
 {
     hide();
 
-    QString mrl = "sout=#" + profile->getTranscode();
+    mrl = "sout=#" + profile->getTranscode();
     if( deinterBox->isChecked() )
     {
         mrl.remove( '}' );
diff --git a/modules/gui/qt4/dialogs/convert.hpp b/modules/gui/qt4/dialogs/convert.hpp
index e1bd39a..a400e0c 100644
--- a/modules/gui/qt4/dialogs/convert.hpp
+++ b/modules/gui/qt4/dialogs/convert.hpp
@@ -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();
diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 0214f33..0cec713 100644
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -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 )
 {
-    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 );
         playlist_AddExt( THEPL, qtu( mrl ), _("Streaming"),