[vlc-devel] commit: Qt4: remove audio/video port from RTP streaming wizard ( Rémi Denis-Courmont )
git version control
git at videolan.org
Mon Nov 30 18:03:48 CET 2009
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Nov 30 19:03:25 2009 +0200| [60e75ffe8f3643379916d86625203426854df5e5] | committer: Rémi Denis-Courmont
Qt4: remove audio/video port from RTP streaming wizard
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=60e75ffe8f3643379916d86625203426854df5e5
---
modules/gui/qt4/components/sout/sout_widgets.cpp | 32 +---------------------
modules/gui/qt4/components/sout/sout_widgets.hpp | 2 -
2 files changed, 1 insertions(+), 33 deletions(-)
diff --git a/modules/gui/qt4/components/sout/sout_widgets.cpp b/modules/gui/qt4/components/sout/sout_widgets.cpp
index 7961c49..ca10b76 100644
--- 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 ff2038f..59dfa72 100644
--- 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
More information about the vlc-devel
mailing list