Replace CONFIG_HINT and CONFIG_ITEM with a boolean macro

extras/analyser/zsh.cpp

@@ -134,16 +134,14 @@ void ParseModules( mumap &mods, mcmap &mods2 )
         i_items = 0;
         do
         {
-            if( p_item->i_type == CONFIG_CATEGORY )
-            {
-//                printf( "  #Category %d\n", p_item->i_value );
-            }
-            else if( p_item->i_type == CONFIG_SUBCATEGORY )
-            {
-//                printf( "  #Subcategory %d\n", p_item->i_value );
-            }
-            if( p_item->i_type & CONFIG_ITEM )
+            if( CONFIG_ITEM(p_item->i_type) )
                 ParseOption( p_item, mods, mods2 );
+#if 0
+            else if( p_item->i_type == CONFIG_CATEGORY )
+                printf( "  #Category %d\n", p_item->i_value );
+            else if( p_item->i_type == CONFIG_SUBCATEGORY )
+                printf( "  #Subcategory %d\n", p_item->i_value );
+#endif
         }
         while( ++i_items < p_module->confsize && p_item++ );
 

include/vlc_configuration.h

@@ -52,8 +52,6 @@ extern "C" {
 #define CONFIG_SUBCATEGORY                  0x0007 /* Set subcategory */
 #define CONFIG_SECTION                      0x0008 /* Start of new section */
 
-#define CONFIG_HINT                         0x000F
-
 /* Configuration item types */
 #define CONFIG_ITEM_STRING                  0x0010  /* String option */
 /* unused 0x0020 */
@@ -71,7 +69,7 @@ extern "C" {
 #define CONFIG_ITEM_LOADFILE                0x00E0  /* Read file option */
 #define CONFIG_ITEM_SAVEFILE                0x00F0  /* Written file option */
 
-#define CONFIG_ITEM                         0x00F0
+#define CONFIG_ITEM(x) (((x) & 0xF0) != 0)
 
 /*******************************************************************
  * All predefined categories and subcategories

modules/gui/macosx/intf.m

@@ -1068,7 +1068,7 @@ unsigned int CocoaKeyToVLC( unichar i_key )
     {
         module_config_t *p_item = p_config + i;
 
-        if( (p_item->i_type & CONFIG_ITEM) && p_item->psz_name != NULL
+        if( CONFIG_ITEM(p_item->i_type) && p_item->psz_name != NULL
            && !strncmp( p_item->psz_name , "key-", 4 )
            && !EMPTY_STR( p_item->psz_text ) )
         {

modules/gui/macosx/prefs.m

@@ -385,7 +385,7 @@ static VLCPrefs *_o_sharedMainInstance = nil;
                 }
             }
             
-            if( module_is_main( p_module) && (configType & CONFIG_ITEM) )
+            if( module_is_main( p_module) && CONFIG_ITEM(configType) )
             {
                 if( categoryItem && [self isSubCategoryGeneral:lastsubcat] )
                 {
@@ -396,7 +396,7 @@ static VLCPrefs *_o_sharedMainInstance = nil;
                     [[subCategoryItem options] addObject:[[VLCTreeLeafItem alloc] initWithConfigItem:&p_configs[j]]];
                 }
             }
-            else if( !module_is_main( p_module) && (configType & CONFIG_ITEM))
+            else if( !module_is_main( p_module) && CONFIG_ITEM(configType))
             {
                 if( ![[subCategoryItem children] containsObject: pluginItem] )
                 {

modules/gui/macosx/simple_prefs.m

@@ -628,7 +628,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
     {
         module_config_t *p_item = p_config + i;
 
-        if( (p_item->i_type & CONFIG_ITEM) && p_item->psz_name != NULL
+        if( CONFIG_ITEM(p_item->i_type) && p_item->psz_name != NULL
            && !strncmp( p_item->psz_name , "key-", 4 )
            && !EMPTY_STR( p_item->psz_text ) )
         {

modules/gui/qt4/components/complete_preferences.cpp

@@ -213,7 +213,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
             else if( p_item->i_type == CONFIG_SUBCATEGORY )
                 i_subcategory = p_item->value.i;
 
-            if( p_item->i_type & CONFIG_ITEM )
+            if( CONFIG_ITEM(p_item->i_type) )
                 b_options = true;
 
             if( b_options && i_category && i_subcategory )

modules/gui/qt4/components/preferences_widgets.cpp

@@ -1255,7 +1255,7 @@ void KeySelectorControl::finish()
         module_config_t *p_item = p_config + i;
 
         /* If we are a (non-global) key option not empty */
-        if( (p_item->i_type & CONFIG_ITEM) && p_item->psz_name != NULL
+        if( CONFIG_ITEM(p_item->i_type) && p_item->psz_name != NULL
          && !strncmp( p_item->psz_name , "key-", 4 )
          && !EMPTY_STR( p_item->psz_text ) )
         {
@@ -1277,7 +1277,7 @@ void KeySelectorControl::finish()
             continue;
         }
 
-        if( (p_item->i_type & CONFIG_ITEM) && p_item->psz_name != NULL
+        if( CONFIG_ITEM(p_item->i_type) && p_item->psz_name != NULL
          && !strncmp( p_item->psz_name , "global-key", 10 )
          && !EMPTY_STR( p_item->psz_text ) )
         {

src/config/cmdline.c

@@ -133,7 +133,7 @@ int config_LoadCmdLine( vlc_object_t *p_this, int i_argc,
              p_item++ )
         {
             /* Ignore hints */
-            if( p_item->i_type & CONFIG_HINT )
+            if( !CONFIG_ITEM(p_item->i_type) )
                 continue;
 
             /* Add item to long options */

src/config/core.c

@@ -408,7 +408,7 @@ int config_SortConfig (void)
              item < end;
              item++)
         {
-            if (item->i_type & CONFIG_HINT)
+            if (!CONFIG_ITEM(item->i_type))
                 continue; /* ignore hints */
             clist[nconf++] = item;
         }

src/config/file.c

@@ -512,7 +512,7 @@ static int SaveConfigFile (vlc_object_t *p_this)
              p_item < p_end;
              p_item++ )
         {
-            if ((p_item->i_type & CONFIG_HINT) /* ignore hint */
+            if (!CONFIG_ITEM(p_item->i_type)   /* ignore hint */
              || p_item->b_removed              /* ignore deprecated option */
              || p_item->b_unsaveable)          /* ignore volatile option */
                 continue;

src/libvlc.c

@@ -1425,7 +1425,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search )
                  p_item < p_end;
                  p_item++ )
             {
-                if( (p_item->i_type & CONFIG_ITEM) &&
+                if( CONFIG_ITEM(p_item->i_type) &&
                     !p_item->b_advanced && !p_item->b_removed ) break;
             }
 

src/modules/entry.c

@@ -140,7 +140,7 @@ static module_config_t *vlc_config_create (module_t *module, int type)
     }
     tab[confsize].i_type = type;
 
-    if (type & CONFIG_ITEM)
+    if (CONFIG_ITEM(type))
     {
         module->i_config_items++;
         if (type == CONFIG_ITEM_BOOL)