qt4: add x264 tune/preset on simple-preferences

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 95207727221224fdfa558002f73d2be707d153b5..4e711f90277e6245f7692539e3ddb97cabaa687e 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -455,6 +455,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             optionWidgets.append( ui.DVDDevice );
             optionWidgets.append( ui.cachingCombo );
             CONFIG_GENERIC( "ffmpeg-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox );
+            CONFIG_GENERIC( "sout-x264-tune", StringList, ui.x264Label, tuneBox );
+            CONFIG_GENERIC( "sout-x264-preset", StringList, ui.x264Label, presetBox );
 
             /* Caching */
             /* Add the things to the ComboBox */

diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui
index 55fe696db6b6b2d46f6b4f82e85fe7146731334f..56105504ae3e0f15090dd61a318318a0c892bc99 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -73,6 +73,23 @@
       <item row="7" column="1">
        <widget class="QComboBox" name="loopFilterBox"/>
       </item>
+      <item row="9" column="0">
+       <widget class="QLabel" name="x264Label">
+        <property name="text">
+         <string>x264 preset and tuning selection</string>
+        </property>
+        <property name="buddy">
+         <cstring>presetBox</cstring>
+         <cstring>tuneBox</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="9" column="1">
+       <widget class="QComboBox" name="presetBox"/>
+      </item>
+      <item row="9" column="2">
+       <widget class="QComboBox" name="tuneBox"/>
+      </item>
       <item row="2" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>