Commit graph

38 commits

Author SHA1 Message Date
Pierre-Eric Pelloux-Prayer
e17770bb85 Merge remote-tracking branch 'origin/master' into wip_video_ui_improvements
Conflicts:
	linphonerc
	submodules/linphone
2012-04-05 12:49:14 +02:00
Pierre-Eric Pelloux-Prayer
b1304a1169 Load Advanced.plist default value 2012-03-30 14:39:16 +02:00
Pierre-Eric Pelloux-Prayer
bbc4e348f1 Notify the user (once) if during a video call the battery level goes below 10% 2012-03-27 16:43:01 +02:00
Pierre-Eric Pelloux-Prayer
b38d2f89cf Add a 'do not auto start application' setting 2012-03-27 11:28:36 +02:00
Pierre-Eric Pelloux-Prayer
9633d4ccb8 Code cleanup 2012-03-27 09:32:30 +02:00
Pierre-Eric Pelloux-Prayer
dc169b7f21 Merge remote-tracking branch 'origin/master' into wip_video_ui_improvements
Conflicts:
	Classes/LinphoneAppDelegate.m
	Classes/VideoViewController-ipad.xib
2012-03-26 17:26:52 +02:00
Pierre-Eric Pelloux-Prayer
07f25fdf6a Refactor LinphoneManager and AppDelegate to allow easier customisation
Conflicts:

	Classes/LinphoneAppDelegate.m
	Classes/LinphoneUI/LinphoneManager.h
	Classes/LinphoneUI/LinphoneManager.m
2012-03-21 11:02:13 +01:00
Pierre-Eric Pelloux-Prayer
af92b0a7e0 VideoViewController not used anymore 2012-03-12 11:27:45 +01:00
Pierre-Eric Pelloux-Prayer
ddd82ee253 Better handling of GSM call (with or without bg mode enabled) 2012-03-08 11:07:55 +01:00
Pierre-Eric Pelloux-Prayer
b864902567 Fix linker error __divsi3 for i386 2012-03-07 11:51:37 +01:00
Pierre-Eric Pelloux-Prayer
579a7d8972 Fix warnings 2012-03-07 11:39:31 +01:00
Pierre-Eric Pelloux-Prayer
37dd2841dd Forbid SIP calls if GSM call is active 2012-03-07 10:30:55 +01:00
Jehan Monnier
1ba66ca345 switch to CLANG 2012-03-05 15:34:34 +01:00
Jehan Monnier
41a2a33666 g729A integration based on bcg729 2012-02-16 15:46:45 +01:00
Pierre-Eric Pelloux-Prayer
ea7d048906 Pause video stream when user press the 'home' button 2012-01-17 11:45:08 +01:00
Pierre-Eric Pelloux-Prayer
4325741e61 Fix objC memory leaks 2012-01-09 09:56:28 +01:00
Pierre-Eric Pelloux-Prayer
710076633f Revert "Do not allow user to start/answer a SIP call when a GSM call is active"
This reverts commit 2ab0771646.
2011-12-01 16:03:44 +01:00
Pierre-Eric Pelloux-Prayer
2ab0771646 Do not allow user to start/answer a SIP call when a GSM call is active 2011-12-01 12:45:00 +01:00
Jehan Monnier
8e2ebf38dd update speex repo to use our version
fix some compilation issue
2011-11-21 12:53:43 +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
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
8c8843d035 First multicall working version 2011-11-08 14:43:59 +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
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
Jehan Monnier
cd2152f17e add audio and video plist to the default settings 2011-09-19 18:55:10 +02:00
Simon Morlat
54685cd81a fix mistake in license notice. 2011-08-12 17:54:29 +02:00
Jehan Monnier
ba8e0e9902 add display name lookup into locakl address book 2011-05-26 17:31:54 +02:00
Jehan Monnier
6fae63450e move proximity sensor code as proposed by Rene Dohmen 2011-04-26 14:47:56 +02:00
Jehan Monnier
a9ab705dfa add AMR support. Should be use with compilation flag HAVE_AMR 2011-04-04 14:54:28 +02:00
Jehan Monnier
59a798d199 fix initial default value taken from bundle 2011-03-25 17:12:41 +01:00
Jehan Monnier
a3d87bedaf test if default value exist before setting 2011-03-25 10:01:38 +01:00
Jehan Monnier
aba1f6bbb1 get default settings from bundle 2011-03-24 14:34:19 +01:00
Simon Morlat
3a4e2f8896 file renaming 2011-02-09 12:24:53 +01:00
Renamed from Classes/linphoneAppDelegate.m (Browse further)