Qt4 - VLM improvements... Classing for the three kind of objects, more property editi...

[vlc] / modules / gui / qt4 / dialogs / sout.cpp

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index f9cd7fc12da795f4723ee5cd1ede46a495f6efeb..bfc619c44019fa2e66901a09b1e1a32d35c420d3 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -177,7 +177,7 @@ void SoutDialog::setSTranscodeOptions( bool b_trans )
 
 void SoutDialog::setRawOptions( bool b_raw )
 {
-    if ( b_raw )
+    if( b_raw )
     {
         ui.tabWidget->setDisabled( true );
     }
@@ -207,6 +207,7 @@ void SoutDialog::setOptions()
     }
 
     /* ADD HERE the profiles you want and need */
+    /* FIXME */
     if( profileString == "IPod" ) setProfile( MP4, true, "mp4a", true, "mp4v" )
     else if( profileString == "XBox" ) setProfile( ASF, true, "wma", true, "WMV2" )
 
@@ -258,7 +259,7 @@ void SoutDialog::updateMRL()
 {
     sout_gui_descr_t sout;
     memset( &sout, 0, sizeof( sout_gui_descr_t ) );
-    int counter = 0;
+    unsigned int counter = 0;
 
     sout.b_local = ui.localOutput->isChecked();
     sout.b_file = ui.fileOutput->isChecked();
@@ -299,7 +300,7 @@ void SoutDialog::updateMRL()
     if ( sout.b_mms ) counter++ ;
     if ( sout.b_rtp ) counter++ ;
     if ( sout.b_udp ) counter ++;
-    if ( sout.b_icecast ) counter ++; 
+    if ( sout.b_icecast ) counter ++;
 
 #define SMUX( x, txt ) if( ui.x->isChecked() ) sout.psz_mux = strdup( txt );
     SMUX( PSMux, "ps" );
@@ -312,6 +313,7 @@ void SoutDialog::updateMRL()
     SMUX( WAVMux, "wav" );
     SMUX( RAWMux, "raw" );
     SMUX( FLVMux, "flv" );
+    SMUX( MKVMux, "mkv" );
 
     bool trans = false;
     bool more = false;
@@ -359,12 +361,7 @@ void SoutDialog::updateMRL()
     {
 
 #define ISMORE() if ( more ) mrl.append( "," );
-
-#define ATLEASTONE() \
-        if ( counter > 1 ) \
-        { \
-            mrl.append( "dst=" ); \
-        }
+#define ATLEASTONE() if ( counter ) mrl.append( "dst=" );
 
 #define CHECKMUX() \
        if( sout.psz_mux ) \
@@ -373,7 +370,6 @@ void SoutDialog::updateMRL()
          mrl.append( sout.psz_mux ); \
        }
 
-
         if ( trans )
         {
             mrl.append( ":" );
@@ -383,7 +379,7 @@ void SoutDialog::updateMRL()
             mrl = ":sout=#";
         }
 
-        if ( counter > 1 )
+        if ( counter )
         {
             mrl.append( "duplicate{" );
         }
@@ -474,7 +470,12 @@ void SoutDialog::updateMRL()
             more = true;
         }
 
-        if ( counter > 1 )
+        if( sout.b_icecast )
+        {
+            // TODO
+        }
+
+        if ( counter )
         {
             mrl.append( "}" );
         }