From c580af0c443bdaef9a8466345d0ff1cac97f1ff8 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 30 Sep 2011 15:37:09 +0200 Subject: [PATCH 1/6] fix compilation warning on windows --- gtk/singleinstance.c | 12 ++++++------ mediastreamer2 | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gtk/singleinstance.c b/gtk/singleinstance.c index d92749e95..428439e6a 100644 --- a/gtk/singleinstance.c +++ b/gtk/singleinstance.c @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "linphone.h" static ms_thread_t pipe_thread; -static ortp_pipe_t server_pipe=-1; +static ortp_pipe_t server_pipe=(ortp_pipe_t)-1; static gboolean server_pipe_running=TRUE; static char *pipe_name; @@ -38,7 +38,7 @@ static void * server_pipe_thread(void *pointer){ do{ child=ortp_server_pipe_accept_client(server_pipe); - if (server_pipe_running && child!=-1){ + if (server_pipe_running && child!=(ortp_pipe_t)-1){ char buf[256]={0}; if (ortp_pipe_read(child,(uint8_t*)buf,sizeof(buf))>0){ g_message("Received wakeup command with arg %s",buf); @@ -56,7 +56,7 @@ 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==-1){ + if (server_pipe==(ortp_pipe_t)-1){ g_warning("Fail to create server pipe for name %s: %s",name,strerror(errno)); } ms_thread_create(&pipe_thread,NULL,server_pipe_thread,NULL); @@ -64,7 +64,7 @@ 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); - if (p!=-1){ + if (p!=(ortp_pipe_t)-1){ uint8_t buf[256]={0}; g_message("There is already a running instance."); if (addr_to_call!=NULL){ @@ -84,7 +84,7 @@ bool_t linphone_gtk_init_instance(const char *app_name, const char *addr_to_call } void linphone_gtk_uninit_instance(void){ - if (server_pipe!=-1){ + if (server_pipe!=(ortp_pipe_t)-1){ ortp_pipe_t client; server_pipe_running=FALSE; /*this is to unblock the accept() of the server pipe*/ @@ -92,7 +92,7 @@ void linphone_gtk_uninit_instance(void){ ortp_pipe_write(client,(uint8_t*)" ",1); ortp_client_pipe_close(client); ms_thread_join(pipe_thread,NULL); - server_pipe=-1; + server_pipe=(ortp_pipe_t)-1; g_free(pipe_name); pipe_name=NULL; } diff --git a/mediastreamer2 b/mediastreamer2 index 5d3427468..ba0d74639 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 5d342746830a6cc2aec1d3abb2d9abb898925292 +Subproject commit ba0d74639320d95a8b025f6d9fdeece1573c2189 From e821a0d63342abd097b14719e149f43652f45b89 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 30 Sep 2011 18:12:51 +0200 Subject: [PATCH 2/6] update ms2 for mingw/windows bugfixes --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index ba0d74639..81d090ad2 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit ba0d74639320d95a8b025f6d9fdeece1573c2189 +Subproject commit 81d090ad2987cf990161e5e20f3d3f2ce81c12d3 From 495e3ab7b9183a93011ddc68c9a45616636b00aa Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 30 Sep 2011 22:36:35 +0200 Subject: [PATCH 3/6] fix notifications (was broken with libnotify>=0.7.0) --- gtk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/main.c b/gtk/main.c index e3a7b2742..064d857ab 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define chdir _chdir #endif -#if defined HAVE_NOTIFY1 || defined HAVE_NOTIFIED4 +#if defined(HAVE_NOTIFY1) || defined(HAVE_NOTIFY4) #define HAVE_NOTIFY #endif From b7dacbd01a6a9f84560033413f000597f469a718 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 3 Oct 2011 10:50:40 +0200 Subject: [PATCH 4/6] do not set lc->current_call for a call that is in a conference --- coreapi/callbacks.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c index be84c6341..a307a1c5f 100644 --- a/coreapi/callbacks.c +++ b/coreapi/callbacks.c @@ -333,7 +333,8 @@ static void call_accepted(SalOp *op){ } linphone_core_update_streams (lc,call,md); linphone_call_set_state(call, LinphoneCallStreamsRunning, "Streams running"); - lc->current_call=call; + if (!call->current_params.in_conference) + lc->current_call=call; } }else{ /*send a bye*/ @@ -391,7 +392,8 @@ static void call_updating(SalOp *op){ if(lc->vtable.display_status) lc->vtable.display_status(lc,_("We have been resumed...")); linphone_call_set_state (call,LinphoneCallStreamsRunning,"Connected (streams running)"); - lc->current_call=call; + if (!call->current_params.in_conference) + lc->current_call=call; }else{ prevstate=call->state; linphone_call_set_state(call, LinphoneCallUpdatedByRemote,"Call updated by remote"); From a56aa6099bd4b89e3c0c54167c0586c355a1e8a7 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 4 Oct 2011 12:12:30 +0200 Subject: [PATCH 5/6] update ortp and ms2 --- mediastreamer2 | 2 +- oRTP | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mediastreamer2 b/mediastreamer2 index 81d090ad2..28a643d20 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 81d090ad2987cf990161e5e20f3d3f2ce81c12d3 +Subproject commit 28a643d20f6d6384d96590ab6e988928597878cf diff --git a/oRTP b/oRTP index a56d7f752..845e0cf4e 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit a56d7f752717bea7d92cf63a6d187c2f6361d38b +Subproject commit 845e0cf4e33cc9964c48aa9191005d4108dfebbd From eea317e56db603db25338f43b412045de854eaf6 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Tue, 4 Oct 2011 16:20:21 +0200 Subject: [PATCH 6/6] Fix ios compilation error --- coreapi/lsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreapi/lsd.c b/coreapi/lsd.c index f22a5b207..e47023f4f 100644 --- a/coreapi/lsd.c +++ b/coreapi/lsd.c @@ -215,7 +215,7 @@ bool_t lsd_player_loop_enabled(const LsdPlayer *p){ void lsd_player_set_gain(LsdPlayer *p, float gain){ MSAudioMixerCtl gainctl; gainctl.pin=p->mixer_pin; - gainctl.gain=gain; + gainctl.param.gain=gain; ms_filter_call_method(p->lsd->mixer,MS_AUDIO_MIXER_SET_INPUT_GAIN,&gainctl); }