* modules/gui/wxwindows/preferences.cpp: fixed the preferences to also show the confi...

* include/modules_inner.h: removed unneeded initialization.

diff --git a/include/modules_inner.h b/include/modules_inner.h
index d7b5af1dccfd0d6827fe84513cd88974bc62e560..b84072b47ed6e432e9af4945fb1ea893fcf340af 100644 (file)
--- a/include/modules_inner.h
+++ b/include/modules_inner.h
@@ -2,7 +2,7 @@
  * modules_inner.h : Macros used from within a module.
  *****************************************************************************
  * 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>
  *
@@ -113,10 +113,7 @@
             p_submodule->pp_shortcuts[ i_shortcut ] = NULL;                   \
         }                                                                     \
         {                                                                     \
-            static module_config_t tmp = { CONFIG_HINT_END, NULL, NULL, '\0', \
-                                           NULL, NULL, NULL, 0, 0.0, 0, 0,    \
-                                           0.0, 0.0, NULL,NULL, NULL,         \
-                                           VLC_FALSE };                       \
+            static module_config_t tmp = { CONFIG_HINT_END };                 \
             p_config[ i_config ] = tmp;                                       \
         }                                                                     \
         config_Duplicate( p_module, p_config );                               \

diff --git a/modules/gui/wxwindows/preferences.cpp b/modules/gui/wxwindows/preferences.cpp
index af0e2b1df70d838f3c2f004c5e955c058104ed00..66cabba037b925d42680f1af031f13695378d577 100644 (file)
--- a/modules/gui/wxwindows/preferences.cpp
+++ b/modules/gui/wxwindows/preferences.cpp
@@ -2,7 +2,7 @@
  * preferences.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * 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>
  *
@@ -401,8 +401,13 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
         if( !strcmp( p_module->psz_object_name, "main" ) )
             continue;
 
-        /* Exclude empty plugins */
-        p_item = p_module->p_config;
+        /* Exclude empty plugins (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;
+
         if( !p_item ) continue;
         do
         {
@@ -655,8 +660,13 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
         return;
     }
 
-    /* Enumerate config options and add corresponding config boxes */
-    p_item = p_module->p_config;
+    /* Enumerate config options and add corresponding config boxes
+     * (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 */
     if( psz_section && p_item->i_type == CONFIG_HINT_CATEGORY )