From: Ilkka Ollakka <ileoo@videolan.org>
Date: Fri, 5 Oct 2007 11:52:11 +0000 (+0000)
Subject: don't add empty mux= in sout-chain if no mux has been selected
X-Git-Tag: 0.9.0-test0~5191
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f61dd9ff9fbe1bbe22d35a5e6ecdcd0871c93948;p=vlc

don't add empty mux= in sout-chain if no mux has been selected
---

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index f67f8ad042..7840df6d70 100644
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -366,6 +366,13 @@ COUNT()
             mrl.append( "dst=" ); \
         }
 
+#define CHECKMUX() \
+       if( sout.psz_mux ) \
+       {                  \
+         mrl.append( ",mux=");\
+         mrl.append( sout.psz_mux ); \
+       }
+
 
         if ( trans )
         {
@@ -393,8 +400,8 @@ COUNT()
         {
             ISMORE();
             ATLEASTONE()
-                mrl.append( "std{access=file,mux=" );
-            mrl.append( sout.psz_mux );
+                mrl.append( "std{access=file" );
+            CHECKMUX();
             mrl.append( ",dst=" );
             mrl.append( sout.psz_file );
             mrl.append( "}" );
@@ -405,8 +412,8 @@ COUNT()
         {
             ISMORE();
             ATLEASTONE()
-                mrl.append( "std{access=http,mux=" );
-            mrl.append( sout.psz_mux );
+                mrl.append( "std{access=http" );
+            CHECKMUX();
             mrl.append( ",dst=" );
             mrl.append( sout.psz_http );
             mrl.append( ":" );
@@ -419,8 +426,8 @@ COUNT()
         {
             ISMORE();
             ATLEASTONE()
-                mrl.append( "std{access=mmsh,mux=" );
-            mrl.append( sout.psz_mux );
+                mrl.append( "std{access=mmsh" );
+            CHECKMUX();
             mrl.append( ",dst=" );
             mrl.append( sout.psz_mms );
             mrl.append( ":" );
@@ -433,8 +440,8 @@ COUNT()
         {
             ISMORE();
             ATLEASTONE()
-                mrl.append( "rtp{mux=" );
-            mrl.append( sout.psz_mux );
+                mrl.append( "rtp{" );
+            CHECKMUX();
             mrl.append( ",dst=" );
             mrl.append( sout.psz_rtp );
             mrl.append( ":" );
@@ -447,8 +454,8 @@ COUNT()
         {
             ISMORE();
             ATLEASTONE()
-            mrl.append( "std{access=udp,mux=" );
-            mrl.append( sout.psz_mux );
+            mrl.append( "std{access=udp" );
+            CHECKMUX();
             mrl.append( ",dst=" );
             mrl.append( sout.psz_udp );
             mrl.append( ":" );
@@ -473,6 +480,8 @@ COUNT()
         }
     }
 
+#undef CHECKMUX
+
     if ( sout.b_all_es )
         mrl.append( ":sout-all" );