Commit d875f9d5 authored by Gildas Bazin's avatar Gildas Bazin

* modules/gui/wxwindows/preferences.cpp: fixed the preferences to also show the config options of sub-modules.
* include/modules_inner.h: removed unneeded initialization.
parent 5adb89a3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* modules_inner.h : Macros used from within a module. * modules_inner.h : Macros used from within a module.
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: modules_inner.h,v 1.37 2003/01/19 03:16:24 sam Exp $ * $Id: modules_inner.h,v 1.38 2003/06/16 21:55:58 gbazin Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -113,10 +113,7 @@ ...@@ -113,10 +113,7 @@
p_submodule->pp_shortcuts[ i_shortcut ] = NULL; \ p_submodule->pp_shortcuts[ i_shortcut ] = NULL; \
} \ } \
{ \ { \
static module_config_t tmp = { CONFIG_HINT_END, NULL, NULL, '\0', \ static module_config_t tmp = { CONFIG_HINT_END }; \
NULL, NULL, NULL, 0, 0.0, 0, 0, \
0.0, 0.0, NULL,NULL, NULL, \
VLC_FALSE }; \
p_config[ i_config ] = tmp; \ p_config[ i_config ] = tmp; \
} \ } \
config_Duplicate( p_module, p_config ); \ config_Duplicate( p_module, p_config ); \
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* preferences.cpp : wxWindows plugin for vlc * preferences.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: preferences.cpp,v 1.19 2003/06/09 12:33:17 asmax Exp $ * $Id: preferences.cpp,v 1.20 2003/06/16 21:55:58 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -401,8 +401,13 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf, ...@@ -401,8 +401,13 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
if( !strcmp( p_module->psz_object_name, "main" ) ) if( !strcmp( p_module->psz_object_name, "main" ) )
continue; continue;
/* Exclude empty plugins */ /* Exclude empty plugins (submodules don't have config options, they
p_item = p_module->p_config; * are stored in the parent module) */
if( p_module->b_submodule )
p_item = ((module_t *)p_module->p_parent)->p_config;
else
p_item = p_module->p_config;
if( !p_item ) continue; if( !p_item ) continue;
do do
{ {
...@@ -655,8 +660,13 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf, ...@@ -655,8 +660,13 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
return; return;
} }
/* Enumerate config options and add corresponding config boxes */ /* Enumerate config options and add corresponding config boxes
p_item = p_module->p_config; * (submodules don't have config options, they are stored in the
* parent module) */
if( p_module->b_submodule )
p_item = ((module_t *)p_module->p_parent)->p_config;
else
p_item = p_module->p_config;
/* Find the category if it has been specified */ /* Find the category if it has been specified */
if( psz_section && p_item->i_type == CONFIG_HINT_CATEGORY ) if( psz_section && p_item->i_type == CONFIG_HINT_CATEGORY )
......
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