[vlc-commits] Qt: allow SPU deactivation in simple preferences.

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Nov 19 11:53:27 2012 +0100| [94b30f51a33e9aaa00d6b16dae1ea360a258a18b] | committer: Jean-Baptiste Kempf

Qt: allow SPU deactivation in simple preferences.

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

 modules/gui/qt4/components/simple_preferences.cpp |    2 ++
 modules/gui/qt4/ui/sprefs_subtitles.ui            |   11 +++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 962d86d..fddc973 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -648,6 +648,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONFIG_GENERIC( "video-title-position", IntegerList,
                             ui.OSDTitlePosLabel, OSDTitlePos );
 
+            CONFIG_BOOL( "spu", spuActiveBox);
+
             CONFIG_GENERIC( "subsdec-encoding", StringList, ui.encodLabel,
                             encoding );
             CONFIG_GENERIC( "sub-language", String, ui.subLangLabel,
diff --git a/modules/gui/qt4/ui/sprefs_subtitles.ui b/modules/gui/qt4/ui/sprefs_subtitles.ui
index 95313dd..d0dc1e9 100644
--- a/modules/gui/qt4/ui/sprefs_subtitles.ui
+++ b/modules/gui/qt4/ui/sprefs_subtitles.ui
@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>778</width>
-    <height>614</height>
+    <width>741</width>
+    <height>373</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -61,6 +61,13 @@
     </widget>
    </item>
    <item>
+    <widget class="QCheckBox" name="spuActiveBox">
+     <property name="text">
+      <string>Enable subtitles</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">