Changeset c7c447ce6ff25ceb722bfa60184e4eaa0c02708f

Timestamp:

06/09/07 19:59:36 (1 year ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1189101576 +0000

git-parent:

[f77ac5c87be84dcf2a19c4324b59e12ccba6b9f7]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1189101576 +0000

Message:

Qt4 - Optimization of mrl generator. Only needed things are generated.
patch by Jean-François Massol

Files:

• modules/gui/qt4/dialogs/sout.cpp (modified) (10 diffs)
• modules/gui/qt4/dialogs/sout.hpp (modified) (1 diff)
• modules/gui/qt4/dialogs_provider.cpp (modified) (1 diff)

modules/gui/qt4/dialogs/sout.cpp

@@ -90 +90 @@
-
-//     /* Connect everything to the updateMRL function */
-click
+toggl
- #define CT( x ) CONNECT( ui.x, textChanged( const QString ), this, updateMRL() );
- #define CS( x ) CONNECT( ui.x, valueChanged( int ), this, updateMRL() );
@@ -130 +130 @@
-}
-
+QString SoutDialog::getMrl()
+{
+    return this->mrl;
+}
+
-void SoutDialog::fileBrowse()
-{
@@ -257 +262 @@
-    sout_gui_descr_t sout;
-    memset( &sout, 0, sizeof( sout_gui_descr_t ) );
+    int counter = 0;
-
-    sout.b_local = ui.localOutput->isChecked();
@@ -282 +288 @@
-    sout.psz_name = strdup( qtu( ui.sapName->text() ) );
-
+#define COUNT() \
+{ \
+    if ( sout.b_local ) \
+        counter += 1; \
+    if ( sout.b_file ) \
+        counter += 1; \
+    if ( sout.b_http ) \
+        counter += 1; \
+    if ( sout.b_mms ) \
+        counter += 1; \
+    if ( sout.b_udp ) \
+        counter += 1; \
+}
+
+COUNT()
+
-#define SMUX( x, txt ) if( ui.x->isChecked() ) sout.psz_mux = strdup( txt );
-    SMUX( PSMux, "ps" );
@@ -341 +363 @@
-#define ISMORE() if ( more ) mrl.append( "," );
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        {
-            mrl = ":sout=#";
-        }
-
+        if ( counter > 1 )
+        {
+            mrl.append( "duplicate{" );
+        }
+
-        if ( sout.b_local )
-        {
-            ISMORE();
-
+
+
-            more = true;
-        }
@@ -360 +394 @@
-        {
-            ISMORE();
-
+
+
-            mrl.append( sout.psz_mux );
-            mrl.append( ",dst=" );
@@ -371 +406 @@
-        {
-            ISMORE();
-
+
+
-            mrl.append( sout.psz_mux );
-            mrl.append( ",dst=" );
@@ -384 +420 @@
-        {
-            ISMORE();
-
+
+
-            mrl.append( sout.psz_mux );
-            mrl.append( ",dst=" );
@@ -397 +434 @@
-        {
-            ISMORE();
-
+
+
-            mrl.append( sout.psz_mux );
-            mrl.append( ",dst=" );
@@ -417 +455 @@
-        }
-
-trans
+counter > 1
-        {
-            mrl.append( "}" );

modules/gui/qt4/dialogs/sout.hpp

@@ -44 +44 @@
-    virtual ~SoutDialog() {}
-
+    QString getMrl();
-    QString mrl;
-    //sout_gui_descr_t *sout;

modules/gui/qt4/dialogs_provider.cpp

@@ -401 +401 @@
-        int i_len = strlen( qtu(s->mrl) ) + 10;
-        char *psz_option = (char*)malloc(i_len);
-:sout=
+
-
-        playlist_AddExt( THEPL, qtu( mrl ), "Streaming",