From dc3f533a2d4dba881f77555e362e54523c1867ae Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 22 Nov 2011 18:27:08 +0100 Subject: [PATCH] update mic button from video view --- Classes/LinphoneUI/LinphoneManager.m | 13 +++++++++---- Classes/VideoViewController.m | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index 48515e956..edb2ddc06 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -198,7 +198,12 @@ extern void libmssilk_init(); [callDelegate displayDialerFromUI:mCurrentViewController forUser:@"" withDisplayName:@""]; - } + } else { + [callDelegate displayInCall:call + FromUI:mCurrentViewController + forUser:lUserName + withDisplayName:lDisplayName]; + } break; } case LinphoneCallEnd: @@ -208,9 +213,9 @@ extern void libmssilk_init(); withDisplayName:@""]; } else { [callDelegate displayInCall:call - FromUI:mCurrentViewController - forUser:lUserName - withDisplayName:lDisplayName]; + FromUI:mCurrentViewController + forUser:lUserName + withDisplayName:lDisplayName]; } break; default: diff --git a/Classes/VideoViewController.m b/Classes/VideoViewController.m index ca07ae499..94e7219a8 100644 --- a/Classes/VideoViewController.m +++ b/Classes/VideoViewController.m @@ -63,8 +63,8 @@ - (void)viewDidLoad { [super viewDidLoad]; - [mMute initWithOnImage:[UIImage imageNamed:@"mic_muted.png"] offImage:[UIImage imageNamed:@"mic_active.png"] ]; - [mMuteLand initWithOnImage:[UIImage imageNamed:@"mic_muted.png"] offImage:[UIImage imageNamed:@"mic_active.png"] ]; + [mMute initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"] offImage:[UIImage imageNamed:@"micro.png"] ]; + [mMuteLand initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"] offImage:[UIImage imageNamed:@"micro.png"] ]; [mCamSwitch setPreview:mPreview]; [mCamSwitchLand setPreview:mPreviewLand]; isFirst=TRUE;