witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Restore 'switch' camera feature

Browse source
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2012-03-14 17:40:25 +01:00
parent d30ce42682
commit 47bd00bde7
6 changed files with 566 additions and 493 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

167
Classes/InCallViewController-ipad.xib
View file

@ -39,33 +39,9 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUITableView" id="447519759">
<reference key="NSNextResponder" ref="134115264"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{768, 805}</string>
<reference key="NSSuperview" ref="134115264"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="352407616"/>
<string key="NSReuseIdentifierKey">_NS:408</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MSAwAA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace" id="535615360">
<int key="NSID">2</int>
</object>
</object>
<bool key="IBUIClipsSubviews">YES</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<bool key="IBUIAlwaysBounceVertical">YES</bool>
<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
<float key="IBUIRowHeight">80</float>
<float key="IBUISectionHeaderHeight">22</float>
<float key="IBUISectionFooterHeight">22</float>
</object>
<object class="IBUIView" id="352407616">
<reference key="NSNextResponder" ref="134115264"/>
<int key="NSvFlags">-2147483374</int>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="166693649">
<reference key="NSNextResponder" ref="352407616"/>
@ -73,7 +49,7 @@
<string key="NSFrameSize">{768, 1024}</string>
<reference key="NSSuperview" ref="352407616"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="689463862"/>
<reference key="NSNextKeyView" ref="208410573"/>
<string key="NSReuseIdentifierKey">_NS:569</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@ -99,51 +75,12 @@
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<reference key="NSCustomColorSpace" ref="535615360"/>
<object class="NSColorSpace" key="NSCustomColorSpace" id="535615360">
<int key="NSID">2</int>
</object>
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<object class="IBUIButton" id="689463862">
<reference key="NSNextResponder" ref="352407616"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{0, 962}, {108, 62}}</string>
<reference key="NSSuperview" ref="352407616"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="208410573"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<int key="IBUIButtonType">1</int>
<string key="IBUINormalTitle">switch</string>
<object class="NSColor" key="IBUIHighlightedTitleColor" id="912196478">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor" id="275823755">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">clavier-01-108px.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="42405739">
<string key="name">Helvetica-Bold</string>
<string key="family">Helvetica</string>
<int key="traits">2</int>
<double key="pointSize">15</double>
</object>
<object class="NSFont" key="IBUIFont" id="905592210">
<string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double>
<int key="NSfFlags">16</int>
</object>
</object>
</array>
<string key="NSFrameSize">{768, 1024}</string>
<reference key="NSSuperview" ref="134115264"/>
@ -156,6 +93,69 @@
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<object class="IBUIButton" id="689463862">
<reference key="NSNextResponder" ref="134115264"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{224, 740}, {320, 66}}</string>
<reference key="NSSuperview" ref="134115264"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="331380355"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<int key="IBUIButtonType">1</int>
<string key="IBUINormalTitle">Change camera</string>
<object class="NSColor" key="IBUIHighlightedTitleColor" id="912196478">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor" id="275823755">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">clavier-01-108px.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="42405739">
<string key="name">Helvetica-Bold</string>
<string key="family">Helvetica</string>
<int key="traits">2</int>
<double key="pointSize">15</double>
</object>
<object class="NSFont" key="IBUIFont" id="905592210">
<string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double>
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUITableView" id="447519759">
<reference key="NSNextResponder" ref="134115264"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{768, 805}</string>
<reference key="NSSuperview" ref="134115264"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="352407616"/>
<string key="NSReuseIdentifierKey">_NS:408</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MSAwAA</bytes>
<reference key="NSCustomColorSpace" ref="535615360"/>
</object>
<bool key="IBUIClipsSubviews">YES</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<bool key="IBUIAlwaysBounceVertical">YES</bool>
<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
<float key="IBUIRowHeight">80</float>
<float key="IBUISectionHeaderHeight">22</float>
<float key="IBUISectionFooterHeight">22</float>
</object>
<object class="IBUIView" id="677109388">
<reference key="NSNextResponder" ref="134115264"/>
<int key="NSvFlags">292</int>
@ -475,7 +475,7 @@
<string key="NSFrame">{{119, 251}, {82, 52}}</string>
<reference key="NSSuperview" ref="815826897"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="331380355"/>
<reference key="NSNextKeyView" ref="689463862"/>
<reference key="IBUIBackgroundColor" ref="379880382"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1048,6 +1048,14 @@
</object>
<int key="connectionID">163</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">videoCameraSwitch</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="689463862"/>
</object>
<int key="connectionID">164</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">dataSource</string>
@ -1126,8 +1134,9 @@
<reference ref="815826897"/>
<reference ref="331380355"/>
<reference ref="677109388"/>
<reference ref="447519759"/>
<reference ref="352407616"/>
<reference ref="447519759"/>
<reference ref="689463862"/>
</array>
<reference key="parent" ref="903665573"/>
</object>
@ -1319,7 +1328,6 @@
<array class="NSMutableArray" key="children">
<reference ref="527054061"/>
<reference ref="166693649"/>
<reference ref="689463862"/>
<reference ref="208410573"/>
</array>
<reference key="parent" ref="134115264"/>
@ -1337,17 +1345,17 @@
<reference key="parent" ref="352407616"/>
<string key="objectName">video_view</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">154</int>
<reference key="object" ref="689463862"/>
<reference key="parent" ref="352407616"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">153</int>
<reference key="object" ref="208410573"/>
<reference key="parent" ref="352407616"/>
<string key="objectName">call_quality_video</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">154</int>
<reference key="object" ref="689463862"/>
<reference key="parent" ref="134115264"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -1416,7 +1424,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">163</int>
<int key="maxID">164</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -1462,6 +1470,7 @@
<string key="three">UIButton</string>
<string key="two">UIButton</string>
<string key="videoCallQuality">UIImageView</string>
<string key="videoCameraSwitch">UICamSwitch</string>
<string key="videoGroup">UIView</string>
<string key="videoPreview">UIView</string>
<string key="videoView">UIView</string>
@ -1577,6 +1586,10 @@
<string key="name">videoCallQuality</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo" key="videoCameraSwitch">
<string key="name">videoCameraSwitch</string>
<string key="candidateClassName">UICamSwitch</string>
</object>
<object class="IBToOneOutletInfo" key="videoGroup">
<string key="name">videoGroup</string>
<string key="candidateClassName">UIView</string>

2
Classes/IncallViewController.h
View file

@ -62,6 +62,7 @@
UIView* videoView;
UIView* videoPreview;
UIImageView* videoCallQuality;
UICamSwitch* videoCameraSwitch;
bool dismissed;
@ -131,4 +132,5 @@
@property (nonatomic, retain) IBOutlet UIView* videoView;
@property (nonatomic, retain) IBOutlet UIView* videoPreview;
@property (nonatomic, retain) IBOutlet UIImageView* videoCallQuality;
@property (nonatomic, retain) IBOutlet UICamSwitch* videoCameraSwitch;
@end

9
Classes/IncallViewController.m
View file

@ -71,6 +71,7 @@ const NSInteger SECURE_BUTTON_TAG=5;
@synthesize videoView;
@synthesize videoPreview;
@synthesize videoCallQuality;
@synthesize videoCameraSwitch;
@synthesize addVideo;
@ -183,6 +184,10 @@ void addAnimationFadeTransition(UIView* view, float duration) {
[UIView setAnimationDuration:0.3];
[controlSubView setAlpha:1.0];
[hangUpView setAlpha:1.0];
if ([LinphoneManager instance].frontCamId !=nil ) {
// only show camera switch button if we have more than 1 camera
[videoCameraSwitch setAlpha:1.0];
}
[UIView commitAnimations];
// hide controls in 5 sec
@ -194,6 +199,7 @@ void addAnimationFadeTransition(UIView* view, float duration) {
[UIView setAnimationDuration:0.3];
[controlSubView setAlpha:0.0];
[hangUpView setAlpha:0.0];
[videoCameraSwitch setAlpha:0.0];
[UIView commitAnimations];
hideControlsTimer = nil;
@ -232,6 +238,7 @@ void addAnimationFadeTransition(UIView* view, float duration) {
[controlSubView setAlpha:1.0];
[hangUpView setAlpha:1.0];
[callTableView setAlpha:1.0];
[videoCameraSwitch setAlpha:0.0];
[UIView commitAnimations];
if (hideControlsTimer != nil) {
@ -376,7 +383,7 @@ void addAnimationFadeTransition(UIView* view, float duration) {
[[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orientationChanged:) name:UIDeviceOrientationDidChangeNotification object:nil];
[videoCameraSwitch setPreview:videoPreview];
}
-(void) addCallPressed {

877
Classes/IncallViewController.xib
View file

File diff suppressed because it is too large Load diff

2
Classes/LinphoneUI/UICamSwitch.m
View file

@ -25,7 +25,7 @@
@synthesize preview;
-(void) touchUp:(id) sender {
if (nextCamId!=currentCamId) {
ms_message("Swithcing from [%s] to [%s]",currentCamId,nextCamId);
ms_message("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]);

2
submodules/linphone

@ -1 +1 @@
Subproject commit 933c931a0cd928e74bece7807099f38583d42a3c
Subproject commit 058d6b2972138f8d2b3eb945fca19980544a1f12