Qt forced default value is different than libvlc's saved

[vlc] / modules / gui / qt4 / qt4.hpp

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 15c0a34a276ba8d863af739f2215982d0fdca32d..577d43417ff312bf3e36ccb8fc554c37984cb819 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -32,6 +32,7 @@
 #include <vlc_common.h>    /* VLC_COMMON_MEMBERS for vlc_interface.h */
 #include <vlc_interface.h> /* intf_thread_t */
 #include <vlc_playlist.h>  /* playlist_t */
+#include <vlc_aout.h>      /* AOUT_VOLUME_ */
 
 #define QT_NO_CAST_TO_ASCII
 #include <QString>
@@ -74,7 +75,6 @@ struct intf_sys_t
 
     QString filepath;        /* Last path used in dialogs */
 
-    QMenu * p_popup_menu;    /* The right click menu */
 };
 
 #define THEPL p_intf->p_sys->p_playlist
@@ -118,11 +118,14 @@ struct intf_sys_t
 
 #define getSettings() p_intf->p_sys->mainSettings
 
+#define QT_VOLUME_DEFAULT AOUT_VOLUME_DEFAULT
+#define QT_VOLUME_MAX (AOUT_VOLUME_DEFAULT * 2)
+
 static inline QString QVLCUserDir( vlc_userdir_t type )
 {
     char *dir = config_GetUserDir( type );
     if( !dir )
-        abort();
+        return "";
     QString res = qfu( dir );
     free( dir );
     return res;