Simon Morlat
b838ecebd3
Merge branch 'master' into tunnel
...
and fix srtp compilation (arch not set in archives).
Conflicts:
Classes/LinphoneUI/LinphoneManager.m
linphone.xcodeproj/project.pbxproj
2011-10-26 23:01:19 +02:00
Simon Morlat
29a7991d5e
Merge branch 'master' of git.linphone.org:linphone-iphone
2011-10-25 21:08:23 +02:00
Pierre-Eric Pelloux-Prayer
fc530ed057
Pause SIP call when audio is interrupted by OS (on incoming GSM call for instance)
...
The SIP call is automatically resumed when audio is available.
2011-10-24 11:46:20 +02:00
Pierre-Eric Pelloux-Prayer
44d5e1db8c
Define sound interruption handler in objc. Used to pause sip call.
2011-10-24 11:46:20 +02:00
Pierre-Eric Pelloux-Prayer
9b32774f31
Set max_calls value to 1
2011-10-24 11:46:20 +02:00
Jehan Monnier
db47f93693
fix for silk
2011-10-21 23:11:29 +02:00
Jehan Monnier
e24291827d
load silk plugin (still some bugs)
2011-10-21 18:25:41 +02:00
Jehan Monnier
1984838e1b
add silk support
2011-10-21 16:05:43 +02:00
Jehan Monnier
04a9435c2a
update linphone/ms2 with silk
2011-10-20 10:21:00 +02:00
Jehan Monnier
df20927668
fix for IOS 5
2011-10-14 18:03:40 +02:00
Jehan Monnier
95d7808e58
update osip refference
2011-10-14 17:25:02 +02:00
Jehan Monnier
2635db3b74
fix audio for IOS5
2011-10-14 16:14:54 +02:00
Pierre-Eric Pelloux-Prayer
43f7b8e728
Add SRTP_CFLAGS to mk
2011-10-05 09:06:41 +02:00
Pierre-Eric Pelloux-Prayer
2318b18689
Merge remote-tracking branch 'public/master'
2011-10-04 12:14:57 +02:00
Sylvain Berfini
dcd82abac0
updated repository
2011-09-13 15:24:12 +02:00
Guillaume Beraudo
2ec412b969
Srtp version from 1.4.2 to 1.4.4.
...
Required by zrtp.c.
2011-09-09 14:20:33 +02:00
Jehan Monnier
265cd6b105
libilbc submodule to avoid file too long issue
2011-09-09 11:15:50 +02:00
Guillaume Beraudo
5a982c98e4
Fix zrtpcpp CmakeFilesList.txt only once copy
2011-09-08 16:16:23 +02:00
Sylvain Berfini
24ae96def3
Merge branch 'master' of git://git.linphone.org/linphone-iphone
2011-09-08 15:57:34 +02:00
Guillaume Beraudo
434062dadf
Update documentation: cmake required to build zrtp.
2011-09-08 15:22:59 +02:00
Guillaume Beraudo
08353ff038
Fix second build fail due to zrtp/cmake
...
CMakeFileLists.txt was overwritten for each architecture target.
CMake was then confused as the CMakeFileLists.txt was newer than the
generated Makefile, cache.
CMake would forget the options passed during generation of Makefile,
leading to compilation of unwanted ccRrtp.
2011-09-08 14:19:12 +02:00
Guillaume Beraudo
745a9037eb
Zrtp should not be compiled by default.
2011-09-08 12:39:03 +02:00
Guillaume Beraudo
d50e11ecbf
Fix srtp patch not applying.
2011-09-08 12:37:36 +02:00
Sylvain Berfini
bfff840cb2
Bug fixes on iPhone 3G
2011-09-07 16:00:34 +02:00
Guillaume Beraudo
c288f87bfb
Patches for srtp and zrtp.
2011-09-06 14:51:14 +02:00
Guillaume Beraudo
8ee087fac0
Fix ilbc compilation. (server moved)
2011-09-01 11:17:25 +02:00
Guillaume Beraudo
bbdd908e4a
Don't compile ZRTPCPP when zrtp is disabled.
2011-09-01 11:16:38 +02:00
Guillaume Beraudo
de7f71a1ce
Fix build
2011-08-29 09:11:36 +02:00
Guillaume Beraudo
63745b55fd
Compilation chain for ZRTP (no implementation)
2011-08-26 18:41:46 +02:00
Jehan Monnier
bbe92035d8
update tunnel
2011-08-25 16:16:06 +02:00
Jehan Monnier
bb23647a99
update tunnel submodule
2011-08-25 16:14:31 +02:00
Jehan Monnier
0b2ebdf4ec
Merge remote-tracking branch 'bc/master' into tunnel
2011-08-25 15:48:22 +02:00
Jehan Monnier
f1661c80b9
update linphone to fix compilation issue
2011-08-25 15:47:32 +02:00
Guillaume Beraudo
41746d7ce3
Update dependency on linphone.
2011-08-22 10:42:58 +02:00
Simon Morlat
4820c3b36d
Implement tunnel server reconnection
...
Merge branch 'master' into tunnel
Conflicts:
linphone.xcodeproj/project.pbxproj
2011-08-20 16:49:18 +02:00
Simon Morlat
8f3a2358da
update .gitignore
2011-08-20 15:59:20 +02:00
Pierre-Eric Pelloux-Prayer
dece0be4b1
Added missing resource (rootca.pem)
2011-08-19 11:11:36 +02:00
Pierre-Eric Pelloux-Prayer
44466fb57f
ios: enable TLS support
2011-08-19 11:10:39 +02:00
Pierre-Eric Pelloux-Prayer
eb6e99ba5f
New linphone version
2011-08-19 10:49:07 +02:00
Simon Morlat
fe31b98949
fix gpl notice
2011-08-18 12:25:40 +02:00
Simon Morlat
48cf488ce2
update linphone (fixes for lion compilation)
2011-08-18 12:07:48 +02:00
Simon Morlat
d173e75f79
fix bad tab in makefile !
2011-08-17 22:14:03 +02:00
Simon Morlat
9b413f0e91
add GPL license
2011-08-12 17:55:48 +02:00
Simon Morlat
54685cd81a
fix mistake in license notice.
2011-08-12 17:54:29 +02:00
Simon Morlat
6e8a6a7a51
fix trouble with lastest opencore amr (configure script was removed)
2011-08-10 22:19:27 +02:00
Simon Morlat
6ff81c7b14
disable nls
2011-08-10 15:18:07 +02:00
Simon Morlat
38cfc7bcda
disable strict for linphone compilation
2011-08-10 14:47:09 +02:00
Jehan Monnier
464c8e9535
add tunnel auto mode
2011-06-30 23:13:57 +02:00
Jehan Monnier
b0cf908e9b
fix crash in case of contact phone number without label
2011-06-30 10:27:27 +02:00
Jehan Monnier
61f123df9b
Merge remote-tracking branch 'bc/master' into tunnel
2011-06-27 10:31:29 +02:00