forked from mirrors/linphone-iphone
VideoViewController not used anymore
This commit is contained in:
Pierre-Eric Pelloux-Prayer
parent
cdc7c80a6a
commit
af92b0a7e0
4 changed files with 269 additions and 69 deletions
|
|
@ -58,6 +58,10 @@
|
|||
UIDigitButton* hash;
|
||||
UIButton* close;
|
||||
|
||||
UIView* videoGroup;
|
||||
UIView* videoView;
|
||||
UIView* videoPreview;
|
||||
|
||||
bool dismissed;
|
||||
|
||||
NSTimer *durationRefreasher;
|
||||
|
|
@ -79,6 +83,8 @@
|
|||
UIImage* verified, *unverified;
|
||||
UIImage* stat_sys_signal_0, *stat_sys_signal_1, *stat_sys_signal_2, *stat_sys_signal_3, *stat_sys_signal_4;
|
||||
UIActionSheet* zrtpVerificationSheet;
|
||||
|
||||
NSTimer* hideControlsTimer;
|
||||
}
|
||||
|
||||
+ (UIImage*) stat_sys_signal_0;
|
||||
|
|
@ -124,4 +130,8 @@
|
|||
@property (nonatomic, retain) IBOutlet UIButton* hash;
|
||||
@property (nonatomic, retain) IBOutlet UIButton* close;
|
||||
@property (nonatomic, retain) IBOutlet VideoViewController* videoViewController;
|
||||
|
||||
@property (nonatomic, retain) IBOutlet UIView* videoGroup;
|
||||
@property (nonatomic, retain) IBOutlet UIView* videoView;
|
||||
@property (nonatomic, retain) IBOutlet UIView* videoPreview;
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -24,6 +24,10 @@
|
|||
#include "LinphoneManager.h"
|
||||
#include "private.h"
|
||||
#import "ContactPickerDelegate.h"
|
||||
#import <QuartzCore/CAAnimation.h>
|
||||
#import <QuartzCore/QuartzCore.h>
|
||||
#import <OpenGLES/EAGL.h>
|
||||
#import <OpenGLES/EAGLDrawable.h>
|
||||
|
||||
#define STRINGIFY(x) #x
|
||||
#define TOSTRING(x) STRINGIFY(x)
|
||||
|
|
@ -63,6 +67,10 @@ const NSInteger SECURE_BUTTON_TAG=5;
|
|||
@synthesize hash;
|
||||
@synthesize videoViewController;
|
||||
|
||||
@synthesize videoGroup;
|
||||
@synthesize videoView;
|
||||
@synthesize videoPreview;
|
||||
|
||||
@synthesize addVideo;
|
||||
|
||||
|
||||
|
|
@ -105,6 +113,76 @@ int callCount(LinphoneCore* lc) {
|
|||
return count;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void addAnimationFadeTransition(UIView* view, float duration) {
|
||||
CATransition* animation = [CATransition animation];
|
||||
animation.type = kCATransitionFromBottom; // kCATransitionFade;
|
||||
animation.duration = duration;
|
||||
[view.layer addAnimation:animation forKey:nil];
|
||||
}
|
||||
|
||||
-(void) showControls:(id)sender {
|
||||
if (hideControlsTimer) {
|
||||
[hideControlsTimer invalidate];
|
||||
hideControlsTimer = nil;
|
||||
}
|
||||
// show controls
|
||||
addAnimationFadeTransition(controlSubView, 0.2);
|
||||
controlSubView.hidden = FALSE;
|
||||
|
||||
addAnimationFadeTransition(hangUpView, 0.2);
|
||||
hangUpView.hidden = FALSE;
|
||||
|
||||
// hide controls in 5 sec
|
||||
hideControlsTimer = [NSTimer scheduledTimerWithTimeInterval:5.0 target:self selector:@selector(hideControls:) userInfo:nil repeats:NO];
|
||||
}
|
||||
|
||||
-(void) hideControls:(id)sender {
|
||||
addAnimationFadeTransition(controlSubView, 0.4);
|
||||
controlSubView.hidden = TRUE;
|
||||
addAnimationFadeTransition(hangUpView, 0.4);
|
||||
hangUpView.hidden = TRUE;
|
||||
|
||||
hideControlsTimer = nil;
|
||||
}
|
||||
|
||||
-(void) enableVideoDisplay {
|
||||
[videoGroup setHidden:FALSE];
|
||||
[controlSubView setHidden:TRUE];
|
||||
[hangUpView setHidden:TRUE];
|
||||
[callTableView setHidden:TRUE];
|
||||
|
||||
linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)videoView);
|
||||
linphone_core_set_native_preview_window_id([LinphoneManager getLc],(unsigned long)videoPreview);
|
||||
linphone_core_set_device_rotation([LinphoneManager getLc], 0);
|
||||
|
||||
[[UIApplication sharedApplication] setStatusBarHidden:YES withAnimation:UIStatusBarAnimationSlide];
|
||||
|
||||
static bool done = false;
|
||||
if (!done) {
|
||||
NSLog(@"old center: %f %f", videoView.center.x, videoView.center.y);
|
||||
videoView.center = CGPointMake(videoView.center.x, videoView.center.y + (self.view.frame.size.height - videoView.window.frame.size.height));
|
||||
NSLog(@"new center: %f %f", videoView.center.x, videoView.center.y);
|
||||
done = true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
-(void) disableVideoDisplay {
|
||||
[videoGroup setHidden:TRUE];
|
||||
[controlSubView setHidden:FALSE];
|
||||
[hangUpView setHidden:FALSE];
|
||||
[callTableView setHidden:FALSE];
|
||||
|
||||
if (hideControlsTimer != nil) {
|
||||
[hideControlsTimer invalidate];
|
||||
hideControlsTimer = nil;
|
||||
}
|
||||
|
||||
[[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationNone];
|
||||
}
|
||||
|
||||
-(void) updateUIFromLinphoneState:(UIViewController *)viewCtrl {
|
||||
activeCallCell = nil;
|
||||
[mute reset];
|
||||
|
|
@ -201,6 +279,10 @@ int callCount(LinphoneCore* lc) {
|
|||
|
||||
}
|
||||
|
||||
UITapGestureRecognizer* singleFingerTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(showControls:)];
|
||||
[videoGroup addGestureRecognizer:singleFingerTap];
|
||||
[singleFingerTap release];
|
||||
|
||||
mVideoShown=FALSE;
|
||||
mIncallViewIsReady=FALSE;
|
||||
mVideoIsPending=FALSE;
|
||||
|
|
@ -208,6 +290,10 @@ int callCount(LinphoneCore* lc) {
|
|||
|
||||
callTableView.rowHeight = 80;
|
||||
|
||||
[[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orientationChanged:) name:UIDeviceOrientationDidChangeNotification object:nil];
|
||||
|
||||
|
||||
}
|
||||
|
||||
-(void) addCallPressed {
|
||||
|
|
@ -231,6 +317,9 @@ int callCount(LinphoneCore* lc) {
|
|||
if (linphone_call_get_state(currentCall) == LinphoneCallStreamsRunning) {
|
||||
[pause setSelected:NO];
|
||||
linphone_core_pause_call(lc, currentCall);
|
||||
|
||||
// hide video view
|
||||
[self disableVideoDisplay];
|
||||
}
|
||||
} else {
|
||||
if (linphone_core_get_calls_nb(lc) == 1) {
|
||||
|
|
@ -238,6 +327,11 @@ int callCount(LinphoneCore* lc) {
|
|||
if (linphone_call_get_state(c) == LinphoneCallPaused) {
|
||||
linphone_core_resume_call(lc, c);
|
||||
[pause setSelected:YES];
|
||||
|
||||
const LinphoneCallParams* p = linphone_call_get_current_params(c);
|
||||
if (linphone_call_params_video_enabled(p)) {
|
||||
[self enableVideoDisplay];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -248,7 +342,32 @@ int callCount(LinphoneCore* lc) {
|
|||
[self updateUIFromLinphoneState: nil];
|
||||
}
|
||||
|
||||
-(void) viewWillAppear:(BOOL)animated {}
|
||||
-(void) orientationChanged: (NSNotification*) notif {
|
||||
int oldLinphoneOrientation = linphone_core_get_device_rotation([LinphoneManager getLc]);
|
||||
UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;
|
||||
switch (orientation) {
|
||||
case UIInterfaceOrientationPortrait:
|
||||
linphone_core_set_device_rotation([LinphoneManager getLc], 0);
|
||||
break;
|
||||
case UIInterfaceOrientationLandscapeRight:
|
||||
linphone_core_set_device_rotation([LinphoneManager getLc], 270);
|
||||
break;
|
||||
case UIInterfaceOrientationLandscapeLeft:
|
||||
linphone_core_set_device_rotation([LinphoneManager getLc], 90);
|
||||
break;
|
||||
}
|
||||
if ((oldLinphoneOrientation != linphone_core_get_device_rotation([LinphoneManager getLc]))
|
||||
&& linphone_core_get_current_call([LinphoneManager getLc])) {
|
||||
linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)videoView);
|
||||
//Orientation has change, must call update call
|
||||
linphone_core_update_call([LinphoneManager getLc], linphone_core_get_current_call([LinphoneManager getLc]), NULL);
|
||||
}
|
||||
}
|
||||
|
||||
-(void) awakeFromNib
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
-(void)viewDidAppear:(BOOL)animated {
|
||||
[[UIApplication sharedApplication] setIdleTimerDisabled:YES];
|
||||
|
|
@ -319,13 +438,14 @@ int callCount(LinphoneCore* lc) {
|
|||
}
|
||||
|
||||
-(void) displayPad:(bool) enable {
|
||||
[LinphoneManager set:callTableView hidden:enable withName:"CALL_TABLE view" andReason:AT];
|
||||
if (videoView.hidden)
|
||||
[LinphoneManager set:callTableView hidden:enable withName:"CALL_TABLE view" andReason:AT];
|
||||
[LinphoneManager set:hangUpView hidden:enable withName:"HANG_UP view" andReason:AT];
|
||||
[LinphoneManager set:controlSubView hidden:enable withName:"CONTROL view" andReason:AT];
|
||||
[LinphoneManager set:padSubView hidden:!enable withName:"PAD view" andReason:AT];
|
||||
}
|
||||
-(void) displayCall:(LinphoneCall*) call InProgressFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
|
||||
//restaure view
|
||||
//restore view
|
||||
[self displayPad:false];
|
||||
dismissed = false;
|
||||
UIDevice *device = [UIDevice currentDevice];
|
||||
|
|
@ -352,11 +472,14 @@ int callCount(LinphoneCore* lc) {
|
|||
if ([speaker isOn]) [speaker toggle];
|
||||
}
|
||||
[self updateUIFromLinphoneState: nil];
|
||||
if (self.presentedViewController == (UIViewController*)mVideoViewController) {
|
||||
|
||||
[self disableVideoDisplay];
|
||||
/*if (self.presentedViewController == (UIViewController*)mVideoViewController) {
|
||||
[self dismissVideoView];
|
||||
}
|
||||
}*/
|
||||
}
|
||||
-(void) displayDialerFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
|
||||
[self disableVideoDisplay];
|
||||
UIViewController* modalVC = self.modalViewController;
|
||||
UIDevice *device = [UIDevice currentDevice];
|
||||
device.proximityMonitoringEnabled = NO;
|
||||
|
|
@ -377,6 +500,10 @@ int callCount(LinphoneCore* lc) {
|
|||
[self updateUIFromLinphoneState: nil];
|
||||
}
|
||||
-(void) displayVideoCall:(LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
|
||||
|
||||
[self enableVideoDisplay];
|
||||
return;
|
||||
|
||||
if (mIncallViewIsReady) {
|
||||
[[UIApplication sharedApplication] setStatusBarHidden:YES withAnimation:UIStatusBarAnimationNone];
|
||||
mVideoShown=TRUE;
|
||||
|
|
|
|||
|
|
@ -42,6 +42,51 @@
|
|||
<int key="NSvFlags">274</int>
|
||||
<object class="NSMutableArray" key="NSSubviews">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBUIView" id="1009068048">
|
||||
<reference key="NSNextResponder" ref="858247959"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<object class="NSMutableArray" key="NSSubviews">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBUIView" id="1017044170">
|
||||
<reference key="NSNextResponder" ref="1009068048"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrameSize">{320, 480}</string>
|
||||
<reference key="NSSuperview" ref="1009068048"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="673568144"/>
|
||||
<string key="NSReuseIdentifierKey">_NS:196</string>
|
||||
<object class="NSColor" key="IBUIBackgroundColor" id="95762599">
|
||||
<int key="NSColorSpace">3</int>
|
||||
<bytes key="NSWhite">MCAwAA</bytes>
|
||||
</object>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
</object>
|
||||
<object class="IBUIView" id="673568144">
|
||||
<reference key="NSNextResponder" ref="1009068048"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{240, 354}, {80, 106}}</string>
|
||||
<reference key="NSSuperview" ref="1009068048"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="662692377"/>
|
||||
<object class="NSColor" key="IBUIBackgroundColor">
|
||||
<int key="NSColorSpace">3</int>
|
||||
<bytes key="NSWhite">MQA</bytes>
|
||||
<object class="NSColorSpace" key="NSCustomColorSpace">
|
||||
<int key="NSID">2</int>
|
||||
</object>
|
||||
</object>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
</object>
|
||||
</object>
|
||||
<string key="NSFrameSize">{320, 460}</string>
|
||||
<reference key="NSSuperview" ref="858247959"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="1017044170"/>
|
||||
<string key="NSReuseIdentifierKey">_NS:196</string>
|
||||
<reference key="IBUIBackgroundColor" ref="95762599"/>
|
||||
<bool key="IBUIAutoresizesSubviews">NO</bool>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
</object>
|
||||
<object class="IBUITableView" id="662692377">
|
||||
<reference key="NSNextResponder" ref="858247959"/>
|
||||
<int key="NSvFlags">274</int>
|
||||
|
|
@ -50,10 +95,7 @@
|
|||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="759087764"/>
|
||||
<string key="NSReuseIdentifierKey">_NS:418</string>
|
||||
<object class="NSColor" key="IBUIBackgroundColor" id="95762599">
|
||||
<int key="NSColorSpace">3</int>
|
||||
<bytes key="NSWhite">MCAwAA</bytes>
|
||||
</object>
|
||||
<reference key="IBUIBackgroundColor" ref="95762599"/>
|
||||
<bool key="IBUIClipsSubviews">YES</bool>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<bool key="IBUIAlwaysBounceVertical">YES</bool>
|
||||
|
|
@ -707,7 +749,7 @@
|
|||
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
|
||||
<reference key="NSSuperview"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="662692377"/>
|
||||
<reference key="NSNextKeyView" ref="1009068048"/>
|
||||
<reference key="IBUIBackgroundColor" ref="392721472"/>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
|
|
@ -940,6 +982,30 @@
|
|||
</object>
|
||||
<int key="connectionID">125</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">videoGroup</string>
|
||||
<reference key="source" ref="841351856"/>
|
||||
<reference key="destination" ref="1009068048"/>
|
||||
</object>
|
||||
<int key="connectionID">129</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">videoPreview</string>
|
||||
<reference key="source" ref="841351856"/>
|
||||
<reference key="destination" ref="673568144"/>
|
||||
</object>
|
||||
<int key="connectionID">130</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">videoView</string>
|
||||
<reference key="source" ref="841351856"/>
|
||||
<reference key="destination" ref="1017044170"/>
|
||||
</object>
|
||||
<int key="connectionID">133</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchEventConnection" key="connection">
|
||||
<string key="label">doAction:</string>
|
||||
|
|
@ -1024,6 +1090,7 @@
|
|||
<reference ref="759087764"/>
|
||||
<reference ref="662692377"/>
|
||||
<reference ref="585669622"/>
|
||||
<reference ref="1009068048"/>
|
||||
</object>
|
||||
<reference key="parent" ref="981679694"/>
|
||||
</object>
|
||||
|
|
@ -1035,6 +1102,7 @@
|
|||
<reference ref="953411930"/>
|
||||
</object>
|
||||
<reference key="parent" ref="858247959"/>
|
||||
<string key="objectName">hangupview</string>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">18</int>
|
||||
|
|
@ -1212,6 +1280,29 @@
|
|||
<reference key="parent" ref="585669622"/>
|
||||
<string key="objectName">video</string>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">126</int>
|
||||
<reference key="object" ref="1009068048"/>
|
||||
<object class="NSMutableArray" key="children">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<reference ref="673568144"/>
|
||||
<reference ref="1017044170"/>
|
||||
</object>
|
||||
<reference key="parent" ref="858247959"/>
|
||||
<string key="objectName">video</string>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">127</int>
|
||||
<reference key="object" ref="673568144"/>
|
||||
<reference key="parent" ref="1009068048"/>
|
||||
<string key="objectName">preview</string>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">132</int>
|
||||
<reference key="object" ref="1017044170"/>
|
||||
<reference key="parent" ref="1009068048"/>
|
||||
<string key="objectName">display</string>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="flattenedProperties">
|
||||
|
|
@ -1232,9 +1323,12 @@
|
|||
<string>120.IBPluginDependency</string>
|
||||
<string>123.CustomClassName</string>
|
||||
<string>123.IBPluginDependency</string>
|
||||
<string>126.IBPluginDependency</string>
|
||||
<string>127.IBPluginDependency</string>
|
||||
<string>13.CustomClassName</string>
|
||||
<string>13.IBPluginDependency</string>
|
||||
<string>13.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
|
||||
<string>132.IBPluginDependency</string>
|
||||
<string>15.IBPluginDependency</string>
|
||||
<string>16.CustomClassName</string>
|
||||
<string>16.IBPluginDependency</string>
|
||||
|
|
@ -1289,10 +1383,13 @@
|
|||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>UIAddVideoButton</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>UISpeakerButton</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<real value="1"/>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>UIMuteButton</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<real value="2"/>
|
||||
|
|
@ -1343,7 +1440,7 @@
|
|||
<reference key="dict.values" ref="0"/>
|
||||
</object>
|
||||
<nil key="sourceID"/>
|
||||
<int key="maxID">125</int>
|
||||
<int key="maxID">133</int>
|
||||
</object>
|
||||
<object class="IBClassDescriber" key="IBDocument.Classes">
|
||||
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
|
||||
|
|
@ -1367,9 +1464,7 @@
|
|||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>addCall</string>
|
||||
<string>addToConf</string>
|
||||
<string>addVideo</string>
|
||||
<string>callControlSubView</string>
|
||||
<string>callTableView</string>
|
||||
<string>close</string>
|
||||
<string>conferenceDetail</string>
|
||||
|
|
@ -1394,6 +1489,9 @@
|
|||
<string>star</string>
|
||||
<string>three</string>
|
||||
<string>two</string>
|
||||
<string>videoGroup</string>
|
||||
<string>videoPreview</string>
|
||||
<string>videoView</string>
|
||||
<string>videoViewController</string>
|
||||
<string>zero</string>
|
||||
</object>
|
||||
|
|
@ -1401,8 +1499,6 @@
|
|||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>UIButton</string>
|
||||
<string>UIButton</string>
|
||||
<string>UIButton</string>
|
||||
<string>UIView</string>
|
||||
<string>UITableView</string>
|
||||
<string>UIButton</string>
|
||||
<string>UIViewController</string>
|
||||
|
|
@ -1427,6 +1523,9 @@
|
|||
<string>UIButton</string>
|
||||
<string>UIButton</string>
|
||||
<string>UIButton</string>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
<string>VideoViewController</string>
|
||||
<string>UIButton</string>
|
||||
</object>
|
||||
|
|
@ -1436,9 +1535,7 @@
|
|||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>addCall</string>
|
||||
<string>addToConf</string>
|
||||
<string>addVideo</string>
|
||||
<string>callControlSubView</string>
|
||||
<string>callTableView</string>
|
||||
<string>close</string>
|
||||
<string>conferenceDetail</string>
|
||||
|
|
@ -1463,6 +1560,9 @@
|
|||
<string>star</string>
|
||||
<string>three</string>
|
||||
<string>two</string>
|
||||
<string>videoGroup</string>
|
||||
<string>videoPreview</string>
|
||||
<string>videoView</string>
|
||||
<string>videoViewController</string>
|
||||
<string>zero</string>
|
||||
</object>
|
||||
|
|
@ -1472,18 +1572,10 @@
|
|||
<string key="name">addCall</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">addToConf</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">addVideo</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">callControlSubView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">callTableView</string>
|
||||
<string key="candidateClassName">UITableView</string>
|
||||
|
|
@ -1580,6 +1672,18 @@
|
|||
<string key="name">two</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">videoGroup</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">videoPreview</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">videoView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">videoViewController</string>
|
||||
<string key="candidateClassName">VideoViewController</string>
|
||||
|
|
@ -1673,27 +1777,21 @@
|
|||
<string>mCallQualityLandLeft</string>
|
||||
<string>mCallQualityLandRight</string>
|
||||
<string>mCamSwitch</string>
|
||||
<string>mCamSwitchLand</string>
|
||||
<string>mCamSwitchLandLeft</string>
|
||||
<string>mCamSwitchLandRight</string>
|
||||
<string>mDisplay</string>
|
||||
<string>mDisplayLand</string>
|
||||
<string>mDisplayLandLeft</string>
|
||||
<string>mDisplayLandRight</string>
|
||||
<string>mHangUp</string>
|
||||
<string>mHangUpLand</string>
|
||||
<string>mHangUpLandLeft</string>
|
||||
<string>mHangUpLandRight</string>
|
||||
<string>mLandscape</string>
|
||||
<string>mLandscapeLeft</string>
|
||||
<string>mLandscapeRight</string>
|
||||
<string>mMute</string>
|
||||
<string>mMuteLand</string>
|
||||
<string>mMuteLandLeft</string>
|
||||
<string>mMuteLandRight</string>
|
||||
<string>mPortrait</string>
|
||||
<string>mPreview</string>
|
||||
<string>mPreviewLand</string>
|
||||
<string>mPreviewLandLeft</string>
|
||||
<string>mPreviewLandRight</string>
|
||||
</object>
|
||||
|
|
@ -1705,23 +1803,17 @@
|
|||
<string>UICamSwitch</string>
|
||||
<string>UICamSwitch</string>
|
||||
<string>UICamSwitch</string>
|
||||
<string>UICamSwitch</string>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
<string>UIHangUpButton</string>
|
||||
<string>UIHangUpButton</string>
|
||||
<string>UIHangUpButton</string>
|
||||
<string>UIHangUpButton</string>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
<string>UIMuteButton</string>
|
||||
<string>UIMuteButton</string>
|
||||
<string>UIMuteButton</string>
|
||||
<string>UIMuteButton</string>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
|
|
@ -1736,27 +1828,21 @@
|
|||
<string>mCallQualityLandLeft</string>
|
||||
<string>mCallQualityLandRight</string>
|
||||
<string>mCamSwitch</string>
|
||||
<string>mCamSwitchLand</string>
|
||||
<string>mCamSwitchLandLeft</string>
|
||||
<string>mCamSwitchLandRight</string>
|
||||
<string>mDisplay</string>
|
||||
<string>mDisplayLand</string>
|
||||
<string>mDisplayLandLeft</string>
|
||||
<string>mDisplayLandRight</string>
|
||||
<string>mHangUp</string>
|
||||
<string>mHangUpLand</string>
|
||||
<string>mHangUpLandLeft</string>
|
||||
<string>mHangUpLandRight</string>
|
||||
<string>mLandscape</string>
|
||||
<string>mLandscapeLeft</string>
|
||||
<string>mLandscapeRight</string>
|
||||
<string>mMute</string>
|
||||
<string>mMuteLand</string>
|
||||
<string>mMuteLandLeft</string>
|
||||
<string>mMuteLandRight</string>
|
||||
<string>mPortrait</string>
|
||||
<string>mPreview</string>
|
||||
<string>mPreviewLand</string>
|
||||
<string>mPreviewLandLeft</string>
|
||||
<string>mPreviewLandRight</string>
|
||||
</object>
|
||||
|
|
@ -1778,10 +1864,6 @@
|
|||
<string key="name">mCamSwitch</string>
|
||||
<string key="candidateClassName">UICamSwitch</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">mCamSwitchLand</string>
|
||||
<string key="candidateClassName">UICamSwitch</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">mCamSwitchLandLeft</string>
|
||||
<string key="candidateClassName">UICamSwitch</string>
|
||||
|
|
@ -1794,10 +1876,6 @@
|
|||
<string key="name">mDisplay</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">mDisplayLand</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">mDisplayLandLeft</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
|
|
@ -1810,10 +1888,6 @@
|
|||
<string key="name">mHangUp</string>
|
||||
<string key="candidateClassName">UIHangUpButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">mHangUpLand</string>
|
||||
<string key="candidateClassName">UIHangUpButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">mHangUpLandLeft</string>
|
||||
<string key="candidateClassName">UIHangUpButton</string>
|
||||
|
|
@ -1822,10 +1896,6 @@
|
|||
<string key="name">mHangUpLandRight</string>
|
||||
<string key="candidateClassName">UIHangUpButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">mLandscape</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">mLandscapeLeft</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
|
|
@ -1838,10 +1908,6 @@
|
|||
<string key="name">mMute</string>
|
||||
<string key="candidateClassName">UIMuteButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">mMuteLand</string>
|
||||
<string key="candidateClassName">UIMuteButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">mMuteLandLeft</string>
|
||||
<string key="candidateClassName">UIMuteButton</string>
|
||||
|
|
@ -1858,10 +1924,6 @@
|
|||
<string key="name">mPreview</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">mPreviewLand</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">mPreviewLandLeft</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
#include "LinphoneManager.h"
|
||||
#include "linphonecore.h"
|
||||
|
||||
#if __clang__ && TARGET_OS_IPHONE
|
||||
#if __clang__ && __arm__
|
||||
extern int __divsi3(int a, int b);
|
||||
int __aeabi_idiv(int a, int b) {
|
||||
return __divsi3(a,b);
|
||||
|
|
@ -116,7 +116,8 @@ int __aeabi_idiv(int a, int b) {
|
|||
#endif
|
||||
#ifdef HAVE_G729
|
||||
@"YES",@"g729_preference", // enable amr by default if compiled with
|
||||
#endif @"NO",@"debugenable_preference",
|
||||
#endif
|
||||
@"NO",@"debugenable_preference",
|
||||
//@"+33",@"countrycode_preference",
|
||||
nil];
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue