15 commits

Author	SHA1	Message	Date
Simon Morlat	40fd07b9b3	fix potential crash at end of conference	2011-11-14 13:50:17 +01:00
Simon Morlat	43e8b0bbef	read conference sample rate from config file	2011-11-14 11:31:11 +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
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
Simon Morlat	7b6035f58f	support for wideband conferences	2011-10-24 18:54:52 +02:00
Sylvain Berfini	0e4136de34	Fix an issue with video when conferencing	2011-10-20 11:36:57 +02:00
Simon Morlat	ba323197df	fix bugs in conferencing/multiple calls ... save some config parameter sooner.	2011-10-13 11:36:09 +02:00
Simon Morlat	e50de2a2ef	conferencing improvement, works in GTK ui.	2011-10-11 22:12:17 +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
Pierre-Eric Pelloux-Prayer	3cb22b6937	srtp: add documentation, get/set functions	2011-10-05 11:20:27 +02:00
Guillaume Beraudo	038190233c	Implement some conference functions.	2011-09-20 14:41:48 +02:00
Guillaume Beraudo	b07b784570	Conferencing JNI + Android support. ... Conflicts: coreapi/conference.c coreapi/linphonecore.h	2011-09-14 10:27:11 +02:00
Simon Morlat	0a9e2d3738	audio conferencing is working. Not all cases are tested yet.	2011-09-13 21:40:35 +02:00
Simon Morlat	98c4a9bb5e	wip - conferencing	2011-09-12 22:42:53 +02:00