[vlc-devel] commit: include/vlc: vlc also includes this headers, so make sure vlc_common.h is included early enough. (Pierre d'Herbemont )
git version control
git at videolan.org
Wed Mar 26 21:05:08 CET 2008
vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Wed Mar 26 21:04:45 2008 +0100| [fa9b34d3b84fcc1eb093fe50c5e277798f1f4774]
include/vlc: vlc also includes this headers, so make sure vlc_common.h is included early enough.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fa9b34d3b84fcc1eb093fe50c5e277798f1f4774
---
include/vlc/common.h | 120 ++++++++++++++++++++++++++++++++++++++++++----
include/vlc/deprecated.h | 111 +++++++++++++------------------------------
2 files changed, 143 insertions(+), 88 deletions(-)
diff --git a/include/vlc/common.h b/include/vlc/common.h
index bd74910..860dcb6 100644
--- a/include/vlc/common.h
+++ b/include/vlc/common.h
@@ -36,10 +36,114 @@
#ifndef _VLC_COMMON_H
#define _VLC_COMMON_H 1
-#ifndef __cplusplus
-# include <stdbool.h>
+# ifdef __cplusplus
+extern "C" {
+# else
+# include <stdbool.h>
+# endif
+
+/*****************************************************************************
+ * Our custom types
+ *****************************************************************************/
+typedef bool vlc_bool_t; /* (shouldn't be exposed) */
+typedef struct vlc_list_t vlc_list_t; /* (shouldn't be exposed) */
+typedef struct vlc_object_t vlc_object_t; /* (shouldn't be exposed) */
+
+#if (defined( WIN32 ) || defined( UNDER_CE )) && !defined( __MINGW32__ )
+typedef signed __int64 vlc_int64_t;
+# else
+typedef signed long long vlc_int64_t;
#endif
+/**
+ * VLC value structure (shouldn't be exposed)
+ */
+typedef union
+{
+ int i_int;
+ vlc_bool_t b_bool;
+ float f_float;
+ char * psz_string;
+ void * p_address;
+ vlc_object_t * p_object;
+ vlc_list_t * p_list;
+ vlc_int64_t i_time;
+
+ struct { char *psz_name; int i_object_id; } var;
+
+ /* Make sure the structure is at least 64bits */
+ struct { char a, b, c, d, e, f, g, h; } padding;
+
+} vlc_value_t;
+
+/**
+ * VLC list structure (shouldn't be exposed)
+ */
+struct vlc_list_t
+{
+ int i_count;
+ vlc_value_t * p_values;
+ int * pi_types;
+
+};
+
+/*****************************************************************************
+ * Error values (shouldn't be exposed)
+ *****************************************************************************/
+#define VLC_SUCCESS -0 /* No error */
+#define VLC_ENOMEM -1 /* Not enough memory */
+#define VLC_ETHREAD -2 /* Thread error */
+#define VLC_ETIMEOUT -3 /* Timeout */
+
+#define VLC_ENOMOD -10 /* Module not found */
+
+#define VLC_ENOOBJ -20 /* Object not found */
+#define VLC_EBADOBJ -21 /* Bad object type */
+
+#define VLC_ENOVAR -30 /* Variable not found */
+#define VLC_EBADVAR -31 /* Bad variable value */
+
+#define VLC_ENOITEM -40 /**< Item not found */
+
+#define VLC_EEXIT -255 /* Program exited */
+#define VLC_EEXITSUCCESS -999 /* Program exited successfully */
+#define VLC_EGENERIC -666 /* Generic error */
+
+/*****************************************************************************
+ * Booleans (shouldn't be exposed)
+ *****************************************************************************/
+#define VLC_FALSE false
+#define VLC_TRUE true
+
+/**
+ * \defgroup var_type Variable types (shouldn't be exposed)
+ * These are the different types a vlc variable can have.
+ * @{
+ */
+#define VLC_VAR_VOID 0x0010
+#define VLC_VAR_BOOL 0x0020
+#define VLC_VAR_INTEGER 0x0030
+#define VLC_VAR_HOTKEY 0x0031
+#define VLC_VAR_STRING 0x0040
+#define VLC_VAR_MODULE 0x0041
+#define VLC_VAR_FILE 0x0042
+#define VLC_VAR_DIRECTORY 0x0043
+#define VLC_VAR_VARIABLE 0x0044
+#define VLC_VAR_FLOAT 0x0050
+#define VLC_VAR_TIME 0x0060
+#define VLC_VAR_ADDRESS 0x0070
+#define VLC_VAR_MUTEX 0x0080
+#define VLC_VAR_LIST 0x0090
+/**@}*/
+
+/*****************************************************************************
+ * Required internal headers
+ *****************************************************************************/
+#if defined( __LIBVLC__ )
+# include "vlc_common.h"
+#endif
+
+
/*****************************************************************************
* Shared library Export macros
*****************************************************************************/
@@ -64,14 +168,10 @@
# endif /* __LIBVLC__ */
#endif
-/*****************************************************************************
- * Types
- *****************************************************************************/
-#if (defined( WIN32 ) || defined( UNDER_CE )) && !defined( __MINGW32__ )
-typedef signed __int64 vlc_int64_t;
-# else
-typedef signed long long vlc_int64_t;
-#endif
+# ifdef __cplusplus
+}
+# endif
+
#endif /* _VLC_COMMON_H */
diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h
index 3415ddb..3de7ded 100644
--- a/include/vlc/deprecated.h
+++ b/include/vlc/deprecated.h
@@ -211,65 +211,24 @@ VLC_DEPRECATED_API libvlc_media_instance_t * libvlc_playlist_get_media_instance(
* @{
*/
+
/*****************************************************************************
- * Our custom types
+ * Exported vlc API (Deprecated)
*****************************************************************************/
-typedef bool vlc_bool_t;
-typedef struct vlc_list_t vlc_list_t;
-typedef struct vlc_object_t vlc_object_t;
-/**
- * \defgroup var_type Variable types
- * These are the different types a vlc variable can have.
- * @{
- */
-#define VLC_VAR_VOID 0x0010
-#define VLC_VAR_BOOL 0x0020
-#define VLC_VAR_INTEGER 0x0030
-#define VLC_VAR_HOTKEY 0x0031
-#define VLC_VAR_STRING 0x0040
-#define VLC_VAR_MODULE 0x0041
-#define VLC_VAR_FILE 0x0042
-#define VLC_VAR_DIRECTORY 0x0043
-#define VLC_VAR_VARIABLE 0x0044
-#define VLC_VAR_FLOAT 0x0050
-#define VLC_VAR_TIME 0x0060
-#define VLC_VAR_ADDRESS 0x0070
-#define VLC_VAR_MUTEX 0x0080
-#define VLC_VAR_LIST 0x0090
-/**@}*/
-
-/**
- * VLC value structure
- */
-typedef union
-{
- int i_int;
- vlc_bool_t b_bool;
- float f_float;
- char * psz_string;
- void * p_address;
- vlc_object_t * p_object;
- vlc_list_t * p_list;
- vlc_int64_t i_time;
-
- struct { char *psz_name; int i_object_id; } var;
-
- /* Make sure the structure is at least 64bits */
- struct { char a, b, c, d, e, f, g, h; } padding;
-
-} vlc_value_t;
+/*****************************************************************************
+ * Playlist
+ *****************************************************************************/
-/**
- * VLC list structure
- */
-struct vlc_list_t
-{
- int i_count;
- vlc_value_t * p_values;
- int * pi_types;
+/* Used by VLC_AddTarget() */
+#define PLAYLIST_INSERT 0x0001
+#define PLAYLIST_APPEND 0x0002
+#define PLAYLIST_GO 0x0004
+#define PLAYLIST_PREPARSE 0x0008
+#define PLAYLIST_SPREPARSE 0x0010
+#define PLAYLIST_NO_REBUILD 0x0020
-};
+#define PLAYLIST_END -666
/*****************************************************************************
* Error values
@@ -299,31 +258,27 @@ struct vlc_list_t
#define VLC_FALSE false
#define VLC_TRUE true
-/*****************************************************************************
- * Playlist
- *****************************************************************************/
-
-/* Used by VLC_AddTarget() */
-#define PLAYLIST_INSERT 0x0001
-#define PLAYLIST_APPEND 0x0002
-#define PLAYLIST_GO 0x0004
-#define PLAYLIST_PREPARSE 0x0008
-#define PLAYLIST_SPREPARSE 0x0010
-#define PLAYLIST_NO_REBUILD 0x0020
-
-#define PLAYLIST_END -666
-
-/*****************************************************************************
- * Required internal headers
- *****************************************************************************/
-#if defined( __LIBVLC__ )
-# include "vlc_common.h"
-#endif
-
+/**
+ * \defgroup var_type Variable types
+ * These are the different types a vlc variable can have.
+ * @{
+ */
+#define VLC_VAR_VOID 0x0010
+#define VLC_VAR_BOOL 0x0020
+#define VLC_VAR_INTEGER 0x0030
+#define VLC_VAR_HOTKEY 0x0031
+#define VLC_VAR_STRING 0x0040
+#define VLC_VAR_MODULE 0x0041
+#define VLC_VAR_FILE 0x0042
+#define VLC_VAR_DIRECTORY 0x0043
+#define VLC_VAR_VARIABLE 0x0044
+#define VLC_VAR_FLOAT 0x0050
+#define VLC_VAR_TIME 0x0060
+#define VLC_VAR_ADDRESS 0x0070
+#define VLC_VAR_MUTEX 0x0080
+#define VLC_VAR_LIST 0x0090
+/**@}*/
-/*****************************************************************************
- * Exported vlc API (Deprecated)
- *****************************************************************************/
#if !defined( __LIBVLC__ )
/* Otherwise they are declared and exported in vlc_common.h */
More information about the vlc-devel
mailing list