[vlc-commits] commit: Qt/Sout: pass the ttl from the UI to the MRL (Jean-Baptiste Kempf )
git at videolan.org
git at videolan.org
Sat Sep 4 20:17:50 CEST 2010
vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Sep 4 18:34:07 2010 +0200| [49a184fad88c3c3940975aa85d4c10a0b2a5c906] | committer: Jean-Baptiste Kempf
Qt/Sout: pass the ttl from the UI to the MRL
(cherry picked from commit 96ad75b181675a9fc73c075c540d5e38fd0174c7)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=49a184fad88c3c3940975aa85d4c10a0b2a5c906
---
modules/gui/qt4/dialogs/sout.cpp | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index 3a6a53f..c7a53fe 100644
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -34,6 +34,7 @@
#include <QString>
#include <QFileDialog>
#include <QToolButton>
+#include <QSpinBox>
#include <assert.h>
SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString& inputMRL )
@@ -260,8 +261,8 @@ void SoutDialog::updateMRL()
/* FIXME: This sucks. We should really return a QStringList instead of
* (mis)quoting, concatainating and split input item paramters. */
- name = name.replace( " ", " " );
- group = group.replace( " ", " " );
+ name = name.replace( " ", " " );
+ group = group.replace( " ", " " );
/* We need to add options for both standard and rtp targets */
/* This is inelegant but simple and functional */
@@ -277,7 +278,9 @@ void SoutDialog::updateMRL()
mrl.append( qfu( " :no-sout-standard-sap" ) );
}
- if( ui.soutAll->isChecked() ) mrl.append( " :sout-all" );
+ if( ui.soutAll->isChecked() ) mrl.append( " :sout-all" );
+
+ if( ui.ttl->value() != 1 ) mrl.append( " :ttl=" + ui.ttl->value() );
mrl.append( " :sout-keep" );
More information about the vlc-commits
mailing list