Commit graph

10890 commits

Author SHA1 Message Date
Simon Morlat
3a5a469768 install pem file for mac os x and windows. 2011-10-13 11:50:51 +02:00
Simon Morlat
bb6a292ced Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone 2011-10-13 11:36:44 +02:00
Simon Morlat
ba323197df fix bugs in conferencing/multiple calls
save some config parameter sooner.
2011-10-13 11:36:09 +02:00
Sylvain Berfini
ee75282fac TLS certificates' issue on MacOSX fixed 2011-10-13 11:23:24 +02:00
Guillaume Beraudo
d0b53669f9 android: enable srtp
Conflicts:

	mediastreamer2
	oRTP
2011-10-13 10:59:09 +02:00
Guillaume Beraudo
01438658f4 srtp: take into account that ortp' srtp.h has been renamed ortp_srtp.h
Conflicts:

	coreapi/sal.h
	coreapi/sal_eXosip2_sdp.c
	mediastreamer2
	oRTP
2011-10-13 10:58:04 +02:00
Sylvain Berfini
0719db49d8 rootca.pem added in linphonecore 2011-10-13 10:28:24 +02:00
Guillaume Beraudo
c3ce65e802 Take a reference on the Android display window on set. 2011-10-12 14:01:59 +02:00
Simon Morlat
e50de2a2ef conferencing improvement, works in GTK ui. 2011-10-11 22:12:17 +02:00
Pierre-Eric Pelloux-Prayer
5becaaee29 srtp: add Javadoc for new API functions 2011-10-10 10:58:29 +02:00
Pierre-Eric Pelloux-Prayer
2c2f4cb921 Add media_encryption API JNI implementation 2011-10-10 10:30:44 +02:00
Pierre-Eric Pelloux-Prayer
641354c50f srtp: add Java impl 2011-10-10 09:26:40 +02:00
Pierre-Eric Pelloux-Prayer
fe3eaf6f2d srtp: add Java API 2011-10-10 09:02:07 +02:00
Simon Morlat
12bf9694a4 Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
Conflicts:
	coreapi/linphonecall.c
2011-10-07 16:33:13 +02:00
Simon Morlat
93cebd8f63 - decline incoming calls when there is already an incoming call or an outgoing call not yet established. 2011-10-07 16:25:41 +02:00
Guillaume Beraudo
382b6f480a Hide LinphonecallImpl constructor.
linphonecalls should not be created from java.
2011-10-07 14:46:12 +02:00
Guillaume Beraudo
0109d8680d findCallFromUri now returns an object. 2011-10-07 14:40:58 +02:00
Guillaume Beraudo
3ef3935785 Don't crash when terminating already terminated call. 2011-10-07 14:40:15 +02:00
Jehan Monnier
74f6492919 update ms2 2011-10-07 11:18:02 +02:00
Guillaume Beraudo
d8f8b82103 Enhance conference activity style + permute calls. 2011-10-07 10:15:46 +02:00
Guillaume Beraudo
490945660d JNI function getCall now returns a LinphoneCall. 2011-10-07 09:48:52 +02:00
Pierre-Eric Pelloux-Prayer
70f96ce8e9 Enable srtp 2011-10-07 08:51:50 +02:00
Pierre-Eric Pelloux-Prayer
17df23f74a Add missing LinphoneCore function impl 2011-10-07 08:48:12 +02:00
Jehan Monnier
577d902401 add ios-medium to supported video size 2011-10-06 17:36:43 +02:00
=
044b0546b7 Fixed the issue when video parameter change during a call on hold 2011-10-06 15:53:08 +02:00
Pierre-Eric Pelloux-Prayer
e835601158 android: enable srtp 2011-10-06 14:48:24 +02:00
Pierre-Eric Pelloux-Prayer
4ff98fde11 srtp: take into account that ortp' srtp.h has been renamed ortp_srtp.h 2011-10-06 09:29:42 +02:00
=
33d4743600 Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone 2011-10-06 08:57:27 +02:00
Pierre-Eric Pelloux-Prayer
3cb22b6937 srtp: add documentation, get/set functions 2011-10-05 11:20:27 +02:00
Pierre-Eric Pelloux-Prayer
9d3acfbb4a Use private ortp/ms2 repository 2011-10-05 09:40:22 +02:00
Pierre-Eric Pelloux-Prayer
19caf123a3 srtp: use srtp branch of ms2 and ortp 2011-10-05 09:11:51 +02:00
Simon Morlat
dcafb75f86 fix function call names 2011-10-04 21:05:26 +02:00
Pierre-Eric Pelloux-Prayer
e700695989 srtp: add SRTP support to Linphone 2011-10-04 17:57:52 +02:00
Pierre-Eric Pelloux-Prayer
eea317e56d Fix ios compilation error 2011-10-04 16:20:21 +02:00
Simon Morlat
a56aa6099b update ortp and ms2 2011-10-04 12:12:30 +02:00
Jehan Monnier
e1dfc98054 Merge remote-tracking branch 'origin/master' into dev_videoios
Conflicts:
	mediastreamer2
	oRTP
2011-10-04 09:26:21 +02:00
Simon Morlat
b7dacbd01a do not set lc->current_call for a call that is in a conference 2011-10-03 10:50:40 +02:00
Simon Morlat
495e3ab7b9 fix notifications (was broken with libnotify>=0.7.0) 2011-09-30 22:36:35 +02:00
Simon Morlat
e821a0d633 update ms2 for mingw/windows bugfixes 2011-09-30 18:12:51 +02:00
Guillaume Beraudo
f57826fb23 Fix second incoming call from same uri crash. 2011-09-30 16:00:26 +02:00
Guillaume Beraudo
8a89467629 improved incoming activity + back to conference button. 2011-09-30 15:59:00 +02:00
Guillaume Beraudo
b44d51a5b1 Initial support for conferencing. 2011-09-30 15:59:00 +02:00
Guillaume Beraudo
eb6fe80e62 Fix mediastreamer2 build. 2011-09-30 15:59:00 +02:00
Guillaume Beraudo
79965f6d15 Preliminary code for conferencing support. 2011-09-30 15:59:00 +02:00
Simon Morlat
c580af0c44 fix compilation warning on windows 2011-09-30 15:37:09 +02:00
=
f0e39cf98b Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone 2011-09-30 15:29:02 +02:00
Guillaume Beraudo
df65d11373 Function linphone_core_find_call_from_uri(). 2011-09-30 12:18:16 +02:00
Guillaume Beraudo
dfdd63a2ed Report bug button in about activity when debug on. 2011-09-30 08:56:06 +02:00
root
2f1cd10695 Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone 2011-09-29 15:47:10 +02:00
Simon Morlat
9ea9dcadbd fix crash in linphone_core_get_nat_address_resolved() when nat_address is null 2011-09-29 11:45:25 +02:00