[vlc-commits] commit: qt4: add x264 profile/level to simple-preferences (Ilkka Ollakka )

[git at videolan.org]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sun May 16 15:22:10 2010 +0300| [0c53f514381cf975552af2803fda6653c0ecbee5] | committer: Ilkka Ollakka 

qt4: add x264 profile/level to simple-preferences

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

 modules/gui/qt4/components/simple_preferences.cpp |    2 ++
 modules/gui/qt4/ui/sprefs_input.ui                |   19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 4e711f9..5ab23f1 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -457,6 +457,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             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 );
+            CONFIG_GENERIC( "sout-x264-profile", StringList, ui.x264profileLabel, profileBox );
+            CONFIG_GENERIC( "sout-x264-level", String, ui.x264profileLabel, levelBox );
 
             /* 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 5610550..6e94502 100644
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -73,9 +73,26 @@
       <item row="7" column="1">
        <widget class="QComboBox" name="loopFilterBox"/>
       </item>
-      <item row="9" column="0">
+      <item row="10" column="0">
        <widget class="QLabel" name="x264Label">
         <property name="text">
+         <string>x264 profile and level selection</string>
+        </property>
+        <property name="buddy">
+         <cstring>profileBox</cstring>
+         <cstring>levelBox</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="10" column="1">
+       <widget class="QComboBox" name="profileBox"/>
+      </item>
+      <item row="10" column="2">
+       <widget class="QLineEdit" name="levelBox"/>
+      </item>
+      <item row="9" column="0">
+       <widget class="QLabel" name="x264profileLabel">
+        <property name="text">
          <string>x264 preset and tuning selection</string>
         </property>
         <property name="buddy">