Refactor:core:Introduce enum for debug levels, and use it everywhere.|First part of #1269.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5960 ffa7fe5e-494d-0410-b361-a75ebd5db220

3 files changed, 30 insertions, 30 deletions

diff --git a/navit/speech/android/speech_android.c b/navit/speech/android/speech_android.c
index 86c9894f..e5a7f613 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(0,"enter %s\n",str);
+	dbg(lvl_error,"enter %s\n",str);
         (*jnienv)->CallVoidMethod(jnienv, this->NavitSpeech, this->NavitSpeech_say, string);
         (*jnienv)->DeleteLocalRef(jnienv, string);
 	g_free(str);
@@ -101,20 +101,20 @@ speech_android_init(struct speech_priv *ret)
 		class="org/navitproject/navit/NavitSpeech";
 
 	if (!android_find_class_global(class, &ret->NavitSpeechClass)) {
-		dbg(0,"No class found\n");
+		dbg(lvl_error,"No class found\n");
 		return 0;
 	}
-	dbg(0,"at 3\n");
+	dbg(lvl_error,"at 3\n");
 	cid = (*jnienv)->GetMethodID(jnienv, ret->NavitSpeechClass, "<init>", "(Lorg/navitproject/navit/Navit;)V");
 	if (cid == NULL) {
-		dbg(0,"no method found\n");
+		dbg(lvl_error,"no method found\n");
 		return 0; /* exception thrown */
 	}
 	if (!android_find_method(ret->NavitSpeechClass, "say", "(Ljava/lang/String;)V", &ret->NavitSpeech_say))
 		return 0;
-	dbg(0,"at 4 android_activity=%p\n",android_activity);
+	dbg(lvl_error,"at 4 android_activity=%p\n",android_activity);
 	ret->NavitSpeech=(*jnienv)->NewObject(jnienv, ret->NavitSpeechClass, cid, android_activity);
-	dbg(0,"result=%p\n",ret->NavitSpeech);
+	dbg(lvl_error,"result=%p\n",ret->NavitSpeech);
 	if (!ret->NavitSpeech)
 		return 0;
 	if (ret->NavitSpeech)
@@ -131,7 +131,7 @@ speech_android_new(struct speech_methods *meth, struct attr **attrs, struct attr
 	if (android_version < 4)
 		this->flags=3;
 	if (!speech_android_init(this)) {
-		dbg(0,"Failed to init speech %p\n",this->NavitSpeechClass);
+		dbg(lvl_error,"Failed to init speech %p\n",this->NavitSpeechClass);
 		g_free(this);
 		this=NULL;
 	}
diff --git a/navit/speech/cmdline/speech_cmdline.c b/navit/speech/cmdline/speech_cmdline.c
index 1eb39d0a..9a334d02 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(1,"searching samples for text: '%s'\n",text);
+	dbg(lvl_warning,"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(1,"sample '%s' matched; remaining text: '%s'\n",sample_name,remaining_text);
+			dbg(lvl_warning,"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(1,"no (shorter) result found for remaining text '%s', "
+					dbg(lvl_warning,"no (shorter) result found for remaining text '%s', "
 						"trying next sample\n", remaining_text);
 					g_list_free(recursion_result);
 				}
@@ -141,15 +141,15 @@ 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(1,"For text: '%s', found %d samples.\n",text,listlen);
+		dbg(lvl_warning,"For text: '%s', found %d samples.\n",text,listlen);
 		if (!listlen){
-			dbg(0,"No matching samples found. Cannot speak text: '%s'\n",text);
+			dbg(lvl_error,"No matching samples found. Cannot speak text: '%s'\n",text);
 		}
 	} else {
 		listlen=1;
 	}
 	if(listlen>0) {
-		dbg(1,"Speaking text '%s'\n",text);
+		dbg(lvl_warning,"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(1,"new_arg %s\n",new_arg);
+						dbg(lvl_warning,"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(1,"found %s\n",name);
+					dbg(lvl_warning,"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 18edd8cd..58813590 100644
--- a/navit/speech/espeak/speak.c
+++ b/navit/speech/espeak/speak.c
@@ -166,11 +166,11 @@ static BOOL initialise(void)
 	{
 		if(result == -1)
 		{
-			dbg(0, "Failed to load espeak-data\n");
+			dbg(lvl_error, "Failed to load espeak-data\n");
 			return FALSE;
 		}
 		else
-			dbg(0, "Wrong version of espeak-data 0x%x (expects 0x%x) at %s\n",result,version_phdata,path_home);
+			dbg(lvl_error, "Wrong version of espeak-data 0x%x (expects 0x%x) at %s\n",result,version_phdata,path_home);
 	}
 	LoadConfig();
 	SetVoiceStack(NULL);
@@ -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(1, "message_handler called\n");
+	dbg(lvl_warning, "message_handler called\n");
 
 	switch (uMsg)
 	{
@@ -234,7 +234,7 @@ static LRESULT CALLBACK speech_message_handler( HWND hwnd, UINT uMsg, WPARAM wPa
 		{
 			WAVEHDR *WaveHeader = (WAVEHDR *)lParam;
 			struct speech_priv* sp_priv;
-			dbg(2, "Wave buffer done\n");
+			dbg(lvl_info, "Wave buffer done\n");
 
 			sp_priv = (struct speech_priv*)WaveHeader->dwUser;
 			sp_priv->free_buffers = g_list_append(sp_priv->free_buffers, WaveHeader);
@@ -282,7 +282,7 @@ static void speech_message_dispatcher( struct speech_priv * sp_priv)
     {
         if (bRet == -1)
         {
-            dbg(0, "Error getting message from queue\n");
+            dbg(lvl_error, "Error getting message from queue\n");
             break;
         }
         else
@@ -336,7 +336,7 @@ static DWORD startThread( LPVOID sp_priv)
 
     if (!RegisterClass(&wc))
     {
-        dbg(0, "Window registration for message queue failed\n");
+        dbg(lvl_error, "Window registration for message queue failed\n");
         return 1;
     }
 
@@ -361,7 +361,7 @@ static DWORD startThread( LPVOID sp_priv)
 
     if (hwnd == NULL)
     {
-        dbg(0, "Window creation failed: %d\n",  GetLastError());
+        dbg(lvl_error, "Window creation failed: %d\n",  GetLastError());
         return 1;
     }
 
@@ -371,7 +371,7 @@ static DWORD startThread( LPVOID sp_priv)
 
 	if(!waveout_open(this))
 	{
-		dbg(0, "Can't open wave output\n");
+		dbg(lvl_error, "Can't open wave output\n");
 		return 1;
 	}
 
@@ -387,11 +387,11 @@ static int
 espeak_say(struct speech_priv *this, const char *text)
 {
 	char *phrase = g_strdup(text);
-	dbg(1, "Speak: '%s'\n", text);
+	dbg(lvl_warning, "Speak: '%s'\n", text);
 
 	if (!PostMessage(this->h_queue, msg_say, (WPARAM)this, (LPARAM)phrase))
 	{
-		dbg(0, "PostThreadMessage 'say' failed\n");
+		dbg(lvl_error, "PostThreadMessage 'say' failed\n");
 	}
 
 	return 0;
@@ -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(0,"path_home set to %s\n",path_home);
+	dbg(lvl_error,"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(0,"Testing %s and %s\n",file1,file2);
+			dbg(lvl_error,"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(0,"Language full %s lang %s result %s\n",lang_full,lang,lang_str);
+			dbg(lvl_error,"Language full %s lang %s result %s\n",lang_full,lang,lang_str);
 			g_free(lang_full);
 			g_free(lang);
 			g_free(file1);
@@ -481,12 +481,12 @@ espeak_new(struct speech_methods *meth, struct attr **attrs, struct attr *parent
 	}
 	if(lang_str && SetVoiceByName(lang_str) != EE_OK)
 	{
-		dbg(0, "Error setting language to: '%s',falling back to default\n", lang_str);
+		dbg(lvl_error, "Error setting language to: '%s',falling back to default\n", lang_str);
 		g_free(lang_str);
 		lang_str=NULL;
 	}
 	if(!lang_str && SetVoiceByName("default") != EE_OK) {
-		dbg(0, "Error setting language to default\n");
+		dbg(lvl_error, "Error setting language to default\n");
 	}