diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index f774808896bf636b360e69a6e098077bfc14392d..ef20090a775c7fadd8aae2a8915049a94083b6b1 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -6,7 +6,7 @@
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Antoine Cellerier <dionoea@videolan.org>
- *
+ * Jean-Baptiste Kempf <jb@videolan.org>
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -38,7 +38,6 @@
#include "pixmaps/audio_50x50.xpm"
#include "pixmaps/input_and_codecs_50x50.xpm"
#include "pixmaps/interface_50x50.xpm"
-//#include "pixmaps/playlist_50x50.xpm"
#include "pixmaps/subtitles_50x50.xpm"
#include "pixmaps/video_50x50.xpm"
@@ -47,7 +46,6 @@
#include "ui/sprefs_video.h"
#include "ui/sprefs_subtitles.h"
#include "ui/sprefs_hotkeys.h"
-//#include "ui/sprefs_playlist.h"
#include "ui/sprefs_interface.h"
#define ITEM_HEIGHT 50
@@ -133,32 +131,59 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC( "overlay", Bool, NULL, overlay );
CONFIG_GENERIC( "video-on-top", Bool, NULL, alwaysOnTop );
CONFIG_GENERIC( "video-deco", Bool, NULL, windowDecorations );
-
+ CONFIG_GENERIC( "skip-frames" , Bool, NULL, skipFrames);
CONFIG_GENERIC( "vout", Module, NULL, outputModule );
+#ifdef WIN32
+ CONFIG_GENERIC( "directx-wallpaper" , Bool , NULL, wallpaperMode );
+ CONFIG_GENERIC( "directx-device", String, NULL, dXdisplayDevice );
+#endif
+
CONFIG_GENERIC( "snapshot-path", String, NULL,
- snapshotsDirectory ); /* FIXME -> use file instead of string */
+ snapshotsDirectory ); /* FIXME -> use file instead of string */
CONFIG_GENERIC( "snapshot-prefix", String, NULL, snapshotsPrefix );
CONFIG_GENERIC( "snapshot-sequential", Bool, NULL,
snapshotsSequentialNumbering );
CONFIG_GENERIC( "snapshot-format", StringList, NULL,
snapshotsFormat );
-
- END_SPREFS_CAT;
+ END_SPREFS_CAT;
START_SPREFS_CAT( Audio, "General audio settings" );
- #ifndef WIN32
- ui.DirectXLabel->setVisible( false );
- ui.DirectXDevice->setVisible( false );
- #endif
- #ifdef WIN32
+#ifdef WIN32
ui.OSSBrowse->hide();
ui.OSSDevice->hide();
ui.OSSLabel->hide();
ui.alsaDevice->hide();
ui.alsaLabel->hide();
- #endif
- CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
+#else
+ ui.DirectXLabel->setVisible( false );
+ ui.DirectXDevice->setVisible( false );
+#endif
+ CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
+
+/* CONFIG_GENERIC( "volume" , RangedInt, NULL, defaultVolume );*/ //FIXME Why ?
+/* CONFIG_GENERIC( "audio-language" , String , NULL,
+ preferredAudioLanguage ); */ //FIXME WHy ?
+ CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox );
+/* CONFIG_GENERIC( "force-dolby-surround" , Integer , NULL,
+ detectionDolby );*/
+
+ CONFIG_GENERIC( "aout" , Module , NULL, outputModule );
+#ifndef WIN32
+/* CONFIG_GENERIC( "alsadev" , String , NULL, alsaDevice );*/
+ CONFIG_GENERIC( "dspdev" , String , NULL, OSSDevice );//FIXME File
+#else
+ CONFIG_GENERIC( "directx-audio-device" , Integer, NULL,
+ DirectXDevice );
+#endif
+ CONFIG_GENERIC( "audiofile-file" , String , NULL, FileName ); //Fixme File
+
+
+ CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect );
+#if 0 // Not found for normalizer effect
+ CONFIG_GENERIC( "" , , NULL, );
+#endif
+ CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
END_SPREFS_CAT;
diff --git a/modules/gui/qt4/ui/sprefs_audio.ui b/modules/gui/qt4/ui/sprefs_audio.ui
index 4ddb854c17e629a6cbf8d046d645c0ebc76238c9..d7235f724d9f20defa8b849bd12def3c14e6d0e0 100644
--- a/modules/gui/qt4/ui/sprefs_audio.ui
+++ b/modules/gui/qt4/ui/sprefs_audio.ui
@@ -42,15 +42,15 @@
<property name="spacing" >
<number>6</number>
</property>
- <item row="2" column="0" colspan="2" >
+ <item row="2" column="0" >
<widget class="QLabel" name="label_8" >
<property name="text" >
<string>Force detection of Dolby Surround</string>
</property>
</widget>
</item>
- <item row="2" column="2" >
- <widget class="QComboBox" name="preferredAudioLanguage_2" >
+ <item row="2" column="1" >
+ <widget class="QComboBox" name="detectionDolby" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>3</hsizetype>
@@ -70,14 +70,14 @@
</property>
</widget>
</item>
- <item row="1" column="0" colspan="3" >
- <widget class="QCheckBox" name="checkBox" >
+ <item row="1" column="0" colspan="2" >
+ <widget class="QCheckBox" name="spdifBox" >
<property name="text" >
<string>Use S/PDIF when available</string>
</property>
</widget>
</item>
- <item row="3" column="2" >
+ <item row="3" column="1" >
<widget class="QComboBox" name="preferredAudioLanguage" >
<property name="sizePolicy" >
<sizepolicy>
@@ -95,14 +95,14 @@
</property>
</widget>
</item>
- <item row="3" column="0" colspan="2" >
+ <item row="3" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Preferred audio language</string>
</property>
</widget>
</item>
- <item row="0" column="2" >
+ <item row="0" column="1" >
<widget class="QSlider" name="defaultVolume" >
<property name="sizePolicy" >
<sizepolicy>
@@ -123,7 +123,7 @@
</property>
</widget>
</item>
- <item row="0" column="0" colspan="2" >
+ <item row="0" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Default volume</string>
diff --git a/modules/gui/qt4/ui/sprefs_video.ui b/modules/gui/qt4/ui/sprefs_video.ui
index 238ea8ee69af4d4db3611d1b8f7a20da3f2b8762..6a5cc61bf39a7aa3a5c2eb65345c5836e7fbf785 100644
--- a/modules/gui/qt4/ui/sprefs_video.ui
+++ b/modules/gui/qt4/ui/sprefs_video.ui
@@ -118,7 +118,7 @@
<number>6</number>
</property>
<item row="1" column="1" colspan="2" >
- <widget class="QComboBox" name="displayDevice" />
+ <widget class="QComboBox" name="dXdisplayDevice" />
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_5" >