diff options
Diffstat (limited to 'navit/speech')
-rw-r--r-- | navit/speech/android/speech_android.c | 8 | ||||
-rw-r--r-- | navit/speech/cmdline/speech_cmdline.c | 14 | ||||
-rw-r--r-- | navit/speech/espeak/speak.c | 10 |
3 files changed, 16 insertions, 16 deletions
diff --git a/navit/speech/android/speech_android.c b/navit/speech/android/speech_android.c index e5a7f6130..3323245aa 100644 --- a/navit/speech/android/speech_android.c +++ b/navit/speech/android/speech_android.c @@ -73,7 +73,7 @@ speech_android_say(struct speech_priv *this, const char *text) } } string = (*jnienv)->NewStringUTF(jnienv, str); - dbg(lvl_error,"enter %s\n",str); + dbg(lvl_debug,"enter %s\n",str); (*jnienv)->CallVoidMethod(jnienv, this->NavitSpeech, this->NavitSpeech_say, string); (*jnienv)->DeleteLocalRef(jnienv, string); g_free(str); @@ -104,7 +104,7 @@ speech_android_init(struct speech_priv *ret) dbg(lvl_error,"No class found\n"); return 0; } - dbg(lvl_error,"at 3\n"); + dbg(lvl_debug,"at 3\n"); cid = (*jnienv)->GetMethodID(jnienv, ret->NavitSpeechClass, "<init>", "(Lorg/navitproject/navit/Navit;)V"); if (cid == NULL) { dbg(lvl_error,"no method found\n"); @@ -112,9 +112,9 @@ speech_android_init(struct speech_priv *ret) } if (!android_find_method(ret->NavitSpeechClass, "say", "(Ljava/lang/String;)V", &ret->NavitSpeech_say)) return 0; - dbg(lvl_error,"at 4 android_activity=%p\n",android_activity); + dbg(lvl_debug,"at 4 android_activity=%p\n",android_activity); ret->NavitSpeech=(*jnienv)->NewObject(jnienv, ret->NavitSpeechClass, cid, android_activity); - dbg(lvl_error,"result=%p\n",ret->NavitSpeech); + dbg(lvl_debug,"result=%p\n",ret->NavitSpeech); if (!ret->NavitSpeech) return 0; if (ret->NavitSpeech) diff --git a/navit/speech/cmdline/speech_cmdline.c b/navit/speech/cmdline/speech_cmdline.c index 9a334d020..08a1abe03 100644 --- a/navit/speech/cmdline/speech_cmdline.c +++ b/navit/speech/cmdline/speech_cmdline.c @@ -63,7 +63,7 @@ speech_cmdline_search(GList *samples, int suffix_len, const char *text, int deco { GList *loop_samples=samples,*result=NULL,*recursion_result; int shortest_result_length=INT_MAX; - dbg(lvl_warning,"searching samples for text: '%s'\n",text); + dbg(lvl_debug,"searching samples for text: '%s'\n",text); while (loop_samples) { char *sample_name=loop_samples->data; int sample_name_len; @@ -77,7 +77,7 @@ speech_cmdline_search(GList *samples, int suffix_len, const char *text, int deco const char *remaining_text=text+sample_name_len; while (*remaining_text == ' ' || *remaining_text == ',') remaining_text++; - dbg(lvl_warning,"sample '%s' matched; remaining text: '%s'\n",sample_name,remaining_text); + dbg(lvl_debug,"sample '%s' matched; remaining text: '%s'\n",sample_name,remaining_text); if (*remaining_text) { recursion_result=speech_cmdline_search(samples, suffix_len, remaining_text, decode); if (recursion_result && g_list_length(recursion_result) < shortest_result_length) { @@ -86,7 +86,7 @@ speech_cmdline_search(GList *samples, int suffix_len, const char *text, int deco result=g_list_prepend(result, loop_samples->data); shortest_result_length=g_list_length(result); } else { - dbg(lvl_warning,"no (shorter) result found for remaining text '%s', " + dbg(lvl_debug,"no (shorter) result found for remaining text '%s', " "trying next sample\n", remaining_text); g_list_free(recursion_result); } @@ -141,7 +141,7 @@ speechd_say(struct speech_priv *this, const char *text) argl=speech_cmdline_search(this->samples, strlen(this->sample_suffix), text, !!(this->flags & 1)); samplesmode=1; listlen=g_list_length(argl); - dbg(lvl_warning,"For text: '%s', found %d samples.\n",text,listlen); + dbg(lvl_debug,"For text: '%s', found %d samples.\n",text,listlen); if (!listlen){ dbg(lvl_error,"No matching samples found. Cannot speak text: '%s'\n",text); } @@ -149,7 +149,7 @@ speechd_say(struct speech_priv *this, const char *text) listlen=1; } if(listlen>0) { - dbg(lvl_warning,"Speaking text '%s'\n",text); + dbg(lvl_debug,"Speaking text '%s'\n",text); int argc; char**argv; int j; @@ -168,7 +168,7 @@ speechd_say(struct speech_priv *this, const char *text) while(l) { char *new_arg; new_arg=g_strdup_printf("%s/%s",this->sample_dir,(char *)l->data); - dbg(lvl_warning,"new_arg %s\n",new_arg); + dbg(lvl_debug,"new_arg %s\n",new_arg); argv[j++]=g_strdup_printf(cmdv[i],new_arg); g_free(new_arg); l=g_list_next(l); @@ -242,7 +242,7 @@ speechd_new(struct speech_methods *meth, struct attr **attrs, struct attr *paren int len=strlen(name); if (len > suffix_len) { if (!strcmp(name+len-suffix_len, this->sample_suffix)) { - dbg(lvl_warning,"found %s\n",name); + dbg(lvl_debug,"found %s\n",name); this->samples=g_list_prepend(this->samples, g_strdup(name)); } } diff --git a/navit/speech/espeak/speak.c b/navit/speech/espeak/speak.c index 58813590a..523679b38 100644 --- a/navit/speech/espeak/speak.c +++ b/navit/speech/espeak/speak.c @@ -214,7 +214,7 @@ static void start_speaking(struct speech_priv* sp_priv) static LRESULT CALLBACK speech_message_handler( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { - dbg(lvl_warning, "message_handler called\n"); + dbg(lvl_debug, "message_handler called\n"); switch (uMsg) { @@ -387,7 +387,7 @@ static int espeak_say(struct speech_priv *this, const char *text) { char *phrase = g_strdup(text); - dbg(lvl_warning, "Speak: '%s'\n", text); + dbg(lvl_debug, "Speak: '%s'\n", text); if (!PostMessage(this->h_queue, msg_say, (WPARAM)this, (LPARAM)phrase)) { @@ -440,7 +440,7 @@ espeak_new(struct speech_methods *meth, struct attr **attrs, struct attr *parent strcpy(path_home,path->u.str); else sprintf(path_home,"%s/espeak-data",getenv("NAVIT_SHAREDIR")); - dbg(lvl_error,"path_home set to %s\n",path_home); + dbg(lvl_debug,"path_home set to %s\n",path_home); if ( !initialise() ) { @@ -467,12 +467,12 @@ espeak_new(struct speech_methods *meth, struct attr **attrs, struct attr *parent } file1=g_strdup_printf("%s/voices/%s",path_home,lang_full); file2=g_strdup_printf("%s/voices/%s/%s",path_home,lang,lang_full); - dbg(lvl_error,"Testing %s and %s\n",file1,file2); + dbg(lvl_debug,"Testing %s and %s\n",file1,file2); if (file_exists(file1) || file_exists(file2)) lang_str=g_strdup(lang_full); else lang_str=g_strdup(lang); - dbg(lvl_error,"Language full %s lang %s result %s\n",lang_full,lang,lang_str); + dbg(lvl_debug,"Language full %s lang %s result %s\n",lang_full,lang,lang_str); g_free(lang_full); g_free(lang); g_free(file1); |