[vlc-devel] commit: Qt: fix some parsing of SOut options. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Apr 24 19:48:01 2009 +0200| [bce50f87f34a9009341c5c0186041d9f45bde7dd] | committer: Jean-Baptiste Kempf 

Qt: fix some parsing of SOut options.

Close #1853

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

 modules/gui/qt4/dialogs/convert.cpp  |    2 +-
 modules/gui/qt4/dialogs_provider.cpp |    9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt4/dialogs/convert.cpp b/modules/gui/qt4/dialogs/convert.cpp
index 0e71944..59f0518 100644
--- a/modules/gui/qt4/dialogs/convert.cpp
+++ b/modules/gui/qt4/dialogs/convert.cpp
@@ -124,7 +124,7 @@ void ConvertDialog::close()
 
     if( dumpBox->isChecked() )
     {
-        mrl = "demux=dump :demuxdump-file" + fileLine->text();
+        mrl = "demux=dump :demuxdump-file=" + fileLine->text();
     }
     else
     {
diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index a708290..23fd3e6 100644
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * dialogs_provider.cpp : Dialog Provider
  *****************************************************************************
- * Copyright (C) 2006-2008 the VideoLAN team
+ * Copyright (C) 2006-2009 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub at videolan.org>
@@ -606,6 +606,8 @@ void DialogsProvider::streamingDialog( QWidget *parent,
     /* Get SoutMRL */
     if( !EMPTY_STR( psz_soutoption ) )
     {
+        options += QString( psz_soutoption ).split( " :");
+
         /* Create Input */
         input_item_t *p_input;
         p_input = input_item_New( p_intf, qtu( mrl ), _("Streaming") );
@@ -618,13 +620,10 @@ void DialogsProvider::streamingDialog( QWidget *parent,
             {
                 input_item_AddOption( p_input, qtu( qs ),
                         VLC_INPUT_OPTION_TRUSTED );
+                msg_Dbg( p_intf, "Adding option: %s", qtu( qs ) );
             }
         }
 
-        /* Add SoutMRL */
-        msg_Dbg( p_intf, "Streaming MRL is: %s", psz_soutoption );
-        input_item_AddOption( p_input, psz_soutoption, VLC_INPUT_OPTION_TRUSTED );
-
         /* Switch between enqueuing and starting the item */
         /* FIXME: playlist_AddInput() can fail */
         playlist_AddInput( THEPL, p_input,