X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fui%2Fsout.ui;h=509011876f6e550e417095c6fd9d39f7d3fb9eeb;hb=33e8266df2b1de424d15506d22d827b297ea65a6;hp=c349442a1d06ce12d4197893f4baac8ac1f632c9;hpb=038dc1cafb4390eaba755bd60aa9d7c1d079cd6e;p=vlc

diff --git a/modules/gui/qt4/ui/sout.ui b/modules/gui/qt4/ui/sout.ui
index c349442a1d..509011876f 100644
--- a/modules/gui/qt4/ui/sout.ui
+++ b/modules/gui/qt4/ui/sout.ui
@@ -1,4 +1,5 @@
 <ui version="4.0" >
+ <author>Jean-Baptiste Kempf</author>
  <class>Sout</class>
  <widget class="QWidget" name="Sout" >
   <property name="geometry" >
@@ -6,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>617</width>
-    <height>653</height>
+    <height>678</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -33,6 +34,23 @@
      <layout class="QHBoxLayout" >
       <item>
        <layout class="QGridLayout" >
+        <item row="0" column="0" >
+         <widget class="QCheckBox" name="localOutput" >
+          <property name="text" >
+           <string>_("Play locally")</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0" >
+         <widget class="QCheckBox" name="fileOutput" >
+          <property name="contextMenuPolicy" >
+           <enum>Qt::NoContextMenu</enum>
+          </property>
+          <property name="text" >
+           <string>_("File")</string>
+          </property>
+         </widget>
+        </item>
         <item row="1" column="1" >
          <widget class="QLabel" name="fileLabel" >
           <property name="enabled" >
@@ -43,13 +61,67 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="0" >
-         <widget class="QCheckBox" name="fileOutput" >
-          <property name="contextMenuPolicy" >
-           <enum>Qt::NoContextMenu</enum>
+        <item row="1" column="2" >
+         <widget class="QLineEdit" name="fileEdit" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="3" >
+         <widget class="QPushButton" name="fileSelectButton" >
+          <property name="enabled" >
+           <bool>false</bool>
           </property>
           <property name="text" >
-           <string>_("File")</string>
+           <string>_("Browse...")</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="4" >
+         <widget class="QCheckBox" name="rawInput" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>_("Dump raw input")</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0" >
+         <widget class="QCheckBox" name="HTTPOutput" >
+          <property name="text" >
+           <string>HTTP</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1" >
+         <widget class="QLabel" name="HTTPLabel" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>_("Address")</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2" >
+         <widget class="QLineEdit" name="HTTPEdit" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="3" >
+         <widget class="QLabel" name="HTTPPortLabel" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>_("Port:")</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
@@ -81,18 +153,25 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="4" >
-         <widget class="QCheckBox" name="rawInput" >
+        <item row="3" column="0" >
+         <widget class="QCheckBox" name="MMSHOutput" >
+          <property name="text" >
+           <string>MMSH</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1" >
+         <widget class="QLabel" name="MMSHLabel" >
           <property name="enabled" >
            <bool>false</bool>
           </property>
           <property name="text" >
-           <string>_("Dump raw input")</string>
+           <string>_("Address")</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="2" >
-         <widget class="QLineEdit" name="fileEdit" >
+        <item row="3" column="2" >
+         <widget class="QLineEdit" name="MMSHEdit" >
           <property name="enabled" >
            <bool>false</bool>
           </property>
@@ -111,126 +190,125 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="1" >
-         <widget class="QLabel" name="MMSHLabel" >
+        <item row="3" column="4" >
+         <widget class="QSpinBox" name="MMSHPort" >
           <property name="enabled" >
            <bool>false</bool>
           </property>
-          <property name="text" >
-           <string>_("Address")</string>
+          <property name="maximumSize" >
+           <size>
+            <width>90</width>
+            <height>16777215</height>
+           </size>
           </property>
-         </widget>
-        </item>
-        <item row="0" column="0" >
-         <widget class="QCheckBox" name="localOutput" >
-          <property name="text" >
-           <string>_("Play locally")</string>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="minimum" >
+           <number>1</number>
+          </property>
+          <property name="maximum" >
+           <number>65535</number>
+          </property>
+          <property name="value" >
+           <number>1234</number>
           </property>
          </widget>
         </item>
-        <item row="3" column="0" >
-         <widget class="QCheckBox" name="MMSHOutput" >
+        <item row="4" column="0" >
+         <widget class="QCheckBox" name="RTPOutput" >
           <property name="text" >
-           <string>MMSH</string>
+           <string>RTP</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="3" >
-         <widget class="QPushButton" name="fileSelectButton" >
+        <item row="4" column="1" >
+         <widget class="QLabel" name="RTPLabel" >
           <property name="enabled" >
            <bool>false</bool>
           </property>
           <property name="text" >
-           <string>_("Browse...")</string>
+           <string>_("Address")</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="2" >
-         <widget class="QLineEdit" name="HTTPEdit" >
+        <item row="4" column="2" >
+         <widget class="QLineEdit" name="RTPEdit" >
           <property name="enabled" >
            <bool>false</bool>
           </property>
          </widget>
         </item>
-        <item row="2" column="1" >
-         <widget class="QLabel" name="HTTPLabel" >
+        <item row="4" column="3" >
+         <widget class="QLabel" name="RTPPortLabel" >
           <property name="enabled" >
            <bool>false</bool>
           </property>
           <property name="text" >
-           <string>_("Address")</string>
+           <string>_("Port:")</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
-        <item row="2" column="3" >
-         <widget class="QLabel" name="HTTPPortLabel" >
+        <item row="4" column="4" >
+         <widget class="QSpinBox" name="RTPPort" >
           <property name="enabled" >
            <bool>false</bool>
           </property>
-          <property name="text" >
-           <string>_("Port:")</string>
+          <property name="maximumSize" >
+           <size>
+            <width>90</width>
+            <height>16777215</height>
+           </size>
           </property>
           <property name="alignment" >
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
-         </widget>
-        </item>
-        <item row="3" column="2" >
-         <widget class="QLineEdit" name="MMSHEdit" >
-          <property name="enabled" >
-           <bool>false</bool>
+          <property name="minimum" >
+           <number>1</number>
           </property>
-         </widget>
-        </item>
-        <item row="2" column="0" >
-         <widget class="QCheckBox" name="HTTPOutput" >
-          <property name="text" >
-           <string>HTTP</string>
+          <property name="maximum" >
+           <number>65535</number>
+          </property>
+          <property name="value" >
+           <number>1234</number>
           </property>
          </widget>
         </item>
-        <item row="4" column="0" >
+        <item row="5" column="0" >
          <widget class="QCheckBox" name="UDPOutput" >
+          <property name="toolTip" >
+           <string>_("Using this option is not recommended in most of the cases.")</string>
+          </property>
           <property name="text" >
-           <string>UDP</string>
+           <string>_("Prefer UDP over RTP")</string>
           </property>
          </widget>
         </item>
-        <item row="4" column="1" >
+        <item row="5" column="1" >
          <widget class="QLabel" name="UDPLabel" >
-          <property name="enabled" >
-           <bool>false</bool>
-          </property>
           <property name="text" >
            <string>_("Address")</string>
           </property>
          </widget>
         </item>
-        <item row="4" column="3" >
+        <item row="5" column="2" >
+         <widget class="QLineEdit" name="UDPEdit" />
+        </item>
+        <item row="5" column="3" >
          <widget class="QLabel" name="UDPPortLabel" >
-          <property name="enabled" >
-           <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>
-        <item row="4" column="2" >
-         <widget class="QLineEdit" name="UDPEdit" >
-          <property name="enabled" >
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="4" >
-         <widget class="QSpinBox" name="MMSHPort" >
-          <property name="enabled" >
-           <bool>false</bool>
-          </property>
+        <item row="5" column="4" >
+         <widget class="QSpinBox" name="UDPPort" >
           <property name="maximumSize" >
            <size>
             <width>90</width>
@@ -240,6 +318,9 @@
           <property name="alignment" >
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
+          <property name="accelerated" >
+           <bool>true</bool>
+          </property>
           <property name="minimum" >
            <number>1</number>
           </property>
@@ -251,8 +332,41 @@
           </property>
          </widget>
         </item>
-        <item row="4" column="4" >
-         <widget class="QSpinBox" name="UDPPort" >
+        <item row="6" column="0" >
+         <widget class="QCheckBox" name="IcecastOutput" >
+          <property name="text" >
+           <string>IceCast</string>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="1" >
+         <widget class="QLabel" name="IcecastLabel" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>_("Address")</string>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="2" >
+         <widget class="QLineEdit" name="IcecastEdit" />
+        </item>
+        <item row="6" column="3" >
+         <widget class="QLabel" name="IcecastPortLabel" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>_("Port:")</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="4" >
+         <widget class="QSpinBox" name="IcecastPort" >
           <property name="enabled" >
            <bool>false</bool>
           </property>
@@ -265,14 +379,41 @@
           <property name="alignment" >
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
-          <property name="minimum" >
-           <number>1</number>
-          </property>
           <property name="maximum" >
            <number>65535</number>
           </property>
           <property name="value" >
-           <number>1234</number>
+           <number>1024</number>
+          </property>
+         </widget>
+        </item>
+        <item row="7" column="1" >
+         <widget class="QLabel" name="IcecastMountpointLabel" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>_("Mount Point")</string>
+          </property>
+         </widget>
+        </item>
+        <item row="7" column="2" >
+         <widget class="QLineEdit" name="IcecastMountpointEdit" />
+        </item>
+        <item row="7" column="3" >
+         <widget class="QLabel" name="IcecastNameLabel" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string>_("Login:pass:")</string>
+          </property>
+         </widget>
+        </item>
+        <item row="7" column="4" >
+         <widget class="QLineEdit" name="IcecastNamePassEdit" >
+          <property name="enabled" >
+           <bool>false</bool>
           </property>
          </widget>
         </item>
@@ -298,9 +439,12 @@
    <item row="2" column="1" >
     <widget class="QComboBox" name="profileBox" />
    </item>
-   <item row="4" column="0" colspan="2" >
+   <item row="3" column="0" colspan="2" >
     <widget class="QTabWidget" name="tabWidget" >
-     <widget class="QWidget" name="tab" >
+     <property name="currentIndex" >
+      <number>1</number>
+     </property>
+     <widget class="QWidget" name="muxer" >
       <attribute name="title" >
        <string>_("Encapsulation")</string>
       </attribute>
@@ -315,7 +459,7 @@
        <item row="0" column="1" >
         <widget class="QRadioButton" name="OggMux" >
          <property name="text" >
-          <string>Ogg</string>
+          <string>Ogg/Ogm</string>
          </property>
         </widget>
        </item>
@@ -343,7 +487,7 @@
        <item row="1" column="1" >
         <widget class="QRadioButton" name="ASFMux" >
          <property name="text" >
-          <string>ASF</string>
+          <string>ASF/WMV</string>
          </property>
         </widget>
        </item>
@@ -375,14 +519,21 @@
          </property>
         </widget>
        </item>
+       <item row="1" column="3" >
+        <widget class="QRadioButton" name="MKVMux" >
+         <property name="text" >
+          <string>MKV</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_2" >
+     <widget class="QWidget" name="videoCodec" >
       <property name="enabled" >
        <bool>true</bool>
       </property>
       <attribute name="title" >
-       <string>_("Video Codec")</string>
+       <string>_("Video codec")</string>
       </attribute>
       <layout class="QGridLayout" >
        <item row="0" column="0" >
@@ -469,9 +620,9 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_3" >
+     <widget class="QWidget" name="audioCodec" >
       <attribute name="title" >
-       <string>_("Audio Codec")</string>
+       <string>_("Audio codec")</string>
       </attribute>
       <layout class="QGridLayout" >
        <item row="0" column="0" >
@@ -561,7 +712,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_4" >
+     <widget class="QWidget" name="subtitles" >
       <attribute name="title" >
        <string>_("Subtitles")</string>
       </attribute>
@@ -594,6 +745,13 @@
      </widget>
     </widget>
    </item>
+   <item row="4" column="0" colspan="2" >
+    <widget class="Line" name="line_2" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
    <item row="5" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox_3" >
      <property name="title" >
@@ -657,7 +815,7 @@
          </widget>
         </item>
         <item row="1" column="3" >
-         <widget class="QLabel" name="label_10" >
+         <widget class="QLabel" name="ttlLabel" >
           <property name="text" >
            <string>_("Time-To-Live (TTL)")</string>
           </property>
@@ -710,19 +868,12 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0" colspan="2" >
-    <widget class="Line" name="line_2" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
  <connections>
   <connection>
-   <sender>UDPOutput</sender>
+   <sender>RTPOutput</sender>
    <signal>clicked(bool)</signal>
    <receiver>sap</receiver>
    <slot>setEnabled(bool)</slot>
@@ -738,9 +889,9 @@
    </hints>
   </connection>
   <connection>
-   <sender>UDPOutput</sender>
+   <sender>RTPOutput</sender>
    <signal>clicked(bool)</signal>
-   <receiver>UDPLabel</receiver>
+   <receiver>RTPLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
@@ -754,9 +905,9 @@
    </hints>
   </connection>
   <connection>
-   <sender>UDPOutput</sender>
+   <sender>RTPOutput</sender>
    <signal>clicked(bool)</signal>
-   <receiver>UDPEdit</receiver>
+   <receiver>RTPEdit</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
@@ -818,9 +969,9 @@
    </hints>
   </connection>
   <connection>
-   <sender>UDPOutput</sender>
+   <sender>RTPOutput</sender>
    <signal>clicked(bool)</signal>
-   <receiver>UDPPortLabel</receiver>
+   <receiver>RTPPortLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
@@ -834,9 +985,9 @@
    </hints>
   </connection>
   <connection>
-   <sender>UDPOutput</sender>
+   <sender>RTPOutput</sender>
    <signal>clicked(bool)</signal>
-   <receiver>UDPPort</receiver>
+   <receiver>RTPPort</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
@@ -1076,7 +1227,7 @@
   <connection>
    <sender>rawInput</sender>
    <signal>clicked(bool)</signal>
-   <receiver>UDPOutput</receiver>
+   <receiver>RTPOutput</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
@@ -1105,5 +1256,197 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>UDPOutput</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>UDPPort</receiver>
+   <slot>setVisible(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>98</x>
+     <y>212</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>493</x>
+     <y>212</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>UDPOutput</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>UDPPortLabel</receiver>
+   <slot>setVisible(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>107</x>
+     <y>212</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>396</x>
+     <y>212</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>UDPOutput</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>UDPLabel</receiver>
+   <slot>setVisible(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>107</x>
+     <y>212</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>241</x>
+     <y>212</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>UDPOutput</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>UDPEdit</receiver>
+   <slot>setVisible(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>107</x>
+     <y>212</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>315</x>
+     <y>212</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>IcecastOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>IcecastEdit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>96</x>
+     <y>171</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>296</x>
+     <y>171</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>IcecastOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>IcecastLabel</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>96</x>
+     <y>171</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>227</x>
+     <y>171</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>IcecastOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>IcecastPortLabel</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>96</x>
+     <y>171</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>377</x>
+     <y>171</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>IcecastOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>IcecastPort</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>96</x>
+     <y>171</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>488</x>
+     <y>171</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>IcecastOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>IcecastMountpointEdit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>91</x>
+     <y>154</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>306</x>
+     <y>175</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>IcecastOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>IcecastMountpointLabel</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>91</x>
+     <y>154</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>226</x>
+     <y>175</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>IcecastOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>IcecastNameLabel</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>91</x>
+     <y>154</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>388</x>
+     <y>175</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>IcecastOutput</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>IcecastNamePassEdit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>91</x>
+     <y>154</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>526</x>
+     <y>175</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>