[vlc-devel] commit: Qt4: separate native RTP from RTP/TS ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Nov 30 22:50:09 2009 +0200| [655f6183ac201b15193e0116a9c38f51a02e9c35] | committer: Rémi Denis-Courmont 

Qt4: separate native RTP from RTP/TS

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

 modules/gui/qt4/components/sout/sout_widgets.cpp |    9 +++++----
 modules/gui/qt4/components/sout/sout_widgets.hpp |    3 ++-
 modules/gui/qt4/dialogs/sout.cpp                 |   11 ++++++++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/modules/gui/qt4/components/sout/sout_widgets.cpp b/modules/gui/qt4/components/sout/sout_widgets.cpp
index ca10b76..98154fd 100644
--- a/modules/gui/qt4/components/sout/sout_widgets.cpp
+++ b/modules/gui/qt4/components/sout/sout_widgets.cpp
@@ -265,7 +265,8 @@ QString UDPDestBox::getMRL( const QString& mux )
 
 
 
-RTPDestBox::RTPDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
+RTPDestBox::RTPDestBox( QWidget *_parent, const char *_mux )
+    : VirtualDestBox( _parent ), mux( _mux )
 {
     QGridLayout *layout = new QGridLayout( this );
 
@@ -295,7 +296,7 @@ RTPDestBox::RTPDestBox( QWidget *_parent ) : VirtualDestBox( _parent )
     CT( RTPEdit );
 }
 
-QString RTPDestBox::getMRL( const QString& mux )
+QString RTPDestBox::getMRL( const QString& )
 {
     if( RTPEdit->text().isEmpty() ) return "";
 
@@ -303,8 +304,8 @@ QString RTPDestBox::getMRL( const QString& mux )
     m.begin( "rtp" );
     m.option( "dst", RTPEdit->text() );
     m.option( "port", RTPPort->value() );
-    if( !mux.isEmpty() )
-        m.option( "mux", mux );
+    if( mux != NULL )
+        m.option( "mux", qfu( mux ) );
     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 59dfa72..d2042cd 100644
--- a/modules/gui/qt4/components/sout/sout_widgets.hpp
+++ b/modules/gui/qt4/components/sout/sout_widgets.hpp
@@ -105,11 +105,12 @@ class RTPDestBox: public VirtualDestBox
 {
     Q_OBJECT;
     public:
-        RTPDestBox( QWidget *_parent = NULL );
+        RTPDestBox( QWidget *_parent = NULL, const char *mux = NULL );
         virtual QString getMRL( const QString& );
     private:
         QLineEdit *RTPEdit;
         QSpinBox *RTPPort;
+        const char *mux;
 };
 
 class ICEDestBox: public VirtualDestBox
diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index 6fe140a..9410fcc 100644
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -74,7 +74,8 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString&
     ui.destBox->addItem( qtr( "File" ) );
     ui.destBox->addItem( "HTTP" );
     ui.destBox->addItem( "MS-WMSP (MMSH)" );
-    ui.destBox->addItem( "RTP / Transport Stream" );
+    ui.destBox->addItem( "RTP / MPEG Transport Stream" );
+    ui.destBox->addItem( "RTP Audio/Video Profile" );
     ui.destBox->addItem( "UDP (legacy)" );
     ui.destBox->addItem( "IceCast" );
 
@@ -158,14 +159,18 @@ void SoutDialog::addDest( )
             caption = qfu( "WMSP" );
             break;
         case 3:
-            db = new RTPDestBox( this );
+            db = new RTPDestBox( this, "ts" );
             caption = "RTP/TS";
             break;
         case 4:
+            db = new RTPDestBox( this );
+            caption = "RTP/AVP";
+            break;
+        case 5:
             db = new UDPDestBox( this );
             caption = "UDP";
             break;
-        case 5:
+        case 6:
             db = new ICEDestBox( this );
             caption = "Icecast";
             break;