[vlc-commits] Qt: sprefs, add MKV preloading

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Nov 18 02:33:49 2011 +0100| [586de2de7af4df4944be1515b4faf5f96452e92d] | committer: Jean-Baptiste Kempf

Qt: sprefs, add MKV preloading

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

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

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

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 6a15dc2..b618574 100644
--- 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 1e76a16..243300e 100644
--- 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>