Jehan Monnier
06feacd610
Merge remote-tracking branch 'origin/conference'
...
Conflicts:
linphone.xcodeproj/project.pbxproj
submodules/liblinphone.xcodeproj/project.pbxproj
2011-11-18 18:01:44 +01:00
Jehan Monnier
6e1ae646b5
Merge remote-tracking branch 'origin/conference'
...
Conflicts:
Classes/LinphoneUI/LinphoneUIDelegates.h
Classes/PhoneViewController.h
Classes/PhoneViewController.m
linphone.xcodeproj/project.pbxproj
linphonerc
submodules/liblinphone.xcodeproj/project.pbxproj
2011-11-18 17:18:49 +01:00
Pierre-Eric Pelloux-Prayer
32dd2dc423
Merge branch 'conference' of git.linphone.org:linphone-iphone into conference
2011-11-18 17:17:32 +01:00
Pierre-Eric Pelloux-Prayer
24e7ea9440
InCallView: new icons
2011-11-18 17:17:12 +01:00
Jehan Monnier
8a1c3000cd
merge vios IOS with master
2011-11-18 14:23:41 +01:00
Jehan Monnier
0ad82b4cff
Merge remote-tracking branch 'private/dev_videoios'
...
Conflicts:
.gitmodules
Classes/LinphoneAppDelegate.m
Settings.bundle/Root.plist
linphone.xcodeproj/project.pbxproj
submodules/build/builder-iphone-os.mk
submodules/liblinphone.xcodeproj/project.pbxproj
submodules/linphone
2011-11-15 10:54:56 +01:00
Jehan Monnier
162aae0391
fix incomming call in bg mode
2011-11-14 16:11:32 +01:00
Pierre-Eric Pelloux-Prayer
ec261bd518
Improved graphics/layout for incall view
2011-11-09 16:04:59 +01:00
Pierre-Eric Pelloux-Prayer
28f114cf29
Fix 'presentModelViewController' crash for iOS 5 with multicall
2011-11-08 15:18:10 +01:00
Pierre-Eric Pelloux-Prayer
2ef541de04
Check LinphoneCore ptr validity before using it
2011-11-08 14:44:06 +01:00
Pierre-Eric Pelloux-Prayer
58e9256f79
DTMF fixes
2011-11-08 14:44:06 +01:00
Pierre-Eric Pelloux-Prayer
649e245a3a
Add back-to-in-call-view button on dialer during call
2011-11-08 14:44:06 +01:00
Pierre-Eric Pelloux-Prayer
8c741b0d39
Conferencing integration continued
2011-11-08 14:44:06 +01:00
Pierre-Eric Pelloux-Prayer
c5de6fff07
Conference begins to work
2011-11-08 14:44:06 +01:00
Pierre-Eric Pelloux-Prayer
8c8843d035
First multicall working version
2011-11-08 14:43:59 +01:00
Pierre-Eric Pelloux-Prayer
8e1fdcb627
Fix various Xcode warnings
2011-11-08 14:37:39 +01:00
Jehan Monnier
a77e2af47d
fix missing call duration on outgoing calls
2011-11-04 12:20:53 +01:00
Guillaume Beraudo
ef45713695
Merge branch 'master' of git.linphone.org:linphone-iphone
2011-11-03 16:39:07 +01:00
Jehan Monnier
bf1d6d71fc
Merge remote-tracking branch 'public/master' into dev_videoios
2011-11-02 10:22:26 +01:00
Jehan Monnier
51fabb1ff1
add workaround to request local notification of type UIRemoteNotificationTypeAlert|UIRemoteNotificationTypeSound to be enabled
2011-11-02 10:03:03 +01:00
Guillaume
5a04711e26
Merge branch 'master' of git://git.linphone.org/linphone-iphone
2011-11-02 09:30:51 +01:00
Jehan Monnier
e187357992
fix wrong remote view orientation after call closed in landscape mode
2011-11-02 08:41:46 +01:00
Simon Morlat
eecb65d1d4
Merge remote-tracking branch 'public/master' into dev_videoios
...
Conflicts:
Classes/LinphoneUI/LinphoneManager.m
Classes/LinphoneUI/LinphoneUIDelegates.h
Classes/LinphoneUI/UILinphone.h
Settings.bundle/Root.plist
linphone.xcodeproj/project.pbxproj
linphonerc
submodules/build/builder-iphone-os.mk
submodules/liblinphone.xcodeproj/project.pbxproj
2011-11-01 22:20:12 +01:00
Simon Morlat
f70916d8d9
disable idle timer during video calls (works)
2011-10-31 22:16:14 +01:00
Simon Morlat
f02f9f38f4
- update linphone and ms2 submodules for rate control
...
- fix build issues
- fix all black video screen
- fix microphone button not restored in initial state
- attempt to disable idle timer, but with limited success...
2011-10-28 22:01:58 +02:00
Simon Morlat
4df63c37b5
fix exception because in call view is shown twice for outgoing calls. (ios5)
2011-10-28 21:30:41 +02:00
Guillaume
4b4319a628
Partial commit with changes on Sylvain's Mac.
2011-10-28 16:29:31 +02:00
Jehan Monnier
1f069c52d4
fix default settings
2011-10-26 21:31:05 +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
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
ddeaddf92d
Merge remote-tracking branch 'public/master' into dev_videoios
...
IOS migration
Conflicts:
.gitignore
.gitmodules
linphone-Info.plist
linphone.xcodeproj/project.pbxproj
submodules/build/builder-iphone-os.mk
submodules/build/iphone-config.site
submodules/externals/osip
submodules/liblinphone.xcodeproj/project.pbxproj
submodules/linphone
2011-10-19 11:36:27 +02:00
Jehan Monnier
1c82ac2e95
try to use native IOS resolution. Still not work very well for H264
2011-09-21 08:30:02 +02:00
Jehan Monnier
cd2152f17e
add audio and video plist to the default settings
2011-09-19 18:55:10 +02:00
Jehan Monnier
edf9cda3a3
implement lanscape mode for IOS video
2011-09-19 17:13:16 +02:00
Jehan Monnier
da36fd889b
remove status bar from video view
2011-09-13 17:16:29 +02:00
Sylvain Berfini
bfff840cb2
Bug fixes on iPhone 3G
2011-09-07 16:00:34 +02:00
Guillaume Beraudo
63745b55fd
Compilation chain for ZRTP (no implementation)
2011-08-26 18:41:46 +02:00
Simon Morlat
da9ec193d5
Merge branch 'master' into dev_videoios
...
Conflicts:
linphone.xcodeproj/project.pbxproj
submodules/build/builder-iphone-os.mk
submodules/linphone
2011-08-20 12:35:07 +02:00
Pierre-Eric Pelloux-Prayer
44466fb57f
ios: enable TLS support
2011-08-19 11:10:39 +02:00
Pierre-Eric Pelloux-Prayer
211e251f5a
ios: fix crashes in video calls caused by invalid memory usage
2011-08-17 16:24:13 +02:00
Pierre-Eric Pelloux-Prayer
7e05d67379
ios: enable TLS support
2011-08-17 09:15:11 +02:00
Pierre-Eric Pelloux-Prayer
dbd4b9a0ff
ios: enable vp8 video codec
2011-08-16 13:11:14 +02:00
Simon Morlat
54685cd81a
fix mistake in license notice.
2011-08-12 17:54:29 +02:00
Pierre-Eric Pelloux-Prayer
32cb035988
ios: auto-enable speaker when doing a video call
2011-07-29 10:58:58 +02:00
Jehan Monnier
df166a9a52
G722 support added
2011-07-26 15:29:40 +02:00
Jehan Monnier
4dcafb0500
enhanced video view
2011-07-21 18:46:35 +02:00
Jehan Monnier
d73efa6d9c
enable front cam
2011-07-21 16:40:54 +02:00
Jehan Monnier
e7c7c87534
merge with master 1.0.6 except submodule linphone
2011-07-20 16:44:02 +02:00