mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-02 11:19:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix UICamSwitch button broken

Browse source
This commit is contained in:
Simon Morlat 2014-06-24 17:54:36 +02:00
parent 5af4a7a058
commit 874eb9e62a
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Classes/LinphoneManager.m
View file

@ -1,3 +1,4 @@
/* LinphoneManager.h
*
* Copyright (C) 2011 Belledonne Comunications, Grenoble, France

3
Classes/LinphoneUI/UICamSwitch.h
View file

@ -22,8 +22,7 @@
@interface UICamSwitch : UIButton {
@private
const char* currentCamId;
const char* nextCamId;
}
@property (nonatomic, retain) IBOutlet UIView* preview;
@end

34
Classes/LinphoneUI/UICamSwitch.m
View file

@ -28,17 +28,6 @@
- (id)initUICamSwitch {
[self addTarget:self action:@selector(touchUp:) forControlEvents:UIControlEventTouchUpInside];
currentCamId = (char*)linphone_core_get_video_device([LinphoneManager getLc]);
if ([LinphoneManager instance].frontCamId !=nil ) {
//ok, we have 2 cameras
if (strcmp(currentCamId,[LinphoneManager instance].frontCamId)==0) {
nextCamId = [LinphoneManager instance].backCamId;
} else {
nextCamId = [LinphoneManager instance].frontCamId;
}
} else {
nextCamId=currentCamId;
}
return self;
}
@ -81,15 +70,26 @@
[LinphoneLogger logc:LinphoneLoggerWarning format:"Cannot tigger camswitch button: Linphone core not ready"];
return;
}
if (nextCamId != currentCamId) {
[LinphoneLogger logc:LinphoneLoggerLog format:"Switching from [%s] to [%s]", currentCamId, nextCamId];
linphone_core_set_video_device([LinphoneManager getLc], nextCamId);
nextCamId = currentCamId;
currentCamId = linphone_core_get_video_device([LinphoneManager getLc]);
LinphoneCall *call = linphone_core_get_current_call([LinphoneManager getLc]);
const char *currentCamId = (char*)linphone_core_get_video_device([LinphoneManager getLc]);
const char **cameras=linphone_core_get_video_devices([LinphoneManager getLc]);
const char *newCamId=NULL;
int i;
for (i=0;cameras[i]!=NULL;++i){
if (strcmp(cameras[i],"StaticImage: Static picture")==0) continue;
if (strcmp(cameras[i],currentCamId)!=0){
newCamId=cameras[i];
break;
}
}
if (newCamId){
[LinphoneLogger logc:LinphoneLoggerLog format:"Switching from [%s] to [%s]", currentCamId, newCamId];
linphone_core_set_video_device([LinphoneManager getLc], newCamId);
LinphoneCall *call = linphone_core_get_current_call([LinphoneManager getLc]);
if(call != NULL) {
linphone_core_update_call([LinphoneManager getLc], call, NULL);
}
}
}