mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-25 15:18:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Yann Diorcet 2012-05-15 17:11:23 +02:00
commit a320b8be03
6 changed files with 1207 additions and 1393 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
configure.ac
View file

@ -245,6 +245,24 @@ if test x$ipv6 = xtrue ; then
fi
AC_SUBST(IPV6_CFLAGS)
dnl enable timestamp support
AC_ARG_ENABLE(rtp-timestamp,
[ --enable-rtp-timestamp Turn on RTP packet timestamp],
[case "${enableval}" in
yes) rtptimestamp=true;;
no) rtptimestamp=false;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-rtp-timestamp) ;;
esac],[rtptimestamp=false])
AC_ARG_ENABLE(debug,
[ --enable-debug=[yes/no] enables the display of traces showing the execution of the library. [default=yes]],
[case "${enableval}" in
yes) debug_enabled=yes;;
no) debug_enabled=no;;
*) AC_MSG_ERROR("Bad value for --enable-debug");;
esac],
[debug_enabled=no])
dnl enable truespeech codec support
AC_ARG_ENABLE(truespeech,
[ --enable-truespeech Turn on TrueSpeech support (x86 only)],
@ -562,6 +580,9 @@ else
if test x$ac_cv_c_bigendian = xyes ; then
ORTP_CFLAGS="$ORTP_CFLAGS -DORTP_BIGENDIAN"
fi
if test x$rtptimestamp = xtrue ; then
ORTP_CFLAGS="$ORTP_CFLAGS -DORTP_TIMESTAMP"
fi
ORTP_DIR=oRTP
changequote(<<, >>)
ORTP_VERSION=`grep -E ^[AC]+_INIT ${top_srcdir}/oRTP/configure.ac | sed -e 's:^.*_INIT(.*,\[\(.*\)\]):\1:g'`

4
coreapi/sal_eXosip2.c
View file

@ -1062,6 +1062,10 @@ static void handle_ack(Sal *sal, eXosip_event_t *ev){
ms_warning("ack for non-existing call !");
return;
}
if (op->terminated) {
ms_warning("ack for terminated call, ignoring");
return;
}
if (op->sdp_offering){
sdp=eXosip_get_sdp_info(ev->ack);

12
gtk/main.c
View file

@ -806,6 +806,18 @@ void linphone_gtk_used_identity_changed(GtkWidget *w){
if (sel) g_free(sel);
}
void on_proxy_refresh_button_clicked(GtkWidget *w){
LinphoneCore *lc=linphone_gtk_get_core();
MSList const *item=linphone_core_get_proxy_config_list(lc);
while (item != NULL) {
LinphoneProxyConfig *lpc=(LinphoneProxyConfig*)item->data;
linphone_proxy_config_edit(lpc);
linphone_proxy_config_done(lpc);
item = item->next;
}
}
static void linphone_gtk_notify_recv(LinphoneCore *lc, LinphoneFriend * fid){
linphone_gtk_show_friends();
}

2559
gtk/main.ui
View file

File diff suppressed because it is too large Load diff

2
mediastreamer2

@ -1 +1 @@
Subproject commit 13818e851af2f51b3f0fe7bcec64931038a3d9f3
Subproject commit 2413338721f9ac82249a47b333ccca53fb7d3359

2
oRTP

@ -1 +1 @@
Subproject commit a24da093214970684312a70592b3e7e5dbaa1b26
Subproject commit 9d8e0cc62b8da06d596f4ed2b62e2c98dad990b3