Commit graph

719 commits

Author SHA1 Message Date
Guillaume Beraudo
ad8a8bbbb3 Conference to plain call on unique remaining call. 2011-12-07 17:05:57 +01:00
Simon Morlat
ea2d566633 update ms2 for conference fixes 2011-12-06 14:03:00 +01:00
Simon Morlat
2e52e24792 fix TLS support under linphonec and gtk (problem not occuring with mobile versions)
Implement registration refresh upon SIP network protocol change.
2011-12-02 18:12:36 +01:00
Guillaume Beraudo
b59cdd29c0 Handle conference and on hold music.
When hosting a conference, mute conference participant when he
pauses us to prevent his holding music to be played to all participants.

When resuming a call, stop immediately sending the hold music,
even before receiving the 200OK. When the paused call is a conference,
it prevents the conference participants to hear the hold music while
the 200OK is back.
2011-12-01 15:48:22 +01:00
Guillaume Beraudo
6892c98ccd JNI for setting file to play while on hold. 2011-12-01 08:36:03 +01:00
Guillaume Beraudo
bb2582f220 Set current call = null earlier when pausing. 2011-11-24 16:24:56 +01:00
Simon Morlat
ad0cc88a91 java API enhancements for media encryption 2011-11-23 22:15:13 +01:00
Simon Morlat
4fae808fe8 Merge branch 'master' of git.linphone.org:linphone 2011-11-22 12:25:47 +01:00
Simon Morlat
08f3887acc add a quit menu for whose who don't have a systray 2011-11-22 12:25:01 +01:00
Guillaume Beraudo
ab498e8e8c Fix call not paused when entering conference. 2011-11-22 11:09:33 +01:00
Simon Morlat
7c514d326b fixes for sRTP support 2011-11-21 22:25:23 +01:00
Simon Morlat
0d04b9451b add new warnings. 2011-11-21 14:58:40 +01:00
Jehan Monnier
63d70bc59f update doxygen for linphoen 1.1 for IOS 2011-11-21 12:52:11 +01:00
Guillaume Beraudo
50d7841129 Remove useless zid param. 2011-11-18 10:00:38 +01:00
Simon Morlat
0f43641430 remove unused qvga-portrait and qcif-portrait and update ms2 for important fixes for video on linux 2011-11-17 23:53:59 +01:00
Jehan Monnier
46be0d8464 move vp8 mime type from: VP8-DRAFT-0-3-2 to VP8 2011-11-17 10:52:17 +01:00
Guillaume Beraudo
ce510f9d1f Jni for setAuthenticationTokenVerified function. 2011-11-14 15:32:31 +01:00
Simon Morlat
40fd07b9b3 fix potential crash at end of conference 2011-11-14 13:50:17 +01:00
Jehan Monnier
f73c27ab0f Merge branch 'master' of git.linphone.org:linphone 2011-11-14 11:53:02 +01:00
Simon Morlat
43e8b0bbef read conference sample rate from config file 2011-11-14 11:31:11 +01:00
Jehan Monnier
e6c0ee2f7c Merge remote-tracking branch 'private/dev_videoios'
Conflicts:
	mediastreamer2
2011-11-14 11:10:24 +01:00
Simon Morlat
91b606875d add isEchoLimiterEnabled() java binding 2011-11-09 17:27:46 +01:00
Jehan Monnier
32527a1bc1 test if sample rate is supported by android sound card, remove areStreamsEncrypted from Android 2011-11-08 16:22:20 +01:00
Simon Morlat
2a74093872 srtp/zrtp combo box compatible for gtk 2.22 2011-11-08 11:59:15 +01:00
Simon Morlat
d304288421 encryption support in progress 2011-11-07 17:08:00 +01:00
Simon Morlat
fab5b9b712 support to display encryption 2011-11-07 12:22:14 +01:00
Simon Morlat
7e12673934 add setting to reject duplicate calls 2011-11-07 11:02:59 +01:00
Simon Morlat
93191881a5 fix to start call timer only at connected state (and not at early media) 2011-11-04 15:24:21 +01:00
Simon Morlat
7f849dc29f fix for srtp when retrying in unencrypted mode 2011-11-04 15:06:09 +01:00
Simon Morlat
26862d52f1 remove debug messages 2011-11-04 10:51:14 +01:00
Simon Morlat
527d6cfdef Merge branch 'master' of git.linphone.org:linphone 2011-11-04 10:32:28 +01:00
Simon Morlat
263b103154 Merge remote-tracking branch 'private/srtp'
Conflicts:
	coreapi/linphonecore.c
	coreapi/linphonecore.h
	coreapi/sal_eXosip2.c
	java/common/org/linphone/core/LinphoneCore.java
	oRTP
2011-11-04 10:32:08 +01:00
Sylvain Berfini
f6d85a81c2 Merge branch 'master' of git.linphone.org:linphone 2011-11-03 16:50:31 +01:00
Sylvain Berfini
6f3b23e64d Raised stack max length to 16384 2011-11-03 16:49:45 +01:00
Guillaume Beraudo
cfaa4721e5 Expose setter for max calls. (0 while in GSM call). 2011-11-03 16:11:04 +01:00
Simon Morlat
92642e79c0 Merge branch 'dev_videoios' into local_videoios
Conflicts:
	oRTP
2011-10-28 21:57:01 +02:00
unknown
cab5b3ca65 LpConfig's Buffer's MAX_LENGTH reduced to work on Win32 2011-10-28 11:59:49 +02:00
Guillaume Beraudo
ca67884d93 Fix previous commit. 2011-10-27 12:34:52 +02:00
Guillaume Beraudo
598bafd4a8 Function to check if a call locks sound resources.
Use to prevent a situation where several calls
try to use the sound resources.
- outgoing states (ring)
- incoming states (ring)
- ..
2011-10-27 10:38:05 +02:00
Guillaume Beraudo
f203f82182 Reject incoming calls from people already in call with.
Note that the other call will change state to paused by other.
2011-10-26 13:11:44 +02:00
Guillaume Beraudo
65dc7621f4 Add silk pluging support (stock + Android). 2011-10-26 11:20:48 +02:00
Simon Morlat
badf9bf7d6 Merge branch 'master' of git.linphone.org:linphone 2011-10-25 12:48:51 +02:00
Simon Morlat
cf04742152 fix resumed by remote state not working 2011-10-25 12:47:54 +02:00
Pierre-Eric Pelloux-Prayer
7c1668314b Fix crash when the entered uri is invalid 2011-10-25 12:23:09 +02:00
Simon Morlat
7b6035f58f support for wideband conferences 2011-10-24 18:54:52 +02:00
Guillaume Beraudo
0fb206da3a More verbose traces on SAL call. 2011-10-24 11:37:11 +02:00
Jehan Monnier
64a23f9b67 add silk for IOS 2011-10-21 16:03:06 +02:00
Simon Morlat
2b16115ebf fix bad merge (wasn't compiling) 2011-10-21 12:05:28 +02:00
Simon Morlat
7f7ee739c2 Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone 2011-10-21 11:55:19 +02:00
Simon Morlat
af38e99dd4 implement dynamic number of call limitations 2011-10-20 17:08:18 +02:00