Commit graph

4224 commits

Author SHA1 Message Date
Simon Morlat
2ce9d4ecc0 fix bug in stats update JNI upcall, since introduction of text stream 2016-01-25 21:53:06 +01:00
Simon Morlat
f5a8a0c803 don't notify periodical updates for non-established streams. 2016-01-25 21:49:02 +01:00
Simon Morlat
cd3beba1c4 fix crash in handle_stream_events() where the MediaStream object is destroyed and recreated during the loop of event processing (typicall with ice events). 2016-01-25 20:32:41 +01:00
Sylvain Berfini
42d8d775b9 Export a few symbols requiered for win32 tester + reworked a few APIs 2016-01-25 17:44:27 +01:00
Simon Morlat
93f7cbd86f fix ice restart tests 2016-01-25 17:13:48 +01:00
Sylvain Berfini
1f776d1f1c Commit changes to friends list in db 2016-01-25 14:48:11 +01:00
Simon Morlat
f8a1eeff37 fix uninstalled ringtoneplayer.h 2016-01-25 14:47:38 +01:00
Sylvain Berfini
43619c53a8 Added contact updated callback in friendlist when using CardDAV 2016-01-25 12:58:05 +01:00
Sylvain Berfini
3b7c61e640 Merge branch 'master' into dev_vcard
Conflicts:
	coreapi/CMakeLists.txt
	coreapi/Makefile.am
	coreapi/linphonecore.h
	java/common/org/linphone/core/LinphoneCore.java
	java/impl/org/linphone/core/LinphoneCoreImpl.java
2016-01-25 10:47:41 +01:00
Simon Morlat
cd6dfcabe4 add java wrappers for new reachability methods 2016-01-22 18:22:43 +01:00
Simon Morlat
c329b10669 implement independant controls for media and sip network reachabilities. 2016-01-22 17:52:25 +01:00
François Grisez
b689c4bc4e Unref calls after removing them from a conference or after conference termination 2016-01-22 16:21:39 +01:00
trevora
f2fe6b766f Hold file loops for paused calls.
Sets the amount of time to pause before replaying the hold music file.
2016-01-22 15:30:59 +01:00
Ghislain MARY
28b029c9bc Fix automatic wrapper generation. 2016-01-22 15:06:43 +01:00
Sandrine Avakian
29f51d8d27 linphone_player_open prototype change: adding MSFactory * as parameter. 2016-01-22 14:14:39 +01:00
François Grisez
66cc5b3fc3 Fixes bad function name in linphnonecore_jni.cc 2016-01-22 11:21:07 +01:00
François Grisez
b44b872e1c Prevents the conference server to be added to the list of participants 2016-01-22 11:21:07 +01:00
Jehan Monnier
bd667fb41c fix compilation issue 2016-01-22 11:19:51 +01:00
Sandrine Avakian
642a624e59 Merge branch 'master' of git.linphone.org:linphone into dev_msfactory
# Conflicts:
#	mediastreamer2
2016-01-22 10:52:50 +01:00
Gautier Pelloux-Prayer
82634eb795 ringtoneplayer: handle NULL ringtone for iOS too 2016-01-22 10:03:48 +01:00
Ghislain MARY
ba58c9f038 Support build for Windows 10 with CMake. 2016-01-21 17:06:59 +01:00
Sandrine Avakian
d961cb08c5 Fixing bug in ms_factory_voip_init. 2016-01-21 14:55:37 +01:00
Sylvain Berfini
bfc7630ada This should fix vcard tester 2016-01-21 14:40:00 +01:00
Sandrine Avakian
b8468a56a1 Attempt on fixing ring stream. 2016-01-21 13:20:19 +01:00
Sandrine Avakian
6fd92fdcf9 Fixes in gtk audio_assistant and property box. 2016-01-21 09:28:19 +01:00
Sandrine Avakian
de1ed36191 Merge branch 'master' of git.linphone.org:linphone into dev_msfactory
# Conflicts:
#	mediastreamer2
2016-01-21 09:18:36 +01:00
Sylvain Berfini
ca03bb1972 Fixed issue with ampersand in config dump 2016-01-20 17:33:23 +01:00
Jehan Monnier
46b34d978b -In case of mandatory encryption on, generate an iframe when encryption is done.
-ms2: ice fixes
2016-01-20 16:36:16 +01:00
Sandrine Avakian
1f624ada80 Updating echo cancellation and adding MSFactory into Sal structure. 2016-01-20 15:12:12 +01:00
Brieuc Viel
86e7857431 Fix typo in JNI 2016-01-20 14:32:24 +01:00
Gautier Pelloux-Prayer
33be9d6193 quality_reporting.c: decrease logs intensity, there are not warnings at all 2016-01-20 14:03:56 +01:00
Gautier Pelloux-Prayer
8508f54357 linphonecall.c: remove unused code 2016-01-20 10:30:27 +01:00
Sandrine Avakian
e5632b3ee3 Merge branch 'master' of git.linphone.org:linphone into dev_msfactory
# Conflicts:
#	mediastreamer2
2016-01-20 09:04:11 +01:00
Simon Morlat
1a36ff6b96 fix android build 2016-01-19 17:50:37 +01:00
Simon Morlat
9a8ee6ddf5 update for new ortp logging api 2016-01-19 16:25:43 +01:00
Sandrine Avakian
a8d978c832 Small fixes for factory integration in linphonecall.c , misc.c and offeranswer.c . 2016-01-19 15:51:02 +01:00
Sandrine Avakian
ba2bb54e03 Merge branch 'master' of git.linphone.org:linphone into dev_msfactory 2016-01-19 15:47:26 +01:00
Jehan Monnier
fbc08fa148 update ortp 2016-01-19 15:39:31 +01:00
Jehan Monnier
2a455a5fc7 remove some warnings 2016-01-19 15:39:31 +01:00
Brieuc Viel
8b71cc1fc8 Fixes JNI crach around LinphoneConference constructor 2016-01-19 15:35:41 +01:00
Sylvain Berfini
f001aaae97 This should fix broken JNI compilation 2016-01-19 14:07:41 +01:00
Sandrine Avakian
48b10c1724 Update media streamer2 : text stream, ring stream, audio stream.
Adding declaration of void ms_factory_set_mtu  in factory.h.
Adding a getter linphone_core_get_factory(void *lc) in linphonecore.h.
2016-01-19 13:58:21 +01:00
Simon Morlat
2e42434290 prevent crash when call log has invalid URIso 2016-01-19 12:41:34 +01:00
Jehan Monnier
0d5ffa5086 No longer change remote destination when ice completed because already done in ms2 ice module 2016-01-19 12:21:35 +01:00
Sandrine Avakian
4dfdc930c3 Merge branch 'master' of git.linphone.org:linphone into dev_msfactory 2016-01-19 10:55:59 +01:00
François Grisez
7af7898ddd Fixes 'make install' with autotools 2016-01-19 10:55:55 +01:00
Sandrine Avakian
56a452a8f3 Update mediastreamer and player. 2016-01-19 10:54:09 +01:00
Sandrine Avakian
1afed9cd17 Propagating changes from conference and webcam in mediastreamer.
Updating conference as well in linphone.
2016-01-19 10:50:01 +01:00
Simon Morlat
d906f2dc5d factorize code, don't enable symmetric_rtp if ICE is used. 2016-01-18 17:21:53 +01:00
Sandrine Avakian
bbcbbc38d0 Merge branch 'master' of git.linphone.org:linphone into dev_msfactory 2016-01-18 14:05:37 +01:00