Qt: sprefs, add MKV preloading

So anime folks don't jump on my throat again...

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 6a15dc266a4885cefcae8765378daa9b11ae6c6f..b618574f85aa91d7a0ac7b24cb71da8119851ca6 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -482,6 +482,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             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 );
+            CONFIG_BOOL( "mkv-preload-local-dir", mkvPreloadBox );
 
             /* 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 1e76a16f296bcded8f6b284eb6bbc4cfb819c2c3..243300e02255b2a16e5593d5b7f99dddaea93116 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -250,7 +250,7 @@
         </item>
        </layout>
       </item>
-      <item row="3" column="0">
+      <item row="4" column="0">
        <widget class="QLabel" name="aviLabel">
         <property name="text">
          <string>Damaged or incomplete AVI file</string>
@@ -260,7 +260,7 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="1">
+      <item row="4" column="1">
        <widget class="QComboBox" name="AviRepair"/>
       </item>
       <item row="2" column="0" colspan="2">
@@ -270,6 +270,13 @@
         </property>
        </widget>
       </item>
+      <item row="3" column="0" colspan="2">
+       <widget class="QCheckBox" name="mkvPreloadBox">
+        <property name="text">
+         <string>Preload MKV files in the same directory</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>