Skip to content

V
vlc
Commit 0559d37d authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt4 - Sout Dialog: add FLV muxer... Some cosmetic changes too.

parent 765497c4
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 19 deletions
modules/gui/qt4/dialogs/sout.cpp
View file @ 0559d37d
...@@ -86,14 +86,21 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf ) : ...@@ -86,14 +86,21 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf ) :
CS( vBitrate ); CS( aBitrate ); CS( aChannels ); CC( vScale ); CS( vBitrate ); CS( aBitrate ); CS( aChannels ); CC( vScale );
/* Mux */ /* Mux */
CB( PSMux ); CB( TSMux ); CB( MPEG1Mux ); CB( OggMux ); CB( ASFMux ); 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 */ /* Misc */
CB( soutAll ); CS( ttl ); CT( sapName ); CT( sapGroup ); CB( soutAll ); CS( ttl ); CT( sapName ); CT( sapGroup );
CONNECT( ui.fileSelectButton, clicked(), this, fileBrowse() ); CONNECT( ui.fileSelectButton, clicked(), this, fileBrowse() );
BUTTONACT( ui.okButton, ok()); QPushButton *okButton = new QPushButton( qtr( "&Stream" ) );
BUTTONACT( ui.cancelButton, cancel()); 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() void SoutDialog::fileBrowse()
...@@ -153,6 +160,7 @@ void SoutDialog::updateMRL() ...@@ -153,6 +160,7 @@ void SoutDialog::updateMRL()
SMUX( MOV, "mov" ); SMUX( MOV, "mov" );
SMUX( WAV, "wav" ); SMUX( WAV, "wav" );
SMUX( RAW, "raw" ); SMUX( RAW, "raw" );
SMUX( FLV, "flv" );
/* Transcode */ /* Transcode */
pd.b_soverlay = ui.sOverlay->isChecked(); pd.b_soverlay = ui.sOverlay->isChecked();
......
modules/gui/qt4/ui/sout.ui
View file @ 0559d37d
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>601</width> <width>660</width>
<height>611</height> <height>676</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
...@@ -107,7 +107,10 @@ ...@@ -107,7 +107,10 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Port</string> <string>Port:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -168,7 +171,10 @@ ...@@ -168,7 +171,10 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Port</string> <string>Port:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -209,7 +215,10 @@ ...@@ -209,7 +215,10 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Port</string> <string>Port:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -355,6 +364,13 @@ ...@@ -355,6 +364,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QRadioButton" name="FLVMux" >
<property name="text" >
<string>FLV</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
...@@ -585,6 +601,9 @@ ...@@ -585,6 +601,9 @@
</item> </item>
<item row="1" column="4" > <item row="1" column="4" >
<widget class="QSpinBox" name="ttl" > <widget class="QSpinBox" name="ttl" >
<property name="alignment" >
<set>Qt::AlignRight</set>
</property>
<property name="maximum" > <property name="maximum" >
<number>255</number> <number>255</number>
</property> </property>
...@@ -640,8 +659,7 @@ ...@@ -640,8 +659,7 @@
<number>6</number> <number>6</number>
</property> </property>
<item> <item>
<widget class="QLineEdit" name="mrlEdit" > <widget class="QLineEdit" name="mrlEdit" />
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
...@@ -668,16 +686,12 @@ ...@@ -668,16 +686,12 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="cancelButton" > <widget class="QDialogButtonBox" name="acceptButtonBox" >
<property name="text" > <property name="orientation" >
<string>Cancel</string> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> <property name="standardButtons" >
</item> <set>QDialogButtonBox::NoButton</set>
<item>
<widget class="QPushButton" name="okButton" >
<property name="text" >
<string>OK</string>
</property> </property>
</widget> </widget>
</item> </item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment