jni: sflphone module updated
diff --git a/jni/Android.mk b/jni/Android.mk
index a22d358..d813a6b 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,8 +1,8 @@
LOCAL_PATH:= $(call my-dir)
-LOCAL_CODECS_PATH =sflphone/daemon/src/audio/codecs
-LOCAL_SRC_PATH = sflphone/daemon/src
+LOCAL_CODECS_PATH = $(LOCAL_PATH)/sflphone/daemon/src/audio/codecs
+LOCAL_SRC_PATH = $(LOCAL_PATH)/sflphone/daemon/src
include $(CLEAR_VARS)
@@ -19,6 +19,7 @@
include $(LOCAL_PATH)/libexpat/Android.mk
include $(LOCAL_PATH)/libopenssl/Android.mk
include $(LOCAL_PATH)/commoncpp2-android/Android.mk
+#include $(LOCAL_PATH)/libopensles/libopensles/Android.mk
#include $(LOCAL_PATH)/libzrtp/Android.mk
# FIXME
diff --git a/jni/libsndfile/sources/src/sndfile.c b/jni/libsndfile/sources/src/sndfile.c
index 1f373f9..716c6de 100644
--- a/jni/libsndfile/sources/src/sndfile.c
+++ b/jni/libsndfile/sources/src/sndfile.c
@@ -2565,22 +2565,18 @@
sf_errno = error = 0 ;
sf_logbuffer [0] = 0 ;
-__android_log_print(3,"TAG","psf_open_file 1");
if (psf->error)
{ error = psf->error ;
goto error_exit ;
} ;
-__android_log_print(3,"TAG","psf_open_file 2");
if (psf->file.mode != SFM_READ && psf->file.mode != SFM_WRITE && psf->file.mode != SFM_RDWR)
{ error = SFE_BAD_OPEN_MODE ;
goto error_exit ;
} ;
-__android_log_print(3,"TAG","psf_open_file 3");
if (sfinfo == NULL)
{ error = SFE_BAD_SF_INFO_PTR ;
goto error_exit ;
} ;
-__android_log_print(3,"TAG","psf_open_file 4");
/* Zero out these fields. */
sfinfo->frames = 0 ;
sfinfo->sections = 0 ;
diff --git a/jni/sflphone b/jni/sflphone
index 12fc4b3..d5d906a 160000
--- a/jni/sflphone
+++ b/jni/sflphone
@@ -1 +1 @@
-Subproject commit 12fc4b3a714006b5fce5edb6792a1628a30c3edf
+Subproject commit d5d906a34ed72557306b9694e86991b0c10ba027