Move configuration defines to <vlc_plugin.h>

They are mostly used by plugin descriptors.

include/vlc_config_cat.h

@@ -24,6 +24,7 @@
 
 #ifndef VLC_HELP_H
 #define VLC_HELP_H 1
+# include <vlc_plugin.h>
 
 /*
  *  First, we need help strings for the General Settings and for the

include/vlc_configuration.h

@@ -36,95 +36,6 @@
 extern "C" {
 # endif
 
-/*****************************************************************************
- * Macros used to build the configuration structure.
- *****************************************************************************/
-
-/* Configuration hint types */
-#define CONFIG_HINT_CATEGORY                0x02  /* Start of new category */
-#define CONFIG_HINT_SUBCATEGORY             0x03  /* Start of sub-category */
-#define CONFIG_HINT_SUBCATEGORY_END         0x04  /* End of sub-category */
-#define CONFIG_HINT_USAGE                   0x05  /* Usage information */
-
-#define CONFIG_CATEGORY                     0x06 /* Set category */
-#define CONFIG_SUBCATEGORY                  0x07 /* Set subcategory */
-#define CONFIG_SECTION                      0x08 /* Start of new section */
-
-/* Configuration item types */
-#define CONFIG_ITEM_FLOAT                   0x20  /* Float option */
-#define CONFIG_ITEM_INTEGER                 0x40  /* Integer option */
-#define CONFIG_ITEM_RGB                     0x41  /* RGB color option */
-#define CONFIG_ITEM_BOOL                    0x60  /* Bool option */
-#define CONFIG_ITEM_STRING                  0x80  /* String option */
-#define CONFIG_ITEM_PASSWORD                0x81  /* Password option (*) */
-#define CONFIG_ITEM_KEY                     0x82  /* Hot key option */
-#define CONFIG_ITEM_MODULE                  0x84  /* Module option */
-#define CONFIG_ITEM_MODULE_CAT              0x85  /* Module option */
-#define CONFIG_ITEM_MODULE_LIST             0x86  /* Module option */
-#define CONFIG_ITEM_MODULE_LIST_CAT         0x87  /* Module option */
-#define CONFIG_ITEM_LOADFILE                0x8C  /* Read file option */
-#define CONFIG_ITEM_SAVEFILE                0x8D  /* Written file option */
-#define CONFIG_ITEM_DIRECTORY               0x8E  /* Directory option */
-#define CONFIG_ITEM_FONT                    0x8F  /* Font option */
-
-#define CONFIG_ITEM(x) (((x) & ~0xF) != 0)
-
-/*******************************************************************
- * All predefined categories and subcategories
- *******************************************************************/
-#define CAT_INTERFACE 1
-   #define SUBCAT_INTERFACE_GENERAL 101
-   #define SUBCAT_INTERFACE_MAIN 102
-   #define SUBCAT_INTERFACE_CONTROL 103
-   #define SUBCAT_INTERFACE_HOTKEYS 104
-
-#define CAT_AUDIO 2
-   #define SUBCAT_AUDIO_GENERAL 201
-   #define SUBCAT_AUDIO_AOUT 202
-   #define SUBCAT_AUDIO_AFILTER 203
-   #define SUBCAT_AUDIO_VISUAL 204
-   #define SUBCAT_AUDIO_MISC 205
-
-#define CAT_VIDEO 3
-   #define SUBCAT_VIDEO_GENERAL 301
-   #define SUBCAT_VIDEO_VOUT 302
-   #define SUBCAT_VIDEO_VFILTER 303
-   #define SUBCAT_VIDEO_TEXT 304
-   #define SUBCAT_VIDEO_SUBPIC 305
-   #define SUBCAT_VIDEO_VFILTER2 306
-
-#define CAT_INPUT 4
-   #define SUBCAT_INPUT_GENERAL 401
-   #define SUBCAT_INPUT_ACCESS 402
-   #define SUBCAT_INPUT_DEMUX 403
-   #define SUBCAT_INPUT_VCODEC 404
-   #define SUBCAT_INPUT_ACODEC 405
-   #define SUBCAT_INPUT_SCODEC 406
-   #define SUBCAT_INPUT_STREAM_FILTER 407
-
-#define CAT_SOUT 5
-   #define SUBCAT_SOUT_GENERAL 501
-   #define SUBCAT_SOUT_STREAM 502
-   #define SUBCAT_SOUT_MUX 503
-   #define SUBCAT_SOUT_ACO 504
-   #define SUBCAT_SOUT_PACKETIZER 505
-   #define SUBCAT_SOUT_SAP 506
-   #define SUBCAT_SOUT_VOD 507
-
-#define CAT_ADVANCED 6
-   #define SUBCAT_ADVANCED_CPU 601
-   #define SUBCAT_ADVANCED_MISC 602
-   #define SUBCAT_ADVANCED_NETWORK 603
-   #define SUBCAT_ADVANCED_XML 604
-
-#define CAT_PLAYLIST 7
-   #define SUBCAT_PLAYLIST_GENERAL 701
-   #define SUBCAT_PLAYLIST_SD 702
-   #define SUBCAT_PLAYLIST_EXPORT 703
-
-#define CAT_OSD 8
-   #define SUBCAT_OSD_IMPORT 801
-
 struct config_category_t
 {
     int         i_id;

include/vlc_plugin.h

@@ -102,6 +102,90 @@ enum vlc_module_properties
     /* Insert new VLC_CONFIG_* here */
 };
 
+/* Configuration hint types */
+#define CONFIG_HINT_CATEGORY                0x02  /* Start of new category */
+#define CONFIG_HINT_SUBCATEGORY             0x03  /* Start of sub-category */
+#define CONFIG_HINT_SUBCATEGORY_END         0x04  /* End of sub-category */
+#define CONFIG_HINT_USAGE                   0x05  /* Usage information */
+
+#define CONFIG_CATEGORY                     0x06 /* Set category */
+#define CONFIG_SUBCATEGORY                  0x07 /* Set subcategory */
+#define CONFIG_SECTION                      0x08 /* Start of new section */
+
+/* Configuration item types */
+#define CONFIG_ITEM_FLOAT                   0x20  /* Float option */
+#define CONFIG_ITEM_INTEGER                 0x40  /* Integer option */
+#define CONFIG_ITEM_RGB                     0x41  /* RGB color option */
+#define CONFIG_ITEM_BOOL                    0x60  /* Bool option */
+#define CONFIG_ITEM_STRING                  0x80  /* String option */
+#define CONFIG_ITEM_PASSWORD                0x81  /* Password option (*) */
+#define CONFIG_ITEM_KEY                     0x82  /* Hot key option */
+#define CONFIG_ITEM_MODULE                  0x84  /* Module option */
+#define CONFIG_ITEM_MODULE_CAT              0x85  /* Module option */
+#define CONFIG_ITEM_MODULE_LIST             0x86  /* Module option */
+#define CONFIG_ITEM_MODULE_LIST_CAT         0x87  /* Module option */
+#define CONFIG_ITEM_LOADFILE                0x8C  /* Read file option */
+#define CONFIG_ITEM_SAVEFILE                0x8D  /* Written file option */
+#define CONFIG_ITEM_DIRECTORY               0x8E  /* Directory option */
+#define CONFIG_ITEM_FONT                    0x8F  /* Font option */
+
+#define CONFIG_ITEM(x) (((x) & ~0xF) != 0)
+
+/* Categories and subcategories */
+#define CAT_INTERFACE 1
+#define SUBCAT_INTERFACE_GENERAL 101
+#define SUBCAT_INTERFACE_MAIN 102
+#define SUBCAT_INTERFACE_CONTROL 103
+#define SUBCAT_INTERFACE_HOTKEYS 104
+
+#define CAT_AUDIO 2
+#define SUBCAT_AUDIO_GENERAL 201
+#define SUBCAT_AUDIO_AOUT 202
+#define SUBCAT_AUDIO_AFILTER 203
+#define SUBCAT_AUDIO_VISUAL 204
+#define SUBCAT_AUDIO_MISC 205
+
+#define CAT_VIDEO 3
+#define SUBCAT_VIDEO_GENERAL 301
+#define SUBCAT_VIDEO_VOUT 302
+#define SUBCAT_VIDEO_VFILTER 303
+#define SUBCAT_VIDEO_TEXT 304
+#define SUBCAT_VIDEO_SUBPIC 305
+#define SUBCAT_VIDEO_VFILTER2 306
+
+#define CAT_INPUT 4
+#define SUBCAT_INPUT_GENERAL 401
+#define SUBCAT_INPUT_ACCESS 402
+#define SUBCAT_INPUT_DEMUX 403
+#define SUBCAT_INPUT_VCODEC 404
+#define SUBCAT_INPUT_ACODEC 405
+#define SUBCAT_INPUT_SCODEC 406
+#define SUBCAT_INPUT_STREAM_FILTER 407
+
+#define CAT_SOUT 5
+#define SUBCAT_SOUT_GENERAL 501
+#define SUBCAT_SOUT_STREAM 502
+#define SUBCAT_SOUT_MUX 503
+#define SUBCAT_SOUT_ACO 504
+#define SUBCAT_SOUT_PACKETIZER 505
+#define SUBCAT_SOUT_SAP 506
+#define SUBCAT_SOUT_VOD 507
+
+#define CAT_ADVANCED 6
+#define SUBCAT_ADVANCED_CPU 601
+#define SUBCAT_ADVANCED_MISC 602
+#define SUBCAT_ADVANCED_NETWORK 603
+#define SUBCAT_ADVANCED_XML 604
+
+#define CAT_PLAYLIST 7
+#define SUBCAT_PLAYLIST_GENERAL 701
+#define SUBCAT_PLAYLIST_SD 702
+#define SUBCAT_PLAYLIST_EXPORT 703
+
+#define CAT_OSD 8
+#define SUBCAT_OSD_IMPORT 801
+
+
 /**
  * Current plugin ABI version
  */

modules/gui/macosx/intf.m

@@ -39,6 +39,7 @@
 #include <vlc_dialog.h>
 #include <vlc_url.h>
 #include <vlc_modules.h>
+#include <vlc_plugin.h>
 #include <vlc_aout_intf.h>
 #include <vlc_vout_window.h>
 #include <unistd.h> /* execl() */

modules/gui/macosx/prefs.m

@@ -59,6 +59,7 @@
 #import "prefs_widgets.h"
 #import <vlc_keys.h>
 #import <vlc_modules.h>
+#import <vlc_plugin.h>
 
 /* /!\ Warning: Unreadable code :/ */
 

modules/gui/macosx/prefs_widgets.m

@@ -34,6 +34,7 @@
 
 #include <vlc_common.h>
 #include <vlc_modules.h>
+#include <vlc_plugin.h>
 #include <vlc_keys.h>
 
 #include "intf.h"

modules/gui/macosx/simple_prefs.m

@@ -32,6 +32,7 @@
 #import <vlc_aout_intf.h>
 #import <vlc_dialog.h>
 #import <vlc_modules.h>
+#import <vlc_plugin.h>
 #import <vlc_config_cat.h>
 #import "misc.h"
 #import "intf.h"

modules/gui/qt4/components/complete_preferences.cpp

@@ -42,6 +42,7 @@
 #include <vlc_config_cat.h>
 #include <vlc_intf_strings.h>
 #include <vlc_modules.h>
+#include <vlc_plugin.h>
 #include <assert.h>
 
 #define ITEM_HEIGHT 25

modules/gui/qt4/components/extended_panels.cpp

@@ -49,6 +49,7 @@
 #include <vlc_vout.h>
 #include <vlc_osd.h>
 #include <vlc_modules.h>
+#include <vlc_plugin.h>
 
 #include <vlc_charset.h> /* us_strtod */
 

modules/gui/qt4/components/open_panels.cpp

@@ -37,6 +37,7 @@
 #include "util/qt_dirs.hpp"
 #include <vlc_intf_strings.h>
 #include <vlc_modules.h>
+#include <vlc_plugin.h>
 #ifdef WIN32
   #include <vlc_charset.h> /* FromWide for Win32 */
 #endif

modules/gui/qt4/components/preferences_widgets.cpp

@@ -39,6 +39,7 @@
 #include <vlc_keys.h>
 #include <vlc_intf_strings.h>
 #include <vlc_modules.h>
+#include <vlc_plugin.h>
 
 #include <QString>
 #include <QVariant>
@@ -243,6 +244,8 @@ StringConfigControl::StringConfigControl( vlc_object_t *_p_this,
     finish( );
 }
 
+int VStringConfigControl::getType() const { return CONFIG_ITEM_STRING; }
+
 void StringConfigControl::finish()
 {
     text->setText( qfu(p_item->value.psz) );
@@ -917,6 +920,8 @@ int IntegerConfigControl::getValue() const
     return spin->value();
 }
 
+int VIntConfigControl::getType() const { return CONFIG_ITEM_INTEGER; }
+
 /********* Integer range **********/
 IntegerRangeConfigControl::IntegerRangeConfigControl( vlc_object_t *_p_this,
                                             module_config_t *_p_item,
@@ -1122,6 +1127,8 @@ BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
     finish();
 }
 
+int BoolConfigControl::getType() const { return CONFIG_ITEM_BOOL; }
+
 void BoolConfigControl::finish()
 {
     checkbox->setChecked( p_item->value.i );
@@ -1242,6 +1249,8 @@ FloatConfigControl::FloatConfigControl( vlc_object_t *_p_this,
     }
 }
 
+int VFloatConfigControl::getType() const { return CONFIG_ITEM_FLOAT; }
+
 FloatConfigControl::FloatConfigControl( vlc_object_t *_p_this,
                                         module_config_t *_p_item,
                                         QLabel *_label,
@@ -1346,6 +1355,8 @@ KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this,
              this, filter( const QString& ) );
 }
 
+int KeySelectorControl::getType() const { return CONFIG_ITEM_KEY; }
+
 void KeySelectorControl::finish()
 {
     if( label && p_item->psz_longtext )
@@ -1617,4 +1628,3 @@ void KeyInputDialog::wheelEvent( QWheelEvent *e )
     checkForConflicts( i_vlck );
     keyValue = i_vlck;
 }
-

modules/gui/qt4/components/preferences_widgets.hpp

@@ -124,7 +124,7 @@ public:
     VIntConfigControl( vlc_object_t *a, module_config_t *b ) :
                 ConfigControl(a,b) {};
     virtual int getValue() const = 0;
-    virtual int getType() const { return CONFIG_ITEM_INTEGER; }
+    virtual int getType() const;
     virtual void doApply();
 };
 
@@ -203,7 +203,7 @@ public:
     virtual int getValue() const;
     virtual void show() { checkbox->show(); }
     virtual void hide() { checkbox->hide(); }
-    virtual int getType() const { return CONFIG_ITEM_BOOL; }
+    virtual int getType() const;
 private:
     QAbstractButton *checkbox;
     void finish();
@@ -241,7 +241,7 @@ public:
     VFloatConfigControl( vlc_object_t *a, module_config_t *b ) :
                 ConfigControl(a,b) {};
     virtual float getValue() const = 0;
-    virtual int getType() const { return CONFIG_ITEM_FLOAT; }
+    virtual int getType() const;
     virtual void doApply();
 };
 
@@ -289,7 +289,7 @@ public:
     VStringConfigControl( vlc_object_t *a, module_config_t *b ) :
                 ConfigControl(a,b) {};
     virtual QString getValue() const = 0;
-    virtual int getType() const { return CONFIG_ITEM_STRING; }
+    virtual int getType() const;
     virtual void doApply();
 };
 
@@ -454,7 +454,7 @@ class KeySelectorControl : public ConfigControl
 public:
     KeySelectorControl( vlc_object_t *, module_config_t *, QWidget *,
                         QGridLayout*, int );
-    virtual int getType() const { return CONFIG_ITEM_KEY; }
+    virtual int getType() const;
     virtual void hide() { table->hide(); if( label ) label->hide(); }
     virtual void show() { table->show(); if( label ) label->show(); }
     virtual void doApply();

src/config/cmdline.c

@@ -30,6 +30,7 @@
 #include <vlc_keys.h>
 #include <vlc_charset.h>
 #include <vlc_modules.h>
+#include <vlc_plugin.h>
 
 #include "vlc_getopt.h"
 

src/config/configuration.h

@@ -43,20 +43,12 @@ void config_UnsortConfig (void);
 
 #define CONFIG_CLASS(x) ((x) & ~0x1F)
 
-static inline bool IsConfigStringType(unsigned type)
-{
-    return (type & CONFIG_ITEM_STRING) != 0;
-}
-
-static inline bool IsConfigIntegerType (int type)
-{
-    return (type & CONFIG_ITEM_INTEGER) != 0;
-}
-
-static inline bool IsConfigFloatType (int type)
-{
-    return type == CONFIG_ITEM_FLOAT;
-}
+#define IsConfigStringType(type) \
+    (((type) & CONFIG_ITEM_STRING) != 0)
+#define IsConfigIntegerType(type) \
+    (((type) & CONFIG_ITEM_INTEGER) != 0)
+#define IsConfigFloatType(type) \
+    ((type) == CONFIG_ITEM_FLOAT)
 
 extern vlc_rwlock_t config_lock;
 

src/config/core.c

@@ -28,6 +28,7 @@
 #include <vlc_common.h>
 #include <vlc_keys.h>
 #include <vlc_modules.h>
+#include <vlc_plugin.h>
 
 #include "vlc_configuration.h"
 

src/config/file.c

@@ -45,6 +45,7 @@
 #include <vlc_fs.h>
 #include <vlc_keys.h>
 #include <vlc_modules.h>
+#include <vlc_plugin.h>
 
 #include "configuration.h"
 #include "modules/modules.h"

src/config/help.c

@@ -22,16 +22,18 @@
 # include "config.h"
 #endif
 
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
 #include <vlc_common.h>
 #include <vlc_charset.h>
 #include <vlc_modules.h>
+#include <vlc_plugin.h>
 #include "modules/modules.h"
 #include "config/configuration.h"
 #include "libvlc.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 #if defined( WIN32 ) && !defined( UNDER_CE )
 static void ShowConsole (void);
 static void PauseConsole (void);