Skip to content

V
vlc-1.1
Commit f61dd9ff authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

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

parent 5f7bf43c
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 10 deletions
modules/gui/qt4/dialogs/sout.cpp
View file @ f61dd9ff
...@@ -366,6 +366,13 @@ COUNT() ...@@ -366,6 +366,13 @@ COUNT()
mrl.append( "dst=" ); \ mrl.append( "dst=" ); \
} }
#define CHECKMUX() \
if( sout.psz_mux ) \
{ \
mrl.append( ",mux=");\
mrl.append( sout.psz_mux ); \
}
if ( trans ) if ( trans )
{ {
...@@ -393,8 +400,8 @@ COUNT() ...@@ -393,8 +400,8 @@ COUNT()
{ {
ISMORE(); ISMORE();
ATLEASTONE() ATLEASTONE()
mrl.append( "std{access=file,mux=" ); mrl.append( "std{access=file" );
mrl.append( sout.psz_mux ); CHECKMUX();
mrl.append( ",dst=" ); mrl.append( ",dst=" );
mrl.append( sout.psz_file ); mrl.append( sout.psz_file );
mrl.append( "}" ); mrl.append( "}" );
...@@ -405,8 +412,8 @@ COUNT() ...@@ -405,8 +412,8 @@ COUNT()
{ {
ISMORE(); ISMORE();
ATLEASTONE() ATLEASTONE()
mrl.append( "std{access=http,mux=" ); mrl.append( "std{access=http" );
mrl.append( sout.psz_mux ); CHECKMUX();
mrl.append( ",dst=" ); mrl.append( ",dst=" );
mrl.append( sout.psz_http ); mrl.append( sout.psz_http );
mrl.append( ":" ); mrl.append( ":" );
...@@ -419,8 +426,8 @@ COUNT() ...@@ -419,8 +426,8 @@ COUNT()
{ {
ISMORE(); ISMORE();
ATLEASTONE() ATLEASTONE()
mrl.append( "std{access=mmsh,mux=" ); mrl.append( "std{access=mmsh" );
mrl.append( sout.psz_mux ); CHECKMUX();
mrl.append( ",dst=" ); mrl.append( ",dst=" );
mrl.append( sout.psz_mms ); mrl.append( sout.psz_mms );
mrl.append( ":" ); mrl.append( ":" );
...@@ -433,8 +440,8 @@ COUNT() ...@@ -433,8 +440,8 @@ COUNT()
{ {
ISMORE(); ISMORE();
ATLEASTONE() ATLEASTONE()
mrl.append( "rtp{mux=" ); mrl.append( "rtp{" );
mrl.append( sout.psz_mux ); CHECKMUX();
mrl.append( ",dst=" ); mrl.append( ",dst=" );
mrl.append( sout.psz_rtp ); mrl.append( sout.psz_rtp );
mrl.append( ":" ); mrl.append( ":" );
...@@ -447,8 +454,8 @@ COUNT() ...@@ -447,8 +454,8 @@ COUNT()
{ {
ISMORE(); ISMORE();
ATLEASTONE() ATLEASTONE()
mrl.append( "std{access=udp,mux=" ); mrl.append( "std{access=udp" );
mrl.append( sout.psz_mux ); CHECKMUX();
mrl.append( ",dst=" ); mrl.append( ",dst=" );
mrl.append( sout.psz_udp ); mrl.append( sout.psz_udp );
mrl.append( ":" ); mrl.append( ":" );
...@@ -473,6 +480,8 @@ COUNT() ...@@ -473,6 +480,8 @@ COUNT()
} }
} }
#undef CHECKMUX
if ( sout.b_all_es ) if ( sout.b_all_es )
mrl.append( ":sout-all" ); mrl.append( ":sout-all" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment