[vlc-commits] Qt: convert: merge sout chain as args

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Feb 26 13:43:49 2018 +0100| [a9b3501427622c28bfed0796753ec386e4374bc9] | committer: Francois Cartegnie

Qt: convert: merge sout chain as args

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

 modules/gui/qt/dialogs/convert.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/gui/qt/dialogs/convert.cpp b/modules/gui/qt/dialogs/convert.cpp
index c4ef6a3717..f48be56396 100644
--- a/modules/gui/qt/dialogs/convert.cpp
+++ b/modules/gui/qt/dialogs/convert.cpp
@@ -195,10 +195,6 @@ void ConvertDialog::close()
                 mrl += ",deinterlace}";
             }
             mrl += ":";
-            if( displayBox->isChecked() )
-            {
-                mrl += "duplicate{dst=display,dst=";
-            }
 
             // Only one file, use the destination provided
             if(singleFileSelected)
@@ -235,10 +231,12 @@ void ConvertDialog::close()
 
             newFileName.replace( QChar('\''), "\\\'" );
 
-            mrl += QString("std{access=file{no-overwrite},mux=%1,dst='%2'}")
-                           .arg( profile->getMux() ).arg( newFileName );
+            QString chain = QString("std{access=file{no-overwrite},mux=%1,dst='%2'}")
+                                    .arg( profile->getMux() ).arg( newFileName );
             if( displayBox->isChecked() )
-                mrl += "}";
+                mrl += QString( "duplicate{dst=display,dst=%1}" ).arg( chain );
+            else
+                mrl += chain;
         }
         msg_Dbg( p_intf, "Transcode MRL: %s", qtu( mrl ) );
         mrls.append(mrl);