Merge branch 'master' of git.linphone.org:linphone

coreapi/conference.c

@@ -24,13 +24,14 @@
  */
  
 #include "private.h"
+#include "lpconfig.h"
 
 #include "mediastreamer2/msvolume.h"
 
-static void conference_check_init(LinphoneConference *ctx){
+static void conference_check_init(LinphoneConference *ctx, int samplerate){
 	if (ctx->conf==NULL){
 		MSAudioConferenceParams params;
-		params.samplerate=16000;
+		params.samplerate=samplerate;
 		ctx->conf=ms_audio_conference_new(&params);
 	}
 }
@@ -137,7 +138,7 @@ int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call){
 		ms_error("Already in conference");
 		return -1;
 	}
-	conference_check_init(&lc->conf_ctx);
+	conference_check_init(&lc->conf_ctx, lp_config_get_int(lc->config, "sound","conference_rate",16000));
 	call->params.in_conference=TRUE;
 	call->params.has_video=FALSE;
 	call->params.media_encryption=LinphoneMediaEncryptionNone;

coreapi/linphonecore_jni.cc

@@ -675,6 +675,13 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_isEchoCancellationEn
 	return linphone_core_echo_cancellation_enabled((LinphoneCore*)lc);
 }
 
+extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_isEchoLimiterEnabled(JNIEnv*  env
+																			,jobject  thiz
+																			,jlong lc
+																			) {
+	return linphone_core_echo_limiter_enabled((LinphoneCore*)lc);
+}
+
 extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_getCurrentCall(JNIEnv*  env
 																			,jobject  thiz
 																			,jlong lc

gtk/main.c

@@ -139,7 +139,7 @@ char *linphone_gtk_get_config_file(const char *filename){
 	if (filename==NULL) filename=CONFIG_FILE;
 	/*try accessing a local file first if exists*/
 	if (access(CONFIG_FILE,F_OK)==0){
-		snprintf(config_file,path_max,"%s",CONFIG_FILE);
+		snprintf(config_file,path_max,"%s",filename);
 	}else{
 #ifdef WIN32
 		const char *appdata=getenv("APPDATA");

gtk/singleinstance.c

@@ -23,7 +23,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 static ms_thread_t pipe_thread;
 static ortp_pipe_t server_pipe=(ortp_pipe_t)-1;
 static gboolean server_pipe_running=TRUE;
-static char *pipe_name;
+static char *pipe_name=NULL;
+
+gchar *make_name(const char *appname){
+	const char *username=getenv("USER");
+	if (username){
+		return g_strdup_printf("%s-%s",appname,username);
+	}
+	return g_strdup(appname);
+}
 
 static gboolean execute_wakeup(char *uri){
 	linphone_gtk_show_main_window();
@@ -54,7 +62,6 @@ static void * server_pipe_thread(void *pointer){
 }
 
 static void linphone_gtk_init_pipe(const char *name){
-	pipe_name=g_strdup(name);
 	server_pipe=ortp_server_pipe_create(name);
 	if (server_pipe==(ortp_pipe_t)-1){
 		g_warning("Fail to create server pipe for name %s: %s",name,strerror(errno));
@@ -63,7 +70,8 @@ static void linphone_gtk_init_pipe(const char *name){
 }
 
 bool_t linphone_gtk_init_instance(const char *app_name, const char *addr_to_call){
-	ortp_pipe_t p=ortp_client_pipe_connect(app_name);
+	pipe_name=make_name(app_name);
+	ortp_pipe_t p=ortp_client_pipe_connect(pipe_name);
 	if (p!=(ortp_pipe_t)-1){
 		uint8_t buf[256]={0};
 		g_message("There is already a running instance.");
@@ -78,7 +86,7 @@ bool_t linphone_gtk_init_instance(const char *app_name, const char *addr_to_call
 		ortp_client_pipe_close(p);
 		return FALSE;
 	}else{
-		linphone_gtk_init_pipe(app_name);
+		linphone_gtk_init_pipe(pipe_name);
 	}
 	return TRUE;
 }

java/common/org/linphone/core/LinphoneCore.java

@@ -433,6 +433,11 @@ public interface LinphoneCore {
 	 * @return true if echo cancellation is enabled.
 	 */
 	boolean isEchoCancellationEnabled();
+	/**
+	 * Get echo limiter status (another method of doing echo suppressionn, more brute force)
+	 * @return true if echo limiter is enabled
+	 */
+	boolean isEchoLimiterEnabled();
 	/**
 	 * @param transports used for signaling (TCP, UDP and TLS)
 	 */
@@ -653,4 +658,5 @@ public interface LinphoneCore {
 	 * @return if media encryption is required for ougtoing calls
 	 */
 	boolean isMediaEncryptionMandatory();
+	
 }

po/POTFILES.in

@@ -1,5 +1,6 @@
 # List of source files containing translatable strings.
 gtk/calllogs.c
+gtk/conference.c
 gtk/logging.c
 gtk/support.c
 gtk/chat.c