[vlc-commits] Qt4: remove broken SAP widgets in streaming wizard (fixes #4322)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Aug 23 17:39:35 2012 +0300| [59243239463fe1147dd37856314161dfe43d354b] | committer: Rémi Denis-Courmont

Qt4: remove broken SAP widgets in streaming wizard (fixes #4322)

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

 modules/gui/qt4/dialogs/sout.cpp |   26 +-------------------------
 modules/gui/qt4/ui/sout.ui       |   20 --------------------
 2 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index 556d8bf..eb6fab5 100644
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -84,7 +84,7 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString&
 #define CC( x ) CONNECT( ui.x, currentIndexChanged( int ), this, updateMRL() );
 
     /* Misc */
-    CB( soutAll );  CT( sapName ); CT( sapGroup );
+    CB( soutAll );
     CB( localOutput ); CB( transcodeBox );
     CONNECT( ui.profileSelect, optionsChanged(), this, updateMRL() );
 
@@ -219,30 +219,6 @@ void SoutDialog::updateMRL()
 
     mrl = smrl.getMrl();
 
-    if( ui.sap->isChecked() )
-    {
-        QString group = ui.sapGroup->text();
-        QString name = ui.sapName->text();
-
-        /* FIXME: This sucks. We should really return a QStringList instead of
-         * (mis)quoting, concatenating and split input item paramters. */
-        name = name.replace( " ", " " );
-        group = group.replace( " ", " " );
-
-        /* We need to add options for both standard and rtp targets */
-        /* This is inelegant but simple and functional */
-        mrl.append( qfu( " :sout-rtp-sap" ) );
-        mrl.append( qfu( " :sout-rtp-name=" ) + name );
-        mrl.append( qfu( " :sout-standard-sap" ) );
-        mrl.append( qfu( " :sout-standard-name=" ) + name );
-        mrl.append( qfu( " :sout-standard-group=" ) + group );
-    }
-    else
-    {
-        mrl.append( qfu( " :no-sout-rtp-sap" ) );
-        mrl.append( qfu( " :no-sout-standard-sap" ) );
-    }
-
     if( ui.soutAll->isChecked() ) mrl.append( " :sout-all" );
 
     mrl.append( " :sout-keep" );
diff --git a/modules/gui/qt4/ui/sout.ui b/modules/gui/qt4/ui/sout.ui
index c08b82c..4adaf37 100644
--- a/modules/gui/qt4/ui/sout.ui
+++ b/modules/gui/qt4/ui/sout.ui
@@ -168,26 +168,6 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QCheckBox" name="sap">
-         <property name="text">
-          <string>SAP announce</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QLineEdit" name="sapName"/>
-       </item>
-       <item row="1" column="2">
-        <widget class="QLabel" name="sapGroupLabel">
-         <property name="text">
-          <string>Group name</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="3">
-        <widget class="QLineEdit" name="sapGroup"/>
-       </item>
       </layout>
      </widget>
     </item>