]> git.sesse.net Git - vlc/commitdiff
Qt: fix some parsing of SOut options.
authorJean-Baptiste Kempf <jb@videolan.org>
Fri, 24 Apr 2009 17:48:01 +0000 (19:48 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Fri, 24 Apr 2009 17:48:01 +0000 (19:48 +0200)
Close #1853

modules/gui/qt4/dialogs/convert.cpp
modules/gui/qt4/dialogs_provider.cpp

index 0e71944d3e702cd73fbfd0b8cbd1bfe43403165a..59f0518c8855fa33d46067f5f4807217a4808049 100644 (file)
@@ -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
     {
index a708290c4a1763523b714a8e8c7dabb953fc0891..23fd3e63c0f68eba2d48b405964b615ae84f1465 100644 (file)
@@ -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@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,