Commit 381a5cb4 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - Pref: start to track functionnalities missing. Directory still segfaults..

parent 2cb0f893
...@@ -108,5 +108,5 @@ struct module_t ...@@ -108,5 +108,5 @@ struct module_t
VLC_EXPORT( module_t *, __module_Need, ( vlc_object_t *, const char *, const char *, vlc_bool_t ) ); VLC_EXPORT( module_t *, __module_Need, ( vlc_object_t *, const char *, const char *, vlc_bool_t ) );
#define module_Unneed(a,b) __module_Unneed(VLC_OBJECT(a),b) #define module_Unneed(a,b) __module_Unneed(VLC_OBJECT(a),b)
VLC_EXPORT( void, __module_Unneed, ( vlc_object_t *, module_t * ) ); VLC_EXPORT( void, __module_Unneed, ( vlc_object_t *, module_t * ) );
#define module_Exist(a,b) __module_Exists(VLC_OBJECT(a),b) #define module_Exists(a,b) __module_Exists(VLC_OBJECT(a),b)
VLC_EXPORT( vlc_bool_t, __module_Exists, ( vlc_object_t *, const char * ) ); VLC_EXPORT( vlc_bool_t, __module_Exists, ( vlc_object_t *, const char * ) );
...@@ -274,7 +274,7 @@ public: ...@@ -274,7 +274,7 @@ public:
virtual void show() { text->show(); label->show(); browse->show(); } virtual void show() { text->show(); label->show(); browse->show(); }
virtual void hide() { text->hide(); label->hide(); browse->hide(); } virtual void hide() { text->hide(); label->hide(); browse->hide(); }
public slots: public slots:
void updateField(); virtual void updateField();
protected: protected:
void finish(); void finish();
private: private:
...@@ -296,7 +296,7 @@ public: ...@@ -296,7 +296,7 @@ public:
virtual void show() { text->show(); label->show(); browse->show(); } virtual void show() { text->show(); label->show(); browse->show(); }
virtual void hide() { text->hide(); label->hide(); browse->hide(); } virtual void hide() { text->hide(); label->hide(); browse->hide(); }
public slots: public slots:
void updateField(); virtual void updateField();
private: private:
QLineEdit *text; QLineEdit *text;
QLabel *label; QLabel *label;
......
...@@ -123,8 +123,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -123,8 +123,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
controls.append( control ); \ controls.append( control ); \
} }
#define START_SPREFS_CAT( name , label ) \ #define START_SPREFS_CAT( name , label ) \
case SPrefs ## name: \ case SPrefs ## name: \
{ \ { \
...@@ -199,7 +197,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -199,7 +197,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL, CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL,
defaultVolume ); defaultVolume );
CONFIG_GENERIC( "audio-language" , StringList , NULL, CONFIG_GENERIC( "audio-language" , StringList , NULL,
preferredAudioLanguage ); preferredAudioLanguage ); //FIXME
CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox ); CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox );
CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL, CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL,
detectionDolby ); detectionDolby );
...@@ -216,7 +215,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -216,7 +215,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
fileBrowseButton ); fileBrowseButton );
CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect ); CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect );
// CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer // CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer //FIXME
CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL, CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL,
volNormalizer ); volNormalizer );
CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation); CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
...@@ -225,13 +224,13 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -225,13 +224,13 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
/* Input and Codecs Panel Implementation */ /* Input and Codecs Panel Implementation */
START_SPREFS_CAT( InputAndCodecs, "Input & Codecs settings" ); START_SPREFS_CAT( InputAndCodecs, "Input & Codecs settings" );
/* Disk Devices */ /* Disk Devices */
/* CONFIG_GENERIC( );*/ /* CONFIG_GENERIC( );*/ //FIXME
CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort ); CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort );
CONFIG_GENERIC( "http-proxy", String , NULL, proxy ); CONFIG_GENERIC( "http-proxy", String , NULL, proxy );
/* Caching */ /* Caching */
/* CONFIG_GENERIC( );*/ /* CONFIG_GENERIC( );*/ //FIXME
CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel ); CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel );
CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair ); CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair );
...@@ -244,8 +243,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -244,8 +243,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
/* Interface Panel */ /* Interface Panel */
START_SPREFS_CAT( Interface, "Interfaces settings" ); START_SPREFS_CAT( Interface, "Interfaces settings" );
CONFIG_GENERIC( "language", StringList, NULL, language ); CONFIG_GENERIC( "language", StringList, NULL, language );//FIXME
#if !defined( WIN32 ) && !defined( HAVE_DBUS_3 ) #if !defined( WIN32 ) && !defined( HAVE_DBUS_3 )
ui.OneInterfaceBox->hide(); ui.OneInterfaceBox->hide();
#endif #endif
...@@ -270,8 +269,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -270,8 +269,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC( "osd", Bool, NULL, OSDBox); CONFIG_GENERIC( "osd", Bool, NULL, OSDBox);
CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding ); CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding );
CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage ); CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );//FIXME
CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font, CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font,
fontBrowse ); fontBrowse );
CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor ); CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor );
...@@ -282,6 +280,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -282,6 +280,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
END_SPREFS_CAT; END_SPREFS_CAT;
START_SPREFS_CAT( Hotkeys, "Configure Hotkeys" ); START_SPREFS_CAT( Hotkeys, "Configure Hotkeys" );
//FIMXE
END_SPREFS_CAT; END_SPREFS_CAT;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment