[vlc-commits] Move variable types to vlc_variables.h

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul 21 16:51:58 2011 +0300| [f260a493c0b7578ca401cbab3aa7b1652a0d1304] | committer: Rémi Denis-Courmont

Move variable types to vlc_variables.h

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f260a493c0b7578ca401cbab3aa7b1652a0d1304
---

 include/vlc_common.h    |   18 ------------------
 include/vlc_variables.h |   21 ++++++++++++++++++---
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 103f2d0..4b05d0d 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -432,24 +432,6 @@ struct vlc_list_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_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_COORDS    0x00A0
-/**@}*/
-
 /*****************************************************************************
  * Error values (shouldn't be exposed)
  *****************************************************************************/
diff --git a/include/vlc_variables.h b/include/vlc_variables.h
index 8faea3f..3abbdbc 100644
--- a/include/vlc_variables.h
+++ b/include/vlc_variables.h
@@ -41,13 +41,28 @@
  * @{
  */
 
-/*****************************************************************************
- * Variable types - probably very incomplete
- *****************************************************************************/
 #define VLC_VAR_TYPE      0x00ff
 #define VLC_VAR_CLASS     0x00f0
 #define VLC_VAR_FLAGS     0xff00
 
+/**
+ * \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_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_COORDS    0x00A0
+/**@}*/
+
 /** \defgroup var_flags Additive flags
  * These flags are added to the type field of the variable. Most as a result of
  * a var_Change() call, but some may be added at creation time