Fix:maptool:Another name for faroe islands

[navit-package] / navit / navit.h

diff --git a/navit/navit.h b/navit/navit.h
index 69c3208..8745889 100644 (file)
--- a/navit/navit.h
+++ b/navit/navit.h
@@ -24,9 +24,14 @@
 extern "C" {
 #endif
 extern struct gui *main_loop_gui;
+// defined in glib.h.
+#ifndef __G_LIST_H__
+struct _GList;
+typedef struct _GList GList;
+#endif
+
 /* prototypes */
 enum attr_type;
-enum item_type;
 struct attr;
 struct attr_iter;
 struct callback;
@@ -37,23 +42,20 @@ struct mapset;
 struct message;
 struct navigation;
 struct navit;
-struct navit_vehicle;
-struct navit_window_items;
 struct pcoord;
 struct point;
 struct route;
-struct speech;
 struct tracking;
 struct transformation;
-struct vehicle;
+struct vehicleprofile;
 void navit_add_mapset(struct navit *this_, struct mapset *ms);
 struct mapset *navit_get_mapset(struct navit *this_);
 struct tracking *navit_get_tracking(struct navit *this_);
 void navit_draw(struct navit *this_);
+int navit_get_ready(struct navit *this_);
 void navit_draw_displaylist(struct navit *this_);
 void navit_handle_resize(struct navit *this_, int w, int h);
 int navit_get_width(struct navit *this_);
-int navit_check_route(struct navit *this_);
 int navit_get_height(struct navit *this_);
 int navit_ignore_button(struct navit *this_);
 void navit_ignore_graphics_events(struct navit *this_, int ignore);
@@ -62,22 +64,24 @@ void navit_handle_motion(struct navit *this_, struct point *p);
 void navit_zoom_in(struct navit *this_, int factor, struct point *p);
 void navit_zoom_out(struct navit *this_, int factor, struct point *p);
 struct navit *navit_new(struct attr *parent, struct attr **attrs);
+void navit_add_message(struct navit *this_, char *message);
+struct message *navit_get_messages(struct navit *this_);
 struct graphics *navit_get_graphics(struct navit *this_);
-void navit_set_destination(struct navit *this_, struct pcoord *c, const char *description);
+struct vehicleprofile *navit_get_vehicleprofile(struct navit *this_);
+GList *navit_get_vehicleprofiles(struct navit *this_);
+void navit_set_destination(struct navit *this_, struct pcoord *c, const char *description, int async);
+int navit_check_route(struct navit *this_);
 void navit_add_bookmark(struct navit *this_, struct pcoord *c, const char *description);
-void navit_say(struct navit *this_, char *text);
+void navit_textfile_debug_log(struct navit *this_, const char *fmt, ...);
 int navit_speech_estimate(struct navit *this_, char *str);
+void navit_say(struct navit *this_, char *text);
 void navit_speak(struct navit *this_);
-void navit_announcer_toggle(struct navit *this_);
 void navit_window_roadbook_destroy(struct navit *this_);
 void navit_window_roadbook_new(struct navit *this_);
-struct navit_window_items *navit_window_items_new(const char *name, int distance);
-void navit_window_items_add_item(struct navit_window_items *nwi, enum item_type type);
-void navit_add_window_items(struct navit *this_, struct navit_window_items *nwi);
 void navit_init(struct navit *this_);
 void navit_zoom_to_route(struct navit *this_, int orientation);
-void navit_set_center(struct navit *this_, struct pcoord *center);
-void navit_set_center_screen(struct navit *this_, struct point *p);
+void navit_set_center(struct navit *this_, struct pcoord *center, int set_timeout);
+void navit_set_center_screen(struct navit *this_, struct point *p, int set_timeout);
 int navit_set_attr(struct navit *this_, struct attr *attr);
 int navit_get_attr(struct navit *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter);
 int navit_add_attr(struct navit *this_, struct attr *attr);
@@ -87,19 +91,14 @@ void navit_attr_iter_destroy(struct attr_iter *iter);
 void navit_add_callback(struct navit *this_, struct callback *cb);
 void navit_remove_callback(struct navit *this_, struct callback *cb);
 void navit_set_position(struct navit *this_, struct pcoord *c);
-void navit_tracking_add(struct navit *this_, struct tracking *tracking);
-void navit_set_speech(struct navit *this_, struct speech *speech);
 struct gui *navit_get_gui(struct navit *this_);
 struct transformation *navit_get_trans(struct navit *this_);
 struct route *navit_get_route(struct navit *this_);
 struct navigation *navit_get_navigation(struct navit *this_);
 struct displaylist *navit_get_displaylist(struct navit *this_);
 int navit_block(struct navit *this_, int block);
-int navit_command_register(struct navit *this_, char *command, struct callback *cb);
-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);
-struct message *navit_get_messages(struct navit *this_);
+void navit_layout_switch(struct navit *n);
+int navit_set_layout_by_name(struct navit *n, char* name);
 void navit_destroy(struct navit *this_);
 /* end of prototypes */
 #ifdef __cplusplus