You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ma...@apache.org on 2015/09/02 17:11:14 UTC
cordova-plugin-media-capture git commit: CB-9249 Fix iOS warnings in
Media Capture plugin
Repository: cordova-plugin-media-capture
Updated Branches:
refs/heads/master 3e73fce87 -> 4c85fa5f1
CB-9249 Fix iOS warnings in Media Capture plugin
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/commit/4c85fa5f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/tree/4c85fa5f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/diff/4c85fa5f
Branch: refs/heads/master
Commit: 4c85fa5f1a09d2c7e6c97edba3e13a7d8f3107f5
Parents: 3e73fce
Author: Simon MacDonald <si...@gmail.com>
Authored: Tue Sep 1 18:59:15 2015 -0400
Committer: Simon MacDonald <si...@gmail.com>
Committed: Tue Sep 1 19:24:52 2015 -0400
----------------------------------------------------------------------
src/ios/CDVCapture.m | 52 +++++++++++++++++++++++++++++++----------------
1 file changed, 34 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/4c85fa5f/src/ios/CDVCapture.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVCapture.m b/src/ios/CDVCapture.m
index c49f76c..ff37b24 100644
--- a/src/ios/CDVCapture.m
+++ b/src/ios/CDVCapture.m
@@ -544,12 +544,18 @@
@implementation CDVAudioNavigationController
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 60000
- - (NSUInteger)supportedInterfaceOrientations
- {
- // delegate to CVDAudioRecorderViewController
- return [self.topViewController supportedInterfaceOrientations];
- }
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90000
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations
+{
+ // delegate to CVDAudioRecorderViewController
+ return [self.topViewController supportedInterfaceOrientations];
+}
+#else
+- (NSUInteger)supportedInterfaceOrientations
+{
+ // delegate to CVDAudioRecorderViewController
+ return [self.topViewController supportedInterfaceOrientations];
+}
#endif
@end
@@ -709,7 +715,8 @@
NSURL* fileURL = [NSURL fileURLWithPath:filePath isDirectory:NO];
// create AVAudioPlayer
- self.avRecorder = [[AVAudioRecorder alloc] initWithURL:fileURL settings:nil error:&err];
+ NSDictionary *recordSetting = [[NSMutableDictionary alloc] init];
+ self.avRecorder = [[AVAudioRecorder alloc] initWithURL:fileURL settings:recordSetting error:&err];
if (err) {
NSLog(@"Failed to initialize AVAudioRecorder: %@\n", [err localizedDescription]);
self.avRecorder = nil;
@@ -724,15 +731,24 @@
}
}
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 60000
- - (NSUInteger)supportedInterfaceOrientations
- {
- NSUInteger orientation = UIInterfaceOrientationMaskPortrait; // must support portrait
- NSUInteger supported = [captureCommand.viewController supportedInterfaceOrientations];
-
- orientation = orientation | (supported & UIInterfaceOrientationMaskPortraitUpsideDown);
- return orientation;
- }
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90000
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations
+{
+ UIInterfaceOrientationMask orientation = UIInterfaceOrientationMaskPortrait;
+ UIInterfaceOrientationMask supported = [captureCommand.viewController supportedInterfaceOrientations];
+
+ orientation = orientation | (supported & UIInterfaceOrientationMaskPortraitUpsideDown);
+ return orientation;
+}
+#else
+- (NSUInteger)supportedInterfaceOrientations
+{
+ NSUInteger orientation = UIInterfaceOrientationMaskPortrait; // must support portrait
+ NSUInteger supported = [captureCommand.viewController supportedInterfaceOrientations];
+
+ orientation = orientation | (supported & UIInterfaceOrientationMaskPortraitUpsideDown);
+ return orientation;
+}
#endif
- (void)viewDidUnload
@@ -816,8 +832,8 @@
}
if (self.duration && self.isTimed) {
// VoiceOver announcement so user knows timed recording has finished
- BOOL isUIAccessibilityAnnouncementNotification = (&UIAccessibilityAnnouncementNotification != NULL);
- if (isUIAccessibilityAnnouncementNotification) {
+ //BOOL isUIAccessibilityAnnouncementNotification = (&UIAccessibilityAnnouncementNotification != NULL);
+ if (UIAccessibilityAnnouncementNotification) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 500ull * NSEC_PER_MSEC), dispatch_get_main_queue(), ^{
UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, PluginLocalizedString(captureCommand, @"timed recording complete", nil));
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org