mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-27 07:59:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui

Browse source 
Conflicts:
	Classes/HistoryTableViewController.m
	Classes/HistoryViewController.m
	Classes/PhoneMainView.m
This commit is contained in:
Yann Diorcet 2012-08-21 15:05:14 +02:00
commit 81b6a40b7d
7 changed files with 23 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Classes/LinphoneAppDelegate.m
View file

@ -27,13 +27,6 @@
#include "LinphoneManager.h"
#include "linphonecore.h"
#if __clang__ && __arm__
extern int __divsi3(int a, int b);
int __aeabi_idiv(int a, int b) {
return __divsi3(a,b);
}
#endif
@implementation UILinphoneWindow
@end

3
Classes/LinphoneUI/UIVideoButton.h
View file

@ -24,9 +24,6 @@
@interface UIVideoButton : UIToggleButton<UIToggleButtonDelegate> {
}
@property (assign) BOOL locked;
@property (assign) BOOL unlockVideoState;
@property (nonatomic, retain) IBOutlet UIActivityIndicatorView* waitView;
@end

44
Classes/LinphoneUI/UIVideoButton.m
View file

@ -22,13 +22,9 @@
@implementation UIVideoButton
@synthesize locked;
@synthesize unlockVideoState;
@synthesize waitView;
- (void)initUIVideoButton {
locked = FALSE;
unlockVideoState = FALSE;
}
- (id)init{
@ -68,8 +64,6 @@
[self setEnabled: FALSE];
[waitView startAnimating];
[self setLocked: TRUE];
[self setUnlockVideoState: TRUE];
LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
if (call) {
@ -95,8 +89,6 @@
[self setEnabled: FALSE];
[waitView startAnimating];
[self setLocked: TRUE];
[self setUnlockVideoState: FALSE];
LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
if (call) {
@ -116,26 +108,28 @@
LinphoneCall* currentCall = linphone_core_get_current_call([LinphoneManager getLc]);
if (currentCall) {
LinphoneCallState state = linphone_call_get_state(currentCall);
if (state == LinphoneCallStreamsRunning || state == LinphoneCallUpdated || state == LinphoneCallUpdatedByRemote) {
if (linphone_call_params_video_enabled(linphone_call_get_current_params(currentCall))) {
val = true;
if(locked && unlockVideoState) {
locked = FALSE;
[waitView stopAnimating];
}
} else {
if(locked && !unlockVideoState) {
locked = FALSE;
[waitView stopAnimating];
}
switch (state) {
case LinphoneCallUpdated:
{
[waitView stopAnimating];
}
if(!locked) {
case LinphoneCallStreamsRunning:
{
[self setEnabled:TRUE];
if (linphone_call_params_video_enabled(linphone_call_get_current_params(currentCall))) {
val = true;
}
break;
}
} else {
// Disable button if the call is not running
[self setEnabled:FALSE];
[waitView stopAnimating];
default:
{
// Disable button if the call is not running
[self setEnabled:FALSE];
[waitView stopAnimating];
break;
}
}
} else {
// Disable button if there is no call

1
linphonerc
View file

@ -35,6 +35,7 @@ playback_dev_id=AU: Audio Unit Receiver
ringer_dev_id=AQ: Audio Queue Device
capture_dev_id=AU: Audio Unit Receiver
echocancellation=0
dtmf_player_amp=0.007
[misc]
history_max_size=30

1
linphonerc-ipad
View file

@ -33,6 +33,7 @@ playback_dev_id=AU: Audio Unit Receiver
ringer_dev_id=AQ: Audio Queue Device
capture_dev_id=AU: Audio Unit Receiver
echocancellation=0
dtmf_player_amp=0.007
[misc]
history_max_size=30

2
submodules/linphone

@ -1 +1 @@
Subproject commit 0a12fa9ce7af5c795722ce1f7ebad9bc85314d3b
Subproject commit 75040297c12e118cea0ec87d2bc3980c290f8e86

2
submodules/mssilk

@ -1 +1 @@
Subproject commit 391b6d6b0fdf6854e5a25f287c4d8461730a1d40
Subproject commit d3a6a0a130730c0eaf9a0b6ed2fc466432852684