From: Rémi Denis-Courmont <rem@videolan.org>
Date: Sat, 15 Dec 2007 15:54:14 +0000 (+0000)
Subject: Hide internal settings
X-Git-Tag: 0.9.0-test0~4106
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7b558301bb858fa00e0197fdc47779a5cac9411a;hp=bb62471ff0cb881a2ac2da1b36758d35ac970250;p=vlc

Hide internal settings
---

diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index 5533968c49..cf2d66601b 100644
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -652,10 +652,6 @@ static VLCTreeItem *o_root_item = nil;
                 default:
                 {
                     VLCConfigControl *o_control = nil;
-            if( p_item->b_internal == VLC_TRUE )
-            {
-            break;
-            }
                     o_control = [VLCConfigControl newControl:p_item
                                                   withView:o_view];
                     if( o_control != nil )
diff --git a/modules/gui/wxwidgets/dialogs/preferences.cpp b/modules/gui/wxwidgets/dialogs/preferences.cpp
index 48193574d0..77b61d558b 100644
--- a/modules/gui/wxwidgets/dialogs/preferences.cpp
+++ b/modules/gui/wxwidgets/dialogs/preferences.cpp
@@ -993,8 +993,6 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
                   p_item->i_type == CONFIG_SUBCATEGORY ) )
                 break;
 
-            if( p_item->b_internal == VLC_TRUE ) continue;
-
             ConfigControl *control =
                 CreateConfigControl( VLC_OBJECT(p_intf),
                                      p_item, config_window );
diff --git a/src/modules/modules.c b/src/modules/modules.c
index ceefde8a6b..f21f6666fa 100644
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -794,13 +794,21 @@ char ** __module_GetModulesNamesForCapability( vlc_object_t *p_this,
 module_config_t *module_GetConfig (const module_t *module, unsigned *restrict psize)
 {
     unsigned size = module->confsize;
+    module_config_t *config = malloc (size * sizeof (*config));
 
     assert (psize != NULL);
-    *psize = size;
+    *psize = 0;
 
-    module_config_t *config = malloc (size * sizeof (*config));
-    if (config)
-        memcpy (config, module->p_config, size * sizeof (*config));
+    for (unsigned i = 0, j = 0; i < size; i++)
+    {
+        if (module->p_config[i].b_internal)
+            continue;
+
+        if (config != NULL)
+            memcpy (config + j, module->p_config + i, sizeof (*config));
+        *psize = j;
+        j++;
+    }
 
     return config;
 }