[libchamplainmm] Regenerate libchamplain_enums.defs



commit 509c30f160dfb3eda1860162bae1b5082cd776cf
Author: Juan R. GarcĂ­a Blanco <juanrgar gmail com>
Date:   Tue Feb 25 20:54:29 2014 +0100

    Regenerate libchamplain_enums.defs

 libchamplain/src/libchamplain_enums.defs |  110 ++++++++++++++++++++++++++----
 1 files changed, 96 insertions(+), 14 deletions(-)
---
diff --git a/libchamplain/src/libchamplain_enums.defs b/libchamplain/src/libchamplain_enums.defs
index ea63a6a..1ec39c0 100644
--- a/libchamplain/src/libchamplain_enums.defs
+++ b/libchamplain/src/libchamplain_enums.defs
@@ -1,27 +1,58 @@
-;; From champlain-defines.h
+;; From champlain-debug.h
 
-(define-enum-extended State
+;; Original typedef:
+;; typedef enum
+;; {
+;;   CHAMPLAIN_DEBUG_LOADING = 1 << 1,
+;;   CHAMPLAIN_DEBUG_ENGINE = 1 << 2,
+;;   CHAMPLAIN_DEBUG_VIEW = 1 << 3,
+;;   CHAMPLAIN_DEBUG_NETWORK = 1 << 4,
+;;   CHAMPLAIN_DEBUG_CACHE = 1 << 5,
+;;   CHAMPLAIN_DEBUG_SELECTION = 1 << 6,
+;;   CHAMPLAIN_DEBUG_MEMPHIS = 1 << 7,
+;;   CHAMPLAIN_DEBUG_OTHER = 1 << 8,
+;; } ChamplainDebugFlags;
+
+(define-flags-extended DebugFlags
   (in-module "Champlain")
-  (c-name "ChamplainState")
+  (c-name "ChamplainDebugFlags")
   (values
-    '("none" "CHAMPLAIN_STATE_NONE" "0")
-    '("init" "CHAMPLAIN_STATE_INIT" "1")
-    '("loading" "CHAMPLAIN_STATE_LOADING" "2")
-    '("done" "CHAMPLAIN_STATE_DONE" "3")
+    '("loading" "CHAMPLAIN_DEBUG_LOADING" "1 << 1")
+    '("engine" "CHAMPLAIN_DEBUG_ENGINE" "1 << 2")
+    '("view" "CHAMPLAIN_DEBUG_VIEW" "1 << 3")
+    '("network" "CHAMPLAIN_DEBUG_NETWORK" "1 << 4")
+    '("cache" "CHAMPLAIN_DEBUG_CACHE" "1 << 5")
+    '("selection" "CHAMPLAIN_DEBUG_SELECTION" "1 << 6")
+    '("memphis" "CHAMPLAIN_DEBUG_MEMPHIS" "1 << 7")
+    '("other" "CHAMPLAIN_DEBUG_OTHER" "1 << 8")
   )
 )
 
 ;; From champlain-map-source.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   CHAMPLAIN_MAP_PROJECTION_MERCATOR
+;; } ChamplainMapProjection;
+
 (define-enum-extended MapProjection
   (in-module "Champlain")
   (c-name "ChamplainMapProjection")
   (values
-    '("r" "CHAMPLAIN_MAP_PROJECTION_MERCATOR" "0")
+    '("mercator" "CHAMPLAIN_MAP_PROJECTION_MERCATOR" "0")
   )
 )
 
-;; From champlain-selection-layer.h
+;; From champlain-marker-layer.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   CHAMPLAIN_SELECTION_NONE,
+;;   CHAMPLAIN_SELECTION_SINGLE,
+;;   CHAMPLAIN_SELECTION_MULTIPLE
+;; } ChamplainSelectionMode;
 
 (define-enum-extended SelectionMode
   (in-module "Champlain")
@@ -33,14 +64,65 @@
   )
 )
 
-;; From champlain-view.h
+;; From champlain-memphis-renderer.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   CHAMPLAIN_MEMPHIS_RULE_TYPE_UNKNOWN,
+;;   CHAMPLAIN_MEMPHIS_RULE_TYPE_NODE,
+;;   CHAMPLAIN_MEMPHIS_RULE_TYPE_WAY,
+;;   CHAMPLAIN_MEMPHIS_RULE_TYPE_RELATION
+;; } ChamplainMemphisRuleType;
+
+(define-enum-extended MemphisRuleType
+  (in-module "Champlain")
+  (c-name "ChamplainMemphisRuleType")
+  (values
+    '("unknown" "CHAMPLAIN_MEMPHIS_RULE_TYPE_UNKNOWN" "0")
+    '("node" "CHAMPLAIN_MEMPHIS_RULE_TYPE_NODE" "1")
+    '("way" "CHAMPLAIN_MEMPHIS_RULE_TYPE_WAY" "2")
+    '("relation" "CHAMPLAIN_MEMPHIS_RULE_TYPE_RELATION" "3")
+  )
+)
+
+;; From champlain-scale.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   CHAMPLAIN_UNIT_KM,
+;;   CHAMPLAIN_UNIT_MILES,
+;; } ChamplainUnit;
 
-(define-enum-extended ScrollMode
+(define-enum-extended Unit
   (in-module "Champlain")
-  (c-name "ChamplainScrollMode")
+  (c-name "ChamplainUnit")
   (values
-    '("push" "CHAMPLAIN_SCROLL_MODE_PUSH" "0")
-    '("kinetic" "CHAMPLAIN_SCROLL_MODE_KINETIC" "1")
+    '("km" "CHAMPLAIN_UNIT_KM" "0")
+    '("miles" "CHAMPLAIN_UNIT_MILES" "1")
+  )
+)
+
+;; From champlain-tile.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   CHAMPLAIN_STATE_NONE,
+;;   CHAMPLAIN_STATE_LOADING,
+;;   CHAMPLAIN_STATE_LOADED,
+;;   CHAMPLAIN_STATE_DONE
+;; } ChamplainState;
+
+(define-enum-extended State
+  (in-module "Champlain")
+  (c-name "ChamplainState")
+  (values
+    '("none" "CHAMPLAIN_STATE_NONE" "0")
+    '("loading" "CHAMPLAIN_STATE_LOADING" "1")
+    '("loaded" "CHAMPLAIN_STATE_LOADED" "2")
+    '("done" "CHAMPLAIN_STATE_DONE" "3")
   )
 )
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]