From 107fb22c07a2372cdaf4d02687d828ec8f044170 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Wed, 16 Oct 2013 14:53:32 +0200
Subject: [PATCH] Fix XML2LPC and LPC2XML converters JNI log callbacks

---
 tools/lpc2xml_jni.cc | 13 +++++++++----
 tools/xml2lpc_jni.cc | 11 ++++++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/tools/lpc2xml_jni.cc b/tools/lpc2xml_jni.cc
index c0971cbd5..c21ba7312 100644
--- a/tools/lpc2xml_jni.cc
+++ b/tools/lpc2xml_jni.cc
@@ -26,6 +26,7 @@ extern "C" {
 #endif
 
 #include <stdio.h>
+#include "mediastreamer2/mscommon.h"
 
 struct jni_lpc2xml_ctx {
 	JNIEnv *env;
@@ -52,10 +53,14 @@ extern "C" void Java_org_linphone_tools_Lpc2Xml_callback (void *ctx, lpc2xml_log
 		
 		char buffer[LPC2XML_CALLBACK_BUFFER_SIZE];
 		vsnprintf(buffer, LPC2XML_CALLBACK_BUFFER_SIZE, fmt, list);
-		jstring javaString = env->NewStringUTF(buffer);
-		jint javaLevel = level;
-		my_jni::callVoidMethod<void>(env, obj, "Lpc2Xml", "printLog", "(ILjava/lang/String;)V", javaLevel, javaString);
-	}		
+		
+		if (level == LPC2XML_ERROR)
+			ms_error("%s", buffer);
+		else if (level == LPC2XML_WARNING)
+			ms_warning("%s", buffer);
+		else
+			ms_message("%s", buffer);
+	}
 }
 
 extern "C" void Java_org_linphone_tools_Lpc2Xml_init(JNIEnv *env, jobject obj) {
diff --git a/tools/xml2lpc_jni.cc b/tools/xml2lpc_jni.cc
index fd72c6895..a242e7ce8 100644
--- a/tools/xml2lpc_jni.cc
+++ b/tools/xml2lpc_jni.cc
@@ -26,6 +26,7 @@ extern "C" {
 #endif
 
 #include <stdio.h>
+#include "mediastreamer2/mscommon.h"
 
 struct jni_xml2lpc_ctx {
 	JNIEnv *env;
@@ -52,9 +53,13 @@ extern "C" void Java_org_linphone_tools_Xml2Lpc_callback (void *ctx, xml2lpc_log
 		
 		char buffer[XML2LPC_CALLBACK_BUFFER_SIZE];
 		vsnprintf(buffer, XML2LPC_CALLBACK_BUFFER_SIZE, fmt, list);
-		jstring javaString = env->NewStringUTF(buffer);
-		jint javaLevel = level;
-		my_jni::callVoidMethod<void>(env, obj, "Xml2Lpc", "printLog", "(ILjava/lang/String;)V", javaLevel, javaString);
+
+		if (level == XML2LPC_ERROR)
+			ms_error("%s", buffer);
+		else if (level == XML2LPC_WARNING)
+			ms_warning("%s", buffer);
+		else
+			ms_message("%s", buffer);
 	}		
 }