Qt4: remove audio/video port from RTP streaming wizard

diff --git a/modules/gui/qt4/components/sout/sout_widgets.cpp b/modules/gui/qt4/components/sout/sout_widgets.cpp
index 7961c49b7b061074d1392094ccd2d8a770faf4ec..ca10b76fc4694639b9507d5c14afa6241820c534 100644 (file)
--- a/modules/gui/qt4/components/sout/sout_widgets.cpp
+++ b/modules/gui/qt4/components/sout/sout_widgets.cpp
@@ -275,7 +275,7 @@ RTPDestBox::RTPDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
     layout->addWidget(rtpOutput, 0, 0, 1, -1);
 
     QLabel *RTPLabel = new QLabel( qtr("Address"), this );
-    QLabel *RTPPortLabel = new QLabel( qtr("Port"), this );
+    QLabel *RTPPortLabel = new QLabel( qtr("Base port"), this );
     layout->addWidget(RTPLabel, 1, 0, 1, 1);
     layout->addWidget(RTPPortLabel, 2, 0, 1, 1);
 
@@ -288,34 +288,10 @@ RTPDestBox::RTPDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
     RTPPort->setMaximum(65535);
     RTPPort->setValue(5004);
 
-    RTPPortAudio = new QSpinBox(this);
-    RTPPortAudio->setMaximumSize(QSize(90, 16777215));
-    RTPPortAudio->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-    RTPPortAudio->setMinimum(-1);
-    RTPPortAudio->setMaximum(65535);
-    RTPPortAudio->setValue(-1);
-
-    RTPPortVideo = new QSpinBox(this);
-    RTPPortVideo->setMaximumSize(QSize(90, 16777215));
-    RTPPortVideo->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-    RTPPortVideo->setMinimum(-1);
-    RTPPortVideo->setMaximum(65535);
-    RTPPortVideo->setValue(-1);
-
     layout->addWidget(RTPEdit, 1, 1, 1, 1);
     layout->addWidget(RTPPort, 2, 1, 1, 1);
 
-    QLabel *RTPPortAudioLabel = new QLabel( qtr("Audio Port"), this );
-    QLabel *RTPPortVideoLabel = new QLabel( qtr("Video Port"), this );
-    layout->addWidget(RTPPortAudioLabel, 3, 0, 1, 1);
-    layout->addWidget(RTPPortAudio, 3, 1, 1, 1);
-    layout->addWidget(RTPPortVideoLabel, 3, 2, 1, 1);
-    layout->addWidget(RTPPortVideo, 3, 3, 1, 1);
-
-
     CS( RTPPort );
-    CS( RTPPortAudio );
-    CS( RTPPortVideo );
     CT( RTPEdit );
 }
 
@@ -329,12 +305,6 @@ QString RTPDestBox::getMRL( const QString& mux )
     m.option( "port", RTPPort->value() );
     if( !mux.isEmpty() )
         m.option( "mux", mux );
-    if( mux.isEmpty() || mux.compare( "ts", Qt::CaseInsensitive ) )
-    {
-
-        m.option( "port-audio", RTPPortAudio->value() );
-        m.option( "port-video", RTPPortVideo->value() );
-    }
     m.end();
 
     return m.getMrl();

diff --git a/modules/gui/qt4/components/sout/sout_widgets.hpp b/modules/gui/qt4/components/sout/sout_widgets.hpp
index ff2038f2b20fe53fae0678b1ca963ce3f35b8fee..59dfa72eb6fb09e215451b0628a4b29c4b94fbf0 100644 (file)
--- a/modules/gui/qt4/components/sout/sout_widgets.hpp
+++ b/modules/gui/qt4/components/sout/sout_widgets.hpp
@@ -110,8 +110,6 @@ class RTPDestBox: public VirtualDestBox
     private:
         QLineEdit *RTPEdit;
         QSpinBox *RTPPort;
-        QSpinBox *RTPPortVideo;
-        QSpinBox *RTPPortAudio;
 };
 
 class ICEDestBox: public VirtualDestBox