Remove old login dialog code

[vlc] / modules / gui / qt4 / dialogs_provider.cpp

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 0214f3381d71ec4dd4bf37bcaf73482d92e41943..59f1af3a84f79a793a6303c34b1e7b852bd14225 100644 (file)
--- 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"
@@ -182,6 +183,11 @@ void DialogsProvider::extendedDialog()
     ExtendedDialog::getInstance( p_intf )->toggleVisible();
 }
 
+void DialogsProvider::synchroDialog()
+{
+    ExtendedDialog::getInstance( p_intf )->showTab( 2 );
+}
+
 void DialogsProvider::messagesDialog()
 {
     MessagesDialog::getInstance( p_intf )->toggleVisible();
@@ -566,11 +572,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, mrl );
+        if( s->exec() == QDialog::Accepted )
+            psz_option = qtu( s->getMrl() );
+    }else {
+        ConvertDialog *s = new ConvertDialog( parent, p_intf, mrl );
+        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"),
@@ -698,8 +714,7 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
     case INTERACT_DESTROY:
         msg_Dbg( p_intf, "Destroy the Interaction Dialog" );
         qdialog = (InteractionDialog*)(p_dialog->p_private);
-        if( !p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR )
-            delete qdialog;
+        delete qdialog;
         p_dialog->i_status = DESTROYED_DIALOG;
         break;
     }