Commit 6923372f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Add a sout-keep option in the GUI as sout-keep is removed by default.

parent 445ca096
...@@ -85,6 +85,7 @@ struct sout_gui_descr_t ...@@ -85,6 +85,7 @@ struct sout_gui_descr_t
/* Misc */ /* Misc */
bool b_sap; /*< send SAP announcement */ bool b_sap; /*< send SAP announcement */
bool b_all_es;/*< send all elementary streams from source stream */ bool b_all_es;/*< send all elementary streams from source stream */
bool b_sout_keep;
char *psz_group; /*< SAP Group name */ char *psz_group; /*< SAP Group name */
char *psz_name; /*< SAP name */ char *psz_name; /*< SAP name */
int32_t i_ttl; /*< Time To Live (TTL) for network traversal */ int32_t i_ttl; /*< Time To Live (TTL) for network traversal */
...@@ -255,7 +256,7 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, ...@@ -255,7 +256,7 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf,
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( FLVMux ); CB( MP4Mux ); CB( MOVMux ); CB( WAVMux ); CB( RAWMux ); CB( FLVMux );
/* Misc */ /* Misc */
CB( soutAll ); CS( ttl ); CT( sapName ); CT( sapGroup ); CB( soutAll ); CB( soutKeep ); CS( ttl ); CT( sapName ); CT( sapGroup );
CONNECT( ui.profileBox, activated( const QString & ), this, setOptions() ); CONNECT( ui.profileBox, activated( const QString & ), this, setOptions() );
CONNECT( ui.fileSelectButton, clicked() , this, fileBrowse() ); CONNECT( ui.fileSelectButton, clicked() , this, fileBrowse() );
...@@ -389,6 +390,7 @@ void SoutDialog::toggleSout() ...@@ -389,6 +390,7 @@ void SoutDialog::toggleSout()
HIDEORSHOW( ui.sap ); HIDEORSHOW( ui.sapName ); HIDEORSHOW( ui.sap ); HIDEORSHOW( ui.sapName );
HIDEORSHOW( ui.sapGroup ); HIDEORSHOW( ui.sapGroupLabel ); HIDEORSHOW( ui.sapGroup ); HIDEORSHOW( ui.sapGroupLabel );
HIDEORSHOW( ui.ttlLabel ); HIDEORSHOW( ui.ttl ); HIDEORSHOW( ui.ttlLabel ); HIDEORSHOW( ui.ttl );
HIDEORSHOW( ui.soutKeep );
HIDEORSHOW( ui.IcecastOutput ); HIDEORSHOW( ui.IcecastEdit ); HIDEORSHOW( ui.IcecastOutput ); HIDEORSHOW( ui.IcecastEdit );
HIDEORSHOW( ui.IcecastNamePassEdit ); HIDEORSHOW( ui.IcecastMountpointEdit ); HIDEORSHOW( ui.IcecastNamePassEdit ); HIDEORSHOW( ui.IcecastMountpointEdit );
...@@ -436,6 +438,7 @@ void SoutDialog::RTPtoggled( bool b_en ) ...@@ -436,6 +438,7 @@ void SoutDialog::RTPtoggled( bool b_en )
ui.RTPLabel->setEnabled( b_en ); ui.RTPLabel->setEnabled( b_en );
ui.RTPEdit->setEnabled( b_en ); ui.RTPEdit->setEnabled( b_en );
ui.UDPOutput->setEnabled( b_en ); ui.UDPOutput->setEnabled( b_en );
ui.UDPRTPLabel->setEnabled( b_en );
ui.UDPEdit->setEnabled( b_en ); ui.UDPEdit->setEnabled( b_en );
ui.UDPPort->setEnabled( b_en ); ui.UDPPort->setEnabled( b_en );
ui.UDPPortLabel->setEnabled( b_en ); ui.UDPPortLabel->setEnabled( b_en );
...@@ -471,6 +474,7 @@ void SoutDialog::updateMRL() ...@@ -471,6 +474,7 @@ void SoutDialog::updateMRL()
sout.b_dump = ui.rawInput->isChecked(); sout.b_dump = ui.rawInput->isChecked();
sout.b_sap = ui.sap->isChecked(); sout.b_sap = ui.sap->isChecked();
sout.b_all_es = ui.soutAll->isChecked(); sout.b_all_es = ui.soutAll->isChecked();
sout.b_sout_keep = ui.soutKeep->isChecked();
sout.psz_vcodec = strdup( qtu( ui.vCodecBox->itemData( ui.vCodecBox->currentIndex() ).toString() ) ); sout.psz_vcodec = strdup( qtu( ui.vCodecBox->itemData( ui.vCodecBox->currentIndex() ).toString() ) );
sout.psz_acodec = strdup( qtu( ui.aCodecBox->itemData( ui.aCodecBox->currentIndex() ).toString() ) ); sout.psz_acodec = strdup( qtu( ui.aCodecBox->itemData( ui.aCodecBox->currentIndex() ).toString() ) );
sout.psz_scodec = strdup( qtu( ui.subsCodecBox->itemData( ui.subsCodecBox->currentIndex() ).toString() ) ); sout.psz_scodec = strdup( qtu( ui.subsCodecBox->itemData( ui.subsCodecBox->currentIndex() ).toString() ) );
...@@ -693,6 +697,9 @@ void SoutDialog::updateMRL() ...@@ -693,6 +697,9 @@ void SoutDialog::updateMRL()
if ( sout.b_all_es ) if ( sout.b_all_es )
mrl.append( " :sout-all" ); mrl.append( " :sout-all" );
if ( sout.b_sout_keep )
mrl.append( " :sout-keep" );
ui.mrlEdit->setText( mrl ); ui.mrlEdit->setText( mrl );
free( sout.psz_acodec ); free( sout.psz_vcodec ); free( sout.psz_scodec ); free( sout.psz_acodec ); free( sout.psz_vcodec ); free( sout.psz_scodec );
free( sout.psz_file );free( sout.psz_http ); free( sout.psz_mms ); free( sout.psz_file );free( sout.psz_http ); free( sout.psz_mms );
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>644</width> <width>644</width>
<height>799</height> <height>843</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
...@@ -22,14 +22,14 @@ ...@@ -22,14 +22,14 @@
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<item> <item>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="0" column="0" colspan="3" > <item row="0" column="1" colspan="2" >
<widget class="QCheckBox" name="localOutput" > <widget class="QCheckBox" name="localOutput" >
<property name="text" > <property name="text" >
<string>_("Play locally")</string> <string>_("Play locally")</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3" > <item row="1" column="1" colspan="2" >
<widget class="QCheckBox" name="fileOutput" > <widget class="QCheckBox" name="fileOutput" >
<property name="contextMenuPolicy" > <property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum> <enum>Qt::NoContextMenu</enum>
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="3" > <item row="2" column="1" colspan="2" >
<widget class="QCheckBox" name="HTTPOutput" > <widget class="QCheckBox" name="HTTPOutput" >
<property name="text" > <property name="text" >
<string>HTTP</string> <string>HTTP</string>
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="3" > <item row="3" column="1" colspan="2" >
<widget class="QCheckBox" name="MMSHOutput" > <widget class="QCheckBox" name="MMSHOutput" >
<property name="text" > <property name="text" >
<string>MMSH</string> <string>MMSH</string>
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="3" > <item row="4" column="1" colspan="2" >
<widget class="QCheckBox" name="RTPOutput" > <widget class="QCheckBox" name="RTPOutput" >
<property name="text" > <property name="text" >
<string>RTP</string> <string>RTP</string>
...@@ -367,7 +367,7 @@ ...@@ -367,7 +367,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="3" > <item row="7" column="1" colspan="2" >
<widget class="QCheckBox" name="IcecastOutput" > <widget class="QCheckBox" name="IcecastOutput" >
<property name="text" > <property name="text" >
<string>IceCast</string> <string>IceCast</string>
...@@ -465,6 +465,9 @@ ...@@ -465,6 +465,9 @@
</item> </item>
<item rowspan="2" row="5" column="2" > <item rowspan="2" row="5" column="2" >
<widget class="QLabel" name="UDPRTPLabel" > <widget class="QLabel" name="UDPRTPLabel" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Maximum" > <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
...@@ -473,7 +476,7 @@ ...@@ -473,7 +476,7 @@
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>83</width> <width>100</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
...@@ -499,6 +502,12 @@ ...@@ -499,6 +502,12 @@
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip" > <property name="toolTip" >
<string>_("Using this option is not recommended in most of the cases.")</string> <string>_("Using this option is not recommended in most of the cases.")</string>
</property> </property>
...@@ -545,8 +554,8 @@ ...@@ -545,8 +554,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>628</width> <width>622</width>
<height>135</height> <height>151</height>
</rect> </rect>
</property> </property>
<attribute name="title" > <attribute name="title" >
...@@ -640,8 +649,8 @@ ...@@ -640,8 +649,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>624</width> <width>622</width>
<height>129</height> <height>151</height>
</rect> </rect>
</property> </property>
<attribute name="title" > <attribute name="title" >
...@@ -737,8 +746,8 @@ ...@@ -737,8 +746,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>624</width> <width>622</width>
<height>129</height> <height>151</height>
</rect> </rect>
</property> </property>
<attribute name="title" > <attribute name="title" >
...@@ -837,8 +846,8 @@ ...@@ -837,8 +846,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>624</width> <width>622</width>
<height>129</height> <height>151</height>
</rect> </rect>
</property> </property>
<attribute name="title" > <attribute name="title" >
...@@ -949,6 +958,13 @@ ...@@ -949,6 +958,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2" >
<widget class="QCheckBox" name="soutKeep" >
<property name="text" >
<string>_("Keep stream output open")</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
......
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