diff options
| -rw-r--r-- | navit/attr.h | 1 | ||||
| -rw-r--r-- | navit/binding/dbus/binding_dbus.c | 1 | ||||
| -rw-r--r-- | navit/command.c | 1 | ||||
| -rw-r--r-- | navit/gui.h | 1 | ||||
| -rw-r--r-- | navit/item.h | 1 | ||||
| -rw-r--r-- | navit/navit.c | 1 | ||||
| -rw-r--r-- | navit/navit.h | 2 | ||||
| -rw-r--r-- | navit/osd/core/osd_core.c | 1 | ||||
| -rw-r--r-- | navit/route.h | 1 | ||||
| -rw-r--r-- | navit/vehicleprofile.h | 1 |
10 files changed, 11 insertions, 0 deletions
diff --git a/navit/attr.h b/navit/attr.h index f82c6271e..6bed73963 100644 --- a/navit/attr.h +++ b/navit/attr.h @@ -138,6 +138,7 @@ struct attr *attr_search(struct attr **attrs, struct attr *last, enum attr_type int attr_generic_get_attr(struct attr **attrs, struct attr **def_attrs, enum attr_type type, struct attr *attr, struct attr_iter *iter); struct attr **attr_generic_set_attr(struct attr **attrs, struct attr *attr); struct attr **attr_generic_add_attr(struct attr **attrs, struct attr *attr); +struct attr **attr_generic_remove_attr(struct attr **attrs, struct attr *attr); int attr_data_size(struct attr *attr); void *attr_data_get(struct attr *attr); void attr_data_set(struct attr *attr, void *data); diff --git a/navit/binding/dbus/binding_dbus.c b/navit/binding/dbus/binding_dbus.c index ec5918bba..fc036c21f 100644 --- a/navit/binding/dbus/binding_dbus.c +++ b/navit/binding/dbus/binding_dbus.c @@ -33,6 +33,7 @@ #include "attr.h" #include "layout.h" #include "command.h" +#include "util.h" static DBusConnection *connection; diff --git a/navit/command.c b/navit/command.c index 6f8594551..be4f14602 100644 --- a/navit/command.c +++ b/navit/command.c @@ -13,6 +13,7 @@ #include "debug.h" #include "callback.h" #include "command.h" +#include "event.h" /* gui.fullscreen() diff --git a/navit/gui.h b/navit/gui.h index d0158a784..419582aa3 100644 --- a/navit/gui.h +++ b/navit/gui.h @@ -58,6 +58,7 @@ struct menu *gui_popup_new(struct gui *gui); struct datawindow *gui_datawindow_new(struct gui *gui, char *name, struct callback *click, struct callback *close); int gui_add_bookmark(struct gui *gui, struct pcoord *c, char *description); int gui_set_graphics(struct gui *this_, struct graphics *gra); +void gui_disable_suspend(struct gui *this_); int gui_has_main_loop(struct gui *this_); int gui_run_main_loop(struct gui *this_); /* end of prototypes */ diff --git a/navit/item.h b/navit/item.h index c71b4d217..8f412ae02 100644 --- a/navit/item.h +++ b/navit/item.h @@ -82,6 +82,7 @@ struct coord; struct item; struct item_hash; struct map_selection; +int *item_get_default_flags(enum item_type type); void item_coord_rewind(struct item *it); int item_coord_get(struct item *it, struct coord *c, int count); int item_coord_get_within_selection(struct item *it, struct coord *c, int count, struct map_selection *sel); diff --git a/navit/navit.c b/navit/navit.c index 5a51fa419..eca6f12cb 100644 --- a/navit/navit.c +++ b/navit/navit.c @@ -61,6 +61,7 @@ #include "navit_nls.h" #include "util.h" #include "messages.h" +#include "vehicleprofile.h" /** * @defgroup navit the navit core instance. navit is the object containing nearly everything: A set of maps, one or more vehicle, a graphics object for rendering the map, a gui object for displaying the user interface, a route object, a navigation object and so on. Be warned that it is theoretically possible to have more than one navit object diff --git a/navit/navit.h b/navit/navit.h index 69c320836..d0d6d9bfd 100644 --- a/navit/navit.h +++ b/navit/navit.h @@ -99,8 +99,10 @@ int navit_command_register(struct navit *this_, char *command, struct callback * struct callback *navit_command_unregister(struct navit *this_, char *command); int navit_command_call_attrs(struct navit *this_, char *command, struct attr **in, struct attr ***out); int navit_command_call(struct navit *this_, char *command); +void navit_add_message(struct navit *this_, char *message); struct message *navit_get_messages(struct navit *this_); void navit_destroy(struct navit *this_); +struct vehicleprofile * navit_get_vehicleprofile(struct navit *this_); /* end of prototypes */ #ifdef __cplusplus } diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c index a73f5e538..24f3ce816 100644 --- a/navit/osd/core/osd_core.c +++ b/navit/osd/core/osd_core.c @@ -47,6 +47,7 @@ #include "vehicleprofile.h" #include "roadprofile.h" #include "osd.h" +#include "speech.h" struct compass { struct osd_item osd_item; diff --git a/navit/route.h b/navit/route.h index 0b14c285a..19cf06978 100644 --- a/navit/route.h +++ b/navit/route.h @@ -80,6 +80,7 @@ struct tracking; struct transformation; struct route *route_new(struct attr *parent, struct attr **attrs); void route_set_mapset(struct route *this, struct mapset *ms); +void route_set_profile(struct route *this, struct vehicleprofile *prof); struct mapset *route_get_mapset(struct route *this); struct route_info *route_get_pos(struct route *this); struct route_info *route_get_dst(struct route *this); diff --git a/navit/vehicleprofile.h b/navit/vehicleprofile.h index cbb727131..51edfad24 100644 --- a/navit/vehicleprofile.h +++ b/navit/vehicleprofile.h @@ -32,3 +32,4 @@ int vehicleprofile_get_attr(struct vehicleprofile *this_, enum attr_type type, s int vehicleprofile_set_attr(struct vehicleprofile *this_, struct attr *attr); int vehicleprofile_add_attr(struct vehicleprofile *this_, struct attr *attr); int vehicleprofile_remove_attr(struct vehicleprofile *this_, struct attr *attr); +struct roadprofile * vehicleprofile_get_roadprofile(struct vehicleprofile *this_, enum item_type type); |