From 0559d37d75ea9841cbd773e037605eaac5869b76 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Tue, 17 Apr 2007 18:24:46 +0000
Subject: [PATCH] Qt4 - Sout Dialog: add FLV muxer... Some cosmetic changes
too.
---
modules/gui/qt4/dialogs/sout.cpp | 14 +++++++---
modules/gui/qt4/ui/sout.ui | 46 +++++++++++++++++++++-----------
2 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index 5ca2ecd1bb40..f31a1f8afeeb 100644
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -86,14 +86,21 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf ) :
CS( vBitrate ); CS( aBitrate ); CS( aChannels ); CC( vScale );
/* Mux */
CB( PSMux ); CB( TSMux ); CB( MPEG1Mux ); CB( OggMux ); CB( ASFMux );
- CB( MP4Mux ); CB( MOVMux ); CB( WAVMux ); CB( RAWMux );
+ CB( MP4Mux ); CB( MOVMux ); CB( WAVMux ); CB( RAWMux ); CB( FLVMux );
/* Misc */
CB( soutAll ); CS( ttl ); CT( sapName ); CT( sapGroup );
CONNECT( ui.fileSelectButton, clicked(), this, fileBrowse() );
- BUTTONACT( ui.okButton, ok());
- BUTTONACT( ui.cancelButton, cancel());
+ QPushButton *okButton = new QPushButton( qtr( "&Stream" ) );
+ QPushButton *cancelButton = new QPushButton( qtr( "&Cancel" ) );
+
+ okButton->setDefault( true );
+ ui.acceptButtonBox->addButton( okButton, QDialogButtonBox::AcceptRole );
+ ui.acceptButtonBox->addButton( cancelButton, QDialogButtonBox::RejectRole );
+
+ BUTTONACT( okButton, ok());
+ BUTTONACT( cancelButton, cancel());
}
void SoutDialog::fileBrowse()
@@ -153,6 +160,7 @@ void SoutDialog::updateMRL()
SMUX( MOV, "mov" );
SMUX( WAV, "wav" );
SMUX( RAW, "raw" );
+ SMUX( FLV, "flv" );
/* Transcode */
pd.b_soverlay = ui.sOverlay->isChecked();
diff --git a/modules/gui/qt4/ui/sout.ui b/modules/gui/qt4/ui/sout.ui
index 3c9f394a6499..aee2a69e0f95 100644
--- a/modules/gui/qt4/ui/sout.ui
+++ b/modules/gui/qt4/ui/sout.ui
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>601</width>
- <height>611</height>
+ <width>660</width>
+ <height>676</height>
</rect>
</property>
<property name="windowTitle" >
@@ -107,7 +107,10 @@
<bool>false</bool>
</property>
<property name="text" >
- <string>Port</string>
+ <string>Port:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
@@ -168,7 +171,10 @@
<bool>false</bool>
</property>
<property name="text" >
- <string>Port</string>
+ <string>Port:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
@@ -209,7 +215,10 @@
<bool>false</bool>
</property>
<property name="text" >
- <string>Port</string>
+ <string>Port:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
@@ -355,6 +364,13 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QRadioButton" name="FLVMux" >
+ <property name="text" >
+ <string>FLV</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
@@ -585,6 +601,9 @@
</item>
<item row="1" column="4" >
<widget class="QSpinBox" name="ttl" >
+ <property name="alignment" >
+ <set>Qt::AlignRight</set>
+ </property>
<property name="maximum" >
<number>255</number>
</property>
@@ -640,8 +659,7 @@
<number>6</number>
</property>
<item>
- <widget class="QLineEdit" name="mrlEdit" >
- </widget>
+ <widget class="QLineEdit" name="mrlEdit" />
</item>
</layout>
</widget>
@@ -668,16 +686,12 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="cancelButton" >
- <property name="text" >
- <string>Cancel</string>
+ <widget class="QDialogButtonBox" name="acceptButtonBox" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="okButton" >
- <property name="text" >
- <string>OK</string>
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::NoButton</set>
</property>
</widget>
</item>
--
GitLab