* ./debian/Makefile.am: added woody-buildpackage, removed *.woody.

[vlc] / include / variables.h

diff --git a/include/variables.h b/include/variables.h
index cb822d4427ad5affe922a75db48c7c4fd7c6990a..84febb153d3e81c92f19e8ea3ed9d68c8f4941fa 100644 (file)
--- a/include/variables.h
+++ b/include/variables.h
@@ -2,7 +2,7 @@
  * variables.h: variables handling
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: variables.h,v 1.8 2002/11/11 14:39:11 sam Exp $
+ * $Id: variables.h,v 1.11 2002/12/14 19:34:07 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -51,8 +51,7 @@ struct variable_t
 
     /* If the variable is to be chosen in a list */
     int          i_default;
-    int          i_choices;
-    vlc_value_t *pp_choices;
+    vlc_list_t   choices;
 
     /* Set to TRUE if the variable is in a callback */
     vlc_bool_t   b_incallback;
@@ -69,23 +68,28 @@ struct variable_t
 #define VLC_VAR_FLAGS     0xff00
 
 /* Different types */
-#define VLC_VAR_BOOL      0x0010
-#define VLC_VAR_INTEGER   0x0020
-#define VLC_VAR_STRING    0x0030
-#define VLC_VAR_MODULE    0x0031
-#define VLC_VAR_FILE      0x0032
-#define VLC_VAR_FLOAT     0x0040
-#define VLC_VAR_TIME      0x0050
-#define VLC_VAR_ADDRESS   0x0060
-#define VLC_VAR_COMMAND   0x0070
+#define VLC_VAR_VOID      0x0010
+#define VLC_VAR_BOOL      0x0020
+#define VLC_VAR_INTEGER   0x0030
+#define VLC_VAR_STRING    0x0040
+#define VLC_VAR_MODULE    0x0041
+#define VLC_VAR_FILE      0x0042
+#define VLC_VAR_DIRECTORY 0x0043
+#define VLC_VAR_FLOAT     0x0050
+#define VLC_VAR_TIME      0x0060
+#define VLC_VAR_ADDRESS   0x0070
 #define VLC_VAR_MUTEX     0x0080
 
 /* Additive flags */
-#define VLC_VAR_ISLIST    0x0100
+#define VLC_VAR_HASCHOICE 0x0100
 #define VLC_VAR_HASMIN    0x0200
 #define VLC_VAR_HASMAX    0x0400
 #define VLC_VAR_HASSTEP   0x0800
 
+#define VLC_VAR_ISLIST    0x1000
+#define VLC_VAR_ISCOMMAND 0x2000
+#define VLC_VAR_ISCONFIG  0x2000
+
 /*****************************************************************************
  * Variable actions
  *****************************************************************************/