witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
2035 commits 24 branches 110 tags 140 MiB
Commit graph

90 commits

Author SHA1 Message Date
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
Guillaume Beraudo
cfaa4721e5 Expose setter for max calls. (0 while in GSM call). 2011-11-03 16:11:04 +01: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
324551708e Max calls limit (config, C, exposed to java) 2011-10-18 15:41:04 +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
fe3eaf6f2d srtp: add Java API 2011-10-10 09:02:07 +02:00
Guillaume Beraudo
df65d11373 Function linphone_core_find_call_from_uri(). 2011-09-30 12:18:16 +02:00
Jehan Monnier
cdbb0e3b87 LIBLINPHONE_EXTENDED_C_INCLUDES must be for all arch 2011-09-21 16:09:02 +02:00
Guillaume Beraudo
5127119c46 Merge branch 'dev_conference' of git.linphone.org:linphone-private 
Conflicts:
	mediastreamer2
 2011-09-20 14:49:49 +02:00
Guillaume Beraudo
038190233c Implement some conference functions. 2011-09-20 14:41:48 +02:00
Simon Morlat
6d0b58eb71 Merge branch 'dev_conference' 
Conflicts:
	coreapi/linphonecall.c
	coreapi/linphonecore.c
	java/common/org/linphone/core/LinphoneCall.java
	mediastreamer2
 2011-09-16 21:51:26 +02:00
Pierre-Eric Pelloux-Prayer
9db25e99e4 android: improve android linphone app (video calls) 2011-09-16 10:37:24 +02:00
Pierre-Eric Pelloux-Prayer
55271ff6d7 Update coreapi to improve Android app 2011-09-15 11:14:17 +02:00
Pierre-Eric Pelloux-Prayer
0ce2d7cdfb android: replace State java class by an enum 2011-09-15 11:11:12 +02:00
Guillaume Beraudo
b07b784570 Conferencing JNI + Android support. 
Conflicts:

	coreapi/conference.c
	coreapi/linphonecore.h
 2011-09-14 10:27:11 +02:00
Guillaume Beraudo
0ac2049f77 Public ECCalibrationStatus ids. 2011-09-06 14:37:59 +02:00
Simon Morlat
fba8726ff8 echo cancellation improvements 2011-09-05 16:29:28 +02:00
Pierre-Eric Pelloux-Prayer
b0e75d9d78 Add configuration option allowing to specify trusted CA certificates. 
This option can contain either :
- a single file path; this file can contain several concatenated CA PEM files
- a folder path containing several CA PEM files
 2011-07-22 11:37:38 +02:00
Guillaume Beraudo
ce13260438 API and makefiles for ZRTP support. 2011-07-15 22:03:24 +02:00
Simon Morlat
c8f4f8f296 add missing jni 2011-06-22 13:06:13 +02:00
Simon Morlat
96f5278f71 add jni glue and java interface for call quality indicator 2011-06-10 19:04:09 +02:00
Guillaume Beraudo
918759ba07 JNI for call pause and resume. 2011-04-20 15:37:25 +02:00
Simon Morlat
bed44649e2 add amr support on android 2011-04-15 23:54:46 +02:00
Guillaume Beraudo
e12a24b585 Initial support for softvolume in Android. 2011-04-11 12:16:25 +02:00
Guillaume Beraudo
0025ff06f6 Enable ipv6 support for Android. 2011-04-06 15:13:59 +02:00
Guillaume Beraudo
c6149d1f4e Add Transport constructor. 2011-03-10 15:49:00 +01:00
Guillaume Beraudo
ea362d160c JNI transport ports accessors. use List. hide warnings. 2011-03-10 12:04:07 +01:00
Guillaume Beraudo
a779c59e8b Call duration accessor 
Revert speaker on dtmf
Remove useless public on interfaces.
 2011-03-02 13:09:02 +01:00
Guillaume Beraudo
f515a560bc Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone 
Conflicts:
	mediastreamer2
 2011-02-23 16:13:08 +01:00
Guillaume Beraudo
c0785a9ca6 Moved Android video capture class. 2011-02-23 16:10:22 +01:00
Jehan Monnier
bd5b1ce9e4 fix java 3 compilation issue 2011-02-16 13:54:54 +01:00
Jehan Monnier
aadd9b0b02 Merge branch 'master' of git.linphone.org:linphone-private 2011-02-15 15:08:23 +01:00
Jehan Monnier
21c783a9c6 add signalling transport getter 2011-02-15 15:07:01 +01:00
Simon Morlat
0a2996512b add getReplacedCall() 2011-02-02 22:20:08 +01:00
Simon Morlat
cb7e67278a add new LinphoneCallState in java 2011-02-01 12:08:17 +01:00
Jehan Monnier
4166afa48f add ec calibrator to Android 2011-01-25 15:44:32 +01:00
Jehan Monnier
2b80393ff4 add linphone_core_enable_keep_alive 2011-01-24 16:38:29 +01:00
Jehan Monnier
e0e2e3e792 add EC bypass mode 2011-01-24 10:35:23 +01:00
Guillaume Beraudo
b09e13a9cf Remove getter/Setter to access height/width directly. 2010-12-29 08:13:43 +01:00
Guillaume Beraudo
36493970e5 Merge commit '2e953b4' 
Conflicts:
	coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
	coreapi/linphonecore_jni.cc
 2010-12-13 15:08:31 +01:00
Guillaume Beraudo
2e953b44c8 Bind expires and getstate from proxyconfig. 
Update registration tutorial to manually unregister and re register.
 2010-12-13 14:51:12 +01:00
Guillaume Beraudo
5299f13ead Removed some compiler warnings. 2010-12-09 22:35:39 +01:00
Guillaume Beraudo
e76588265b Added convenient methods isPortrait(), createInverted() 2010-12-09 16:06:58 +01:00
Guillaume Beraudo
684c6fa545 Jni bindings for LinphoneCallParams 2010-12-09 09:12:22 +01:00
Guillaume Beraudo
9fc45b9900 Merge branch 'master' of git.linphone.org:linphone-private 2010-12-06 14:29:11 +01:00
Guillaume Beraudo
209f768036 New attribute current_params in linphonecall to differenciate expected params and effective ones. 
Fixed JNI binding for LinphoneCallParams to always copy the params and autodestroy in finalize.
 2010-12-06 14:23:19 +01:00
Jehan Monnier
b70ea12149 Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone 2010-12-06 11:36:55 +01:00
Jehan Monnier
d4f46e890d add enablePubish java binding 2010-12-06 11:36:19 +01:00