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

Fixes for ipad transfer and video rotation

Browse source
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2012-04-04 12:01:29 +02:00
parent c7193ec514
commit 89c039935b
4 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Classes/InCallViewController-ipad.xib
View file

@ -180,7 +180,6 @@
<string key="NSFrame">{{0, 1}, {320, 66}}</string>
<reference key="NSSuperview" ref="677109388"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAwIDAuMDgyMzIwMjU5MDQgMC4xOAA</bytes>
@ -373,16 +372,16 @@
<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="275823755"/>
<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="90138757">
<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="594382055">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">clavier-01-160px.png</string>
</object>
<reference key="IBUIFontDescription" ref="995447773"/>
<reference key="IBUIFont" ref="588625926"/>
</object>
<object class="IBUIButton" id="217295040">
<object class="IBUIButton" id="270376652">
<reference key="NSNextResponder" ref="331380355"/>
<int key="NSvFlags">-2147483356</int>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{160, 70}, {80, 66}}</string>
<reference key="NSSuperview" ref="331380355"/>
<reference key="NSWindow"/>
@ -401,7 +400,7 @@
<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="275823755"/>
<reference key="IBUINormalBackgroundImage" ref="90138757"/>
<reference key="IBUINormalBackgroundImage" ref="594382055"/>
<reference key="IBUIFontDescription" ref="995447773"/>
<reference key="IBUIFont" ref="588625926"/>
</object>
@ -481,7 +480,7 @@
<string key="NSFrame">{{80, 70}, {80, 66}}</string>
<reference key="NSSuperview" ref="331380355"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="217295040"/>
<reference key="NSNextKeyView" ref="270376652"/>
<reference key="IBUIBackgroundColor" ref="379880382"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1128,7 +1127,7 @@
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">transfer</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="217295040"/>
<reference key="destination" ref="270376652"/>
</object>
<int key="connectionID">170</int>
</object>
@ -1248,7 +1247,7 @@
<reference ref="1070839124"/>
<reference ref="43602080"/>
<reference ref="887651058"/>
<reference ref="217295040"/>
<reference ref="270376652"/>
</array>
<reference key="parent" ref="134115264"/>
<string key="objectName">controls</string>
@ -1449,7 +1448,7 @@
</object>
<object class="IBObjectRecord">
<int key="objectID">169</int>
<reference key="object" ref="217295040"/>
<reference key="object" ref="270376652"/>
<reference key="parent" ref="331380355"/>
<string key="objectName">transfer</string>
</object>

7
Classes/IncallViewController.m
View file

@ -464,7 +464,7 @@ void addAnimationFadeTransition(UIView* view, float duration) {
NSString* title = NSLocalizedString(@"Transfer call to:",nil);
visibleActionSheet = [[UIActionSheet alloc] initWithTitle:title
delegate:cd
cancelButtonTitle:NSLocalizedString(@"Cancel",nil)
cancelButtonTitle:[LinphoneManager runningOnIpad] ? nil : NSLocalizedString(@"Cancel",nil)
destructiveButtonTitle:NSLocalizedString(@"A new call",nil)
otherButtonTitles:nil];
@ -484,7 +484,10 @@ void addAnimationFadeTransition(UIView* view, float duration) {
}
visibleActionSheet.actionSheetStyle = UIActionSheetStyleDefault;
[visibleActionSheet showInView:self.view];
if ([LinphoneManager runningOnIpad])
[visibleActionSheet showFromRect:transfer.bounds inView:transfer animated:NO];
else
[visibleActionSheet showInView:self.view];
}
-(void) addCallPressed {

4
Classes/MainScreenWithVideoPreview.m
View file

@ -93,6 +93,10 @@
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc]init];
NSArray* array = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
if ( [array count] == 0) {
ms_warning("No camera available (running on simulator ?");
return;
}
currentCamera = camIndex % [array count];
AVCaptureDevice* device = (AVCaptureDevice*) [array objectAtIndex:currentCamera];
input = [[AVCaptureDeviceInput deviceInputWithDevice:device

1
linphonerc-ipad
View file

@ -44,4 +44,5 @@ capture=1
show_local=0
enabled=1
size=vga
display_filter_auto_rotate=1