diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-01-31 13:47:57 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-01-31 13:47:57 +0000 |
| commit | cf0e75b670de03aae7d3660c9d8f8396ede3b9f8 (patch) | |
| tree | 3ba514aaf5b62da2daafeb6cfa4980f1973f786f /navit/xmlconfig.h | |
| parent | 29998cf55524394fce52b44997371ae0a100feda (diff) | |
| download | navit-cf0e75b670de03aae7d3660c9d8f8396ede3b9f8.tar.gz | |
Add:Core:Converted osd to new object scheme
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5360 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/xmlconfig.h')
| -rw-r--r-- | navit/xmlconfig.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/navit/xmlconfig.h b/navit/xmlconfig.h index bfb7c65ee..94cae7c86 100644 --- a/navit/xmlconfig.h +++ b/navit/xmlconfig.h @@ -54,9 +54,9 @@ struct object_func { void *(*unref)(void *); }; -extern struct object_func map_func, mapset_func, navit_func, tracking_func, vehicle_func, maps_func, layout_func, vehicleprofile_func, layer_func, config_func; +extern struct object_func map_func, mapset_func, navit_func, osd_func, tracking_func, vehicle_func, maps_func, layout_func, vehicleprofile_func, layer_func, config_func; -#define HAS_OBJECT_FUNC(x) ((x) == attr_map || (x) == attr_mapset || (x) == attr_navit || (x) == attr_trackingo || (x) == attr_vehicle || (x) == attr_maps || (x) == attr_layout || (x) == attr_vehicleprofile || (x) == attr_layer || (x) == attr_config) +#define HAS_OBJECT_FUNC(x) ((x) == attr_map || (x) == attr_mapset || (x) == attr_navit || (x) == attr_osd || (x) == attr_trackingo || (x) == attr_vehicle || (x) == attr_maps || (x) == attr_layout || (x) == attr_vehicleprofile || (x) == attr_layer || (x) == attr_config) #define NAVIT_OBJECT struct object_func *func; int refcount; struct attr **attrs; struct navit_object { @@ -71,6 +71,7 @@ int navit_object_get_attr(struct navit_object *obj, enum attr_type type, struct int navit_object_set_attr(struct navit_object *obj, struct attr *attr); int navit_object_add_attr(struct navit_object *obj, struct attr *attr); int navit_object_remove_attr(struct navit_object *obj, struct attr *attr); +void navit_object_destroy(struct navit_object *obj); typedef GError xmlerror; |