diff options
Diffstat (limited to 'navit/android.c')
-rw-r--r-- | navit/android.c | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/navit/android.c b/navit/android.c index b5a45791d..bee9ec8b0 100644 --- a/navit/android.c +++ b/navit/android.c @@ -43,7 +43,7 @@ android_find_class_global(char *name, jclass *ret) { *ret=(*jnienv)->FindClass(jnienv, name); if (! *ret) { - dbg(0,"Failed to get Class %s\n",name); + dbg(lvl_error,"Failed to get Class %s\n",name); return 0; } *ret = (*jnienv)->NewGlobalRef(jnienv, *ret); @@ -55,7 +55,7 @@ android_find_method(jclass class, char *name, char *args, jmethodID *ret) { *ret = (*jnienv)->GetMethodID(jnienv, class, name, args); if (*ret == NULL) { - dbg(0,"Failed to get Method %s with signature %s\n",name,args); + dbg(lvl_error,"Failed to get Method %s with signature %s\n",name,args); return 0; } return 1; @@ -67,7 +67,7 @@ android_find_static_method(jclass class, char *name, char *args, jmethodID *ret) { *ret = (*jnienv)->GetStaticMethodID(jnienv, class, name, args); if (*ret == NULL) { - dbg(0,"Failed to get static Method %s with signature %s\n",name,args); + dbg(lvl_error,"Failed to get static Method %s with signature %s\n",name,args); return 0; } return 1; @@ -83,12 +83,12 @@ Java_org_navitproject_navit_Navit_NavitMain( JNIEnv* env, jobject thiz, jobject jnienv=env; android_activity = (*jnienv)->NewGlobalRef(jnienv, activity); langstr=(*env)->GetStringUTFChars(env, lang, NULL); - dbg(0,"enter env=%p thiz=%p activity=%p lang=%s version=%d\n",env,thiz,android_activity,langstr,version); + dbg(lvl_error,"enter env=%p thiz=%p activity=%p lang=%s version=%d\n",env,thiz,android_activity,langstr,version); setenv("LANG",langstr,1); (*env)->ReleaseStringUTFChars(env, lang, langstr); displaydensitystr=(*env)->GetStringUTFChars(env, display_density_string, NULL); - dbg(0,"*****displaydensity=%s\n",displaydensitystr); + dbg(lvl_error,"*****displaydensity=%s\n",displaydensitystr); setenv("ANDROID_DENSITY",displaydensitystr,1); (*env)->ReleaseStringUTFChars(env, display_density_string, displaydensitystr); const char *strings=(*env)->GetStringUTFChars(env, path, NULL); @@ -99,14 +99,14 @@ Java_org_navitproject_navit_Navit_NavitMain( JNIEnv* env, jobject thiz, jobject JNIEXPORT void JNICALL Java_org_navitproject_navit_Navit_NavitDestroy( JNIEnv* env) { - dbg(0, "shutdown navit\n"); + dbg(lvl_error, "shutdown navit\n"); exit(0); } JNIEXPORT void JNICALL Java_org_navitproject_navit_NavitGraphics_SizeChangedCallback( JNIEnv* env, jobject thiz, int id, int w, int h) { - dbg(0,"enter %p %d %d\n",(struct callback *)id,w,h); + dbg(lvl_error,"enter %p %d %d\n",(struct callback *)id,w,h); if (id) callback_call_2((struct callback *)id,w,h); } @@ -114,7 +114,7 @@ Java_org_navitproject_navit_NavitGraphics_SizeChangedCallback( JNIEnv* env, jobj JNIEXPORT void JNICALL Java_org_navitproject_navit_NavitGraphics_ButtonCallback( JNIEnv* env, jobject thiz, int id, int pressed, int button, int x, int y) { - dbg(1,"enter %p %d %d\n",(struct callback *)id,pressed,button); + dbg(lvl_warning,"enter %p %d %d\n",(struct callback *)id,pressed,button); if (id) callback_call_4((struct callback *)id,pressed,button,x,y); } @@ -122,7 +122,7 @@ Java_org_navitproject_navit_NavitGraphics_ButtonCallback( JNIEnv* env, jobject t JNIEXPORT void JNICALL Java_org_navitproject_navit_NavitGraphics_MotionCallback( JNIEnv* env, jobject thiz, int id, int x, int y) { - dbg(1,"enter %p %d %d\n",(struct callback *)id,x,y); + dbg(lvl_warning,"enter %p %d %d\n",(struct callback *)id,x,y); if (id) callback_call_2((struct callback *)id,x,y); } @@ -131,9 +131,9 @@ JNIEXPORT void JNICALL Java_org_navitproject_navit_NavitGraphics_KeypressCallback( JNIEnv* env, jobject thiz, int id, jobject str) { const char *s; - dbg(0,"enter %p %p\n",(struct callback *)id,str); + dbg(lvl_error,"enter %p %p\n",(struct callback *)id,str); s=(*env)->GetStringUTFChars(env, str, NULL); - dbg(0,"key=%d",s); + dbg(lvl_error,"key=%d",s); if (id) callback_call_1((struct callback *)id,s); (*env)->ReleaseStringUTFChars(env, str, s); @@ -143,7 +143,7 @@ JNIEXPORT void JNICALL Java_org_navitproject_navit_NavitTimeout_TimeoutCallback( JNIEnv* env, jobject thiz, int id) { void (*event_handler)(void *) = *(void **)id; - dbg(1,"enter %p %p\n",thiz, (void *)id); + dbg(lvl_warning,"enter %p %p\n",thiz, (void *)id); event_handler((void*)id); } @@ -156,7 +156,7 @@ Java_org_navitproject_navit_NavitVehicle_VehicleCallback( JNIEnv * env, jobject JNIEXPORT void JNICALL Java_org_navitproject_navit_NavitIdle_IdleCallback( JNIEnv* env, jobject thiz, int id) { - dbg(1,"enter %p %p\n",thiz, (void *)id); + dbg(lvl_warning,"enter %p %p\n",thiz, (void *)id); callback_call_0((struct callback *)id); } @@ -171,14 +171,14 @@ Java_org_navitproject_navit_NavitWatch_poll( JNIEnv* env, jobject thiz, int func JNIEXPORT void JNICALL Java_org_navitproject_navit_NavitWatch_WatchCallback( JNIEnv* env, jobject thiz, int id) { - dbg(1,"enter %p %p\n",thiz, (void *)id); + dbg(lvl_warning,"enter %p %p\n",thiz, (void *)id); callback_call_0((struct callback *)id); } JNIEXPORT void JNICALL Java_org_navitproject_navit_NavitSensors_SensorCallback( JNIEnv* env, jobject thiz, int id, int sensor, float x, float y, float z) { - dbg(1,"enter %p %p %f %f %f\n",thiz, (void *)id,x,y,z); + dbg(lvl_warning,"enter %p %p %f %f %f\n",thiz, (void *)id,x,y,z); callback_call_4((struct callback *)id, sensor, &x, &y, &z); } @@ -208,10 +208,10 @@ Java_org_navitproject_navit_NavitGraphics_CallbackLocalizedString( JNIEnv* env, const char *localized_str; s=(*env)->GetStringUTFChars(env, str, NULL); - //dbg(0,"*****string=%s\n",s); + //dbg(lvl_error,"*****string=%s\n",s); localized_str=navit_nls_gettext(s); - //dbg(0,"localized string=%s",localized_str); + //dbg(lvl_error,"localized string=%s",localized_str); // jstring dataStringValue = (jstring) localized_str; jstring js = (*env)->NewStringUTF(env,localized_str); @@ -227,7 +227,7 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j struct attr attr; const char *s; jint ret = 0; - dbg(0,"enter %d %p\n",channel,str); + dbg(lvl_error,"enter %d %p\n",channel,str); config_get_attr(config_get(), attr_navit, &attr, NULL); @@ -248,7 +248,7 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j struct mapset *ms = navit_get_mapset(attr.u.navit); struct attr type, name, data, *attrs[4]; const char *map_location=(*env)->GetStringUTFChars(env, str, NULL); - dbg(0,"*****string=%s\n",map_location); + dbg(lvl_error,"*****string=%s\n",map_location); type.type=attr_type; type.u.str="binfile"; @@ -280,7 +280,7 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j if (delete_map) { - dbg(0,"delete map %s (%p)", map_location, delete_map); + dbg(lvl_error,"delete map %s (%p)", map_location, delete_map); map_r.type=attr_map; map_r.u.map=delete_map; ret = mapset_remove_attr(ms, &map_r); @@ -292,7 +292,7 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j case 5: // call a command (like in gui) s=(*env)->GetStringUTFChars(env, str, NULL); - dbg(0,"*****string=%s\n",s); + dbg(lvl_error,"*****string=%s\n",s); command_evaluate(&attr,s); (*env)->ReleaseStringUTFChars(env, str, s); break; @@ -310,7 +310,7 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j char parse_str[strlen(s) + 1]; strcpy(parse_str, s); (*env)->ReleaseStringUTFChars(env, str, s); - dbg(0,"*****string=%s\n",parse_str); + dbg(lvl_error,"*****string=%s\n",parse_str); // set destination to (pixel-x#pixel-y) // pixel-x @@ -320,8 +320,8 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j pstr = strtok (NULL, "#"); p.y = atoi(pstr); - dbg(0,"11x=%d\n",p.x); - dbg(0,"11y=%d\n",p.y); + dbg(lvl_error,"11x=%d\n",p.x); + dbg(lvl_error,"11y=%d\n",p.y); transform_reverse(transform, &p, &c); @@ -330,8 +330,8 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j pc.y = c.y; pc.pro = transform_get_projection(transform); - dbg(0,"22x=%d\n",pc.x); - dbg(0,"22y=%d\n",pc.y); + dbg(lvl_error,"22x=%d\n",pc.x); + dbg(lvl_error,"22y=%d\n",pc.y); // start navigation asynchronous navit_set_destination(attr.u.navit, &pc, parse_str, 1); @@ -345,7 +345,7 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j char parse_str[strlen(s) + 1]; strcpy(parse_str, s); (*env)->ReleaseStringUTFChars(env, str, s); - dbg(0,"*****string=%s\n",s); + dbg(lvl_error,"*****string=%s\n",s); // set destination to (lat#lon#title) struct coord_geo g; @@ -361,9 +361,9 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j // description name = strtok (NULL, "#"); - dbg(0,"lat=%f\n",g.lat); - dbg(0,"lng=%f\n",g.lng); - dbg(0,"str1=%s\n",name); + dbg(lvl_error,"lat=%f\n",g.lat); + dbg(lvl_error,"lng=%f\n",g.lng); + dbg(lvl_error,"str1=%s\n",name); struct coord c; transform_from_geo(projection_mg, &g, &c); @@ -379,7 +379,7 @@ Java_org_navitproject_navit_NavitGraphics_CallbackMessageChannel( JNIEnv* env, j } break; default: - dbg(0, "Unknown command"); + dbg(lvl_error, "Unknown command"); } return ret; @@ -394,7 +394,7 @@ Java_org_navitproject_navit_NavitGraphics_GetDefaultCountry( JNIEnv* env, jobjec jstring return_string = NULL; struct attr attr; - dbg(0,"enter %d %p\n",channel,str); + dbg(lvl_error,"enter %d %p\n",channel,str); config_get_attr(config_get(), attr_navit, &attr, NULL); @@ -409,12 +409,12 @@ Java_org_navitproject_navit_NavitGraphics_GetDefaultCountry( JNIEnv* env, jobjec struct mapset *ms=navit_get_mapset(attr.u.navit); struct search_list *search_list = search_list_new(ms); search_attr.type=attr_country_all; - dbg(0,"country %s\n", country_name.u.str); + dbg(lvl_error,"country %s\n", country_name.u.str); search_attr.u.str=country_name.u.str; search_list_search(search_list, &search_attr, 0); while((res=search_list_get_result(search_list))) { - dbg(0,"Get result: %s\n", res->country->iso2); + dbg(lvl_error,"Get result: %s\n", res->country->iso2); } if (item_attr_get(item, attr_country_iso2, &country_iso2)) return_string = (*env)->NewStringUTF(env,country_iso2.u.str); @@ -435,7 +435,7 @@ Java_org_navitproject_navit_NavitGraphics_GetAllCountries( JNIEnv* env, jobject jobjectArray all_countries; struct attr attr; - dbg(0,"enter\n"); + dbg(lvl_error,"enter\n"); config_get_attr(config_get(), attr_navit, &attr, NULL); @@ -443,12 +443,12 @@ Java_org_navitproject_navit_NavitGraphics_GetAllCountries( JNIEnv* env, jobject struct search_list *search_list = search_list_new(ms); jobjectArray current_country = NULL; search_attr.type=attr_country_all; - //dbg(0,"country %s\n", country_name.u.str); + //dbg(lvl_error,"country %s\n", country_name.u.str); search_attr.u.str=g_strdup("");//country_name.u.str; search_list_search(search_list, &search_attr, 1); while((res=search_list_get_result(search_list))) { - dbg(0,"Get result: %s\n", res->country->iso2); + dbg(lvl_error,"Get result: %s\n", res->country->iso2); if (strlen(res->country->iso2)==2) { @@ -543,7 +543,7 @@ town_str(struct search_list_result *res, int level) static void android_search_end(struct android_search_priv *search_priv) { - dbg(1, "End search"); + dbg(lvl_warning, "End search"); JNIEnv* env = search_priv->search_result_obj.env; if (search_priv->idle_ev) { event_remove_idle(search_priv->idle_ev); @@ -558,7 +558,7 @@ android_search_end(struct android_search_priv *search_priv) if(finish_MethodID != 0) { (*env)->CallVoidMethod(env, search_priv->search_result_obj.jo, finish_MethodID); } else { - dbg(0, "Error method finishAddressSearch not found"); + dbg(lvl_error, "Error method finishAddressSearch not found"); } search_list_destroy(search_priv->search_list); @@ -575,11 +575,11 @@ static enum attr_type android_search_level[] = { static void android_search_idle(struct android_search_priv *search_priv) { - dbg(1, "enter android_search_idle"); + dbg(lvl_warning, "enter android_search_idle"); struct search_list_result *res = search_list_get_result(search_priv->search_list); if (res) { - dbg(1, "Town: %s, Street: %s\n",res->town ? res->town->common.town_name : "no town", res->street ? res->street->name : "no street"); + dbg(lvl_warning, "Town: %s, Street: %s\n",res->town ? res->town->common.town_name : "no town", res->street ? res->street->name : "no street"); search_priv->found = 1; switch (search_priv->search_attr.type) { @@ -609,7 +609,7 @@ android_search_idle(struct android_search_priv *search_priv) break; } default: - dbg(0, "Unhandled search type %d", search_priv->search_attr.type); + dbg(lvl_error, "Unhandled search type %d", search_priv->search_attr.type); } } else { int level = search_list_level(search_priv->search_attr.type) - 1; @@ -620,10 +620,10 @@ android_search_idle(struct android_search_priv *search_priv) level++; } } - dbg(2, "test phrase: %d,%d, %d, level %d", search_priv->current_phrase_per_level[0], search_priv->current_phrase_per_level[1], search_priv->current_phrase_per_level[2] , level) + dbg(lvl_info, "test phrase: %d,%d, %d, level %d", search_priv->current_phrase_per_level[0], search_priv->current_phrase_per_level[1], search_priv->current_phrase_per_level[2] , level) do { while (!search_priv->phrases[++search_priv->current_phrase_per_level[level]]) { - dbg(2, "next phrase: %d,%d, %d, level %d", search_priv->current_phrase_per_level[0], search_priv->current_phrase_per_level[1], search_priv->current_phrase_per_level[2] , level) + dbg(lvl_info, "next phrase: %d,%d, %d, level %d", search_priv->current_phrase_per_level[0], search_priv->current_phrase_per_level[1], search_priv->current_phrase_per_level[2] , level) if (level > 0) { search_priv->current_phrase_per_level[level] = -1; level--; @@ -633,8 +633,8 @@ android_search_idle(struct android_search_priv *search_priv) } } } while (level > 0 ? search_priv->current_phrase_per_level[level] == search_priv->current_phrase_per_level[level-1] : 0); - dbg(2, "used phrase: %d,%d, %d, level %d, '%s'", search_priv->current_phrase_per_level[0], search_priv->current_phrase_per_level[1], search_priv->current_phrase_per_level[2] , level, attr_to_name(android_search_level[level])) - dbg(1, "Search for '%s'", search_priv->phrases[search_priv->current_phrase_per_level[level]]); + dbg(lvl_info, "used phrase: %d,%d, %d, level %d, '%s'", search_priv->current_phrase_per_level[0], search_priv->current_phrase_per_level[1], search_priv->current_phrase_per_level[2] , level, attr_to_name(android_search_level[level])) + dbg(lvl_warning, "Search for '%s'", search_priv->phrases[search_priv->current_phrase_per_level[level]]); search_priv->search_attr.type = android_search_level[level]; search_priv->search_attr.u.str = search_priv->phrases[search_priv->current_phrase_per_level[level]]; struct attr test; @@ -642,7 +642,7 @@ android_search_idle(struct android_search_priv *search_priv) test.u.str = search_priv->phrases[search_priv->current_phrase_per_level[level]]; search_list_search(search_priv->search_list, &test, search_priv->partial); } - dbg(2, "leave"); + dbg(lvl_info, "leave"); } static char * @@ -677,12 +677,12 @@ search_fix_spaces(const char *str) static void start_search(struct android_search_priv *search_priv, const char *search_string) { - dbg(1,"enter %s\n", search_string); + dbg(lvl_warning,"enter %s\n", search_string); char *str=search_fix_spaces(search_string); search_priv->phrases = g_strsplit(str, " ", 0); //ret=search_address_town(ret, sl, phrases, NULL, partial, jni); - dbg(1,"First search phrase %s", search_priv->phrases[0]); + dbg(lvl_warning,"First search phrase %s", search_priv->phrases[0]); search_priv->search_attr.u.str= search_priv->phrases[0]; search_priv->search_attr.type=attr_town_or_district_name; search_list_search(search_priv->search_list, &search_priv->search_attr, search_priv->partial); @@ -692,7 +692,7 @@ static void start_search(struct android_search_priv *search_priv, const char *se //callback_call_0(search_priv->idle_clb); g_free(str); - dbg(1,"leave\n"); + dbg(lvl_warning,"leave\n"); } JNIEXPORT jlong JNICALL @@ -700,7 +700,7 @@ Java_org_navitproject_navit_NavitAddressSearchActivity_CallbackStartAddressSearc { struct attr attr; const char *search_string =(*env)->GetStringUTFChars(env, str, NULL); - dbg(0,"search '%s'\n", search_string); + dbg(lvl_error,"search '%s'\n", search_string); config_get_attr(config_get(), attr_navit, &attr, NULL); @@ -731,9 +731,9 @@ Java_org_navitproject_navit_NavitAddressSearchActivity_CallbackStartAddressSearc count++; } if (!count) - dbg(0,"Country not found"); + dbg(lvl_error,"Country not found"); - dbg(1,"search in country '%s'\n", str_country); + dbg(lvl_warning,"search in country '%s'\n", str_country); (*env)->ReleaseStringUTFChars(env, country, str_country); search_priv->search_result_obj.env = env; @@ -743,7 +743,7 @@ Java_org_navitproject_navit_NavitAddressSearchActivity_CallbackStartAddressSearc start_search(search_priv, search_string); } else - dbg(0,"**** Unable to get methodID: fillStringArray"); + dbg(lvl_error,"**** Unable to get methodID: fillStringArray"); (*env)->ReleaseStringUTFChars(env, str, search_string); @@ -758,5 +758,5 @@ Java_org_navitproject_navit_NavitAddressSearchActivity_CallbackCancelAddressSear if (priv) android_search_end(priv); else - dbg(0, "Error: Cancel search failed"); + dbg(lvl_error, "Error: Cancel search failed"); } |