[vlc-devel] commit: Add a sout-keep option in the GUI as sout-keep is removed by default. ( Jean-Baptiste Kempf )

git version control git at videolan.org
Fri Sep 5 08:52:25 CEST 2008


vlc | branch: 0.9-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Thu Sep  4 23:54:38 2008 -0700| [946351ebaf4799265fbb36a79d946adf0d576c33] | committer: Jean-Baptiste Kempf 

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

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

 modules/gui/qt4/dialogs/sout.cpp |   11 +++++++-
 modules/gui/qt4/ui/sout.ui       |   48 +++++++++++++++++++++++++------------
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index 6ba8dce..0830f05 100644
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -85,6 +85,7 @@ struct sout_gui_descr_t
     /* Misc */
     bool b_sap;   /*< send SAP announcement */
     bool b_all_es;/*< send all elementary streams from source stream */
+    bool b_sout_keep;
     char *psz_group;    /*< SAP Group name */
     char *psz_name;     /*< SAP name */
     int32_t i_ttl;      /*< Time To Live (TTL) for network traversal */
@@ -183,7 +184,7 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf,
     CB( PSMux ); CB( TSMux ); CB( MPEG1Mux ); CB( OggMux ); CB( ASFMux );
     CB( MP4Mux ); CB( MOVMux ); CB( WAVMux ); CB( RAWMux ); CB( FLVMux );
     /* 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.fileSelectButton, clicked() , this, fileBrowse()  );
@@ -317,6 +318,7 @@ void SoutDialog::toggleSout()
     HIDEORSHOW( ui.sap ); HIDEORSHOW( ui.sapName );
     HIDEORSHOW( ui.sapGroup ); HIDEORSHOW( ui.sapGroupLabel );
     HIDEORSHOW( ui.ttlLabel ); HIDEORSHOW( ui.ttl );
+    HIDEORSHOW( ui.soutKeep );
 
     HIDEORSHOW( ui.IcecastOutput ); HIDEORSHOW( ui.IcecastEdit );
     HIDEORSHOW( ui.IcecastNamePassEdit ); HIDEORSHOW( ui.IcecastMountpointEdit );
@@ -364,6 +366,7 @@ void SoutDialog::RTPtoggled( bool b_en )
     ui.RTPLabel->setEnabled( b_en );
     ui.RTPEdit->setEnabled( b_en );
     ui.UDPOutput->setEnabled( b_en );
+    ui.UDPRTPLabel->setEnabled( b_en );
     ui.UDPEdit->setEnabled( b_en );
     ui.UDPPort->setEnabled( b_en );
     ui.UDPPortLabel->setEnabled( b_en );
@@ -399,6 +402,7 @@ void SoutDialog::updateMRL()
     sout.b_dump = ui.rawInput->isChecked();
     sout.b_sap = ui.sap->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_acodec = strdup( qtu( ui.aCodecBox->itemData( ui.aCodecBox->currentIndex() ).toString() ) );
     sout.psz_scodec = strdup( qtu( ui.subsCodecBox->itemData( ui.subsCodecBox->currentIndex() ).toString() ) );
@@ -640,7 +644,10 @@ void SoutDialog::updateMRL()
 #undef CHECKMUX
 
     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 );
     free( sout.psz_acodec ); free( sout.psz_vcodec ); free( sout.psz_scodec );
diff --git a/modules/gui/qt4/ui/sout.ui b/modules/gui/qt4/ui/sout.ui
index e171087..2400244 100644
--- a/modules/gui/qt4/ui/sout.ui
+++ b/modules/gui/qt4/ui/sout.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>644</width>
-    <height>799</height>
+    <height>843</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -22,14 +22,14 @@
      <layout class="QHBoxLayout" >
       <item>
        <layout class="QGridLayout" >
-        <item row="0" column="0" colspan="3" >
+        <item row="0" column="1" colspan="2" >
          <widget class="QCheckBox" name="localOutput" >
           <property name="text" >
            <string>_("Play locally")</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="0" colspan="3" >
+        <item row="1" column="1" colspan="2" >
          <widget class="QCheckBox" name="fileOutput" >
           <property name="contextMenuPolicy" >
            <enum>Qt::NoContextMenu</enum>
@@ -82,7 +82,7 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="0" colspan="3" >
+        <item row="2" column="1" colspan="2" >
          <widget class="QCheckBox" name="HTTPOutput" >
           <property name="text" >
            <string>HTTP</string>
@@ -147,7 +147,7 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="0" colspan="3" >
+        <item row="3" column="1" colspan="2" >
          <widget class="QCheckBox" name="MMSHOutput" >
           <property name="text" >
            <string>MMSH</string>
@@ -209,7 +209,7 @@
           </property>
          </widget>
         </item>
-        <item row="4" column="0" colspan="3" >
+        <item row="4" column="1" colspan="2" >
          <widget class="QCheckBox" name="RTPOutput" >
           <property name="text" >
            <string>RTP</string>
@@ -367,7 +367,7 @@
           </property>
          </widget>
         </item>
-        <item row="7" column="0" colspan="3" >
+        <item row="7" column="1" colspan="2" >
          <widget class="QCheckBox" name="IcecastOutput" >
           <property name="text" >
            <string>IceCast</string>
@@ -465,6 +465,9 @@
         </item>
         <item rowspan="2" row="5" column="2" >
          <widget class="QLabel" name="UDPRTPLabel" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
           <property name="sizePolicy" >
            <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
             <horstretch>0</horstretch>
@@ -473,7 +476,7 @@
           </property>
           <property name="maximumSize" >
            <size>
-            <width>83</width>
+            <width>100</width>
             <height>16777215</height>
            </size>
           </property>
@@ -499,6 +502,12 @@
           <property name="enabled" >
            <bool>false</bool>
           </property>
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="toolTip" >
            <string>_("Using this option is not recommended in most of the cases.")</string>
           </property>
@@ -545,8 +554,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>628</width>
-        <height>135</height>
+        <width>622</width>
+        <height>151</height>
        </rect>
       </property>
       <attribute name="title" >
@@ -640,8 +649,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>624</width>
-        <height>129</height>
+        <width>622</width>
+        <height>151</height>
        </rect>
       </property>
       <attribute name="title" >
@@ -737,8 +746,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>624</width>
-        <height>129</height>
+        <width>622</width>
+        <height>151</height>
        </rect>
       </property>
       <attribute name="title" >
@@ -837,8 +846,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>624</width>
-        <height>129</height>
+        <width>622</width>
+        <height>151</height>
        </rect>
       </property>
       <attribute name="title" >
@@ -949,6 +958,13 @@
           </property>
          </widget>
         </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>
       </item>
      </layout>




More information about the vlc-devel mailing list