' +
'
';
@@ -91,7 +89,7 @@ function CameraUI() {
* @param {Function} successCB Success callback, that accepts data URL of captured image
* @param {Function} errorCB Error callback
*/
-CameraUI.prototype.startPreview = function(count, successCB, errorCB) {
+CameraUI.prototype.startPreview = function (count, successCB, errorCB) {
var that = this;
this.preview.onclick = function (e) {
@@ -114,15 +112,19 @@ CameraUI.prototype.startPreview = function(count, successCB, errorCB) {
errorCB(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES));
};
- navigator.getUserMedia({video: true}, function (previewStream) {
- // Save video stream to be able to stop it later
- that._previewStream = previewStream;
- that.preview.src = URL.createObjectURL(previewStream);
- // We don't need to set visibility = true for preview element
- // since this will be done automatically in onplay event handler
- }, function (/*err*/) {
- errorCB(new CaptureError(CaptureError.CAPTURE_INTERNAL_ERR));
- });
+ navigator.getUserMedia(
+ { video: true },
+ function (previewStream) {
+ // Save video stream to be able to stop it later
+ that._previewStream = previewStream;
+ that.preview.src = URL.createObjectURL(previewStream); // eslint-disable-line no-undef
+ // We don't need to set visibility = true for preview element
+ // since this will be done automatically in onplay event handler
+ },
+ function (/* err */) {
+ errorCB(new CaptureError(CaptureError.CAPTURE_INTERNAL_ERR));
+ }
+ );
};
/**
@@ -138,22 +140,20 @@ CameraUI.prototype.destroyPreview = function () {
}
};
-
module.exports = {
- captureAudio:function(successCallback, errorCallback) {
+ captureAudio: function (successCallback, errorCallback) {
if (errorCallback) {
errorCallback(new CaptureError(CaptureError.CAPTURE_NOT_SUPPORTED));
}
},
- captureVideo:function (successCallback, errorCallback) {
+ captureVideo: function (successCallback, errorCallback) {
if (errorCallback) {
errorCallback(new CaptureError(CaptureError.CAPTURE_NOT_SUPPORTED));
}
},
- captureImage:function (successCallback, errorCallback, args) {
-
+ captureImage: function (successCallback, errorCallback, args) {
var fail = function (code) {
if (errorCallback) {
errorCallback(new CaptureError(code || CaptureError.CAPTURE_INTERNAL_ERR));
@@ -171,10 +171,8 @@ module.exports = {
// Counter for already taken images
var imagesTaken = 0;
- navigator.getUserMedia = navigator.getUserMedia ||
- navigator.webkitGetUserMedia ||
- navigator.mozGetUserMedia ||
- navigator.msGetUserMedia;
+ navigator.getUserMedia =
+ navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
if (!navigator.getUserMedia) {
fail(CaptureError.CAPTURE_NOT_SUPPORTED);
@@ -182,45 +180,60 @@ module.exports = {
}
var ui = new CameraUI();
- ui.startPreview(limit, function (data) {
- // Check if we're done with capture. If so, then destroy UI
- if (++imagesTaken >= limit) {
+ ui.startPreview(
+ limit,
+ function (data) {
+ // Check if we're done with capture. If so, then destroy UI
+ if (++imagesTaken >= limit) {
+ ui.destroyPreview();
+ }
+
+ // Array of resultant MediaFiles
+ var mediaFiles = [];
+
+ // save data to file here
+ window.requestFileSystem(
+ window.TEMPORARY,
+ data.length * limit,
+ function (fileSystem) {
+ // If we need to capture multiple files, then append counter to filename
+ var fileName = limit <= 1 ? 'image.jpg' : 'image' + imagesTaken + '.jpg';
+ fileSystem.root.getFile(
+ fileName,
+ { create: true },
+ function (file) {
+ file.createWriter(function (writer) {
+ writer.onwriteend = function () {
+ file.getMetadata(function (meta) {
+ mediaFiles.push(
+ new MediaFile(file.name, file.toURL(), 'image/jpeg', meta.modificationTime, meta.size)
+ );
+ // Check if we're done with capture. If so, then call a successCallback
+ if (imagesTaken >= limit) {
+ successCallback(mediaFiles);
+ }
+ }, fail);
+ };
+ writer.onerror = fail;
+ // Since success callback for start preview returns
+ // a base64 encoded string, we need to convert it to blob first
+ writer.write(dataURItoBlob(data));
+ });
+ },
+ fail
+ );
+ },
+ fail
+ );
+ },
+ function (err) {
ui.destroyPreview();
+ fail(err.code);
}
-
- // Array of resultant MediaFiles
- var mediaFiles = [];
-
- // save data to file here
- window.requestFileSystem(window.TEMPORARY, data.length * limit, function (fileSystem) {
- // If we need to capture multiple files, then append counter to filename
- var fileName = limit <= 1 ? 'image.jpg' : 'image' + imagesTaken + '.jpg';
- fileSystem.root.getFile(fileName, {create: true}, function (file) {
- file.createWriter(function (writer) {
- writer.onwriteend = function () {
- file.getMetadata(function (meta) {
- mediaFiles.push(new MediaFile(file.name, file.toURL(), 'image/jpeg', meta.modificationTime, meta.size));
- // Check if we're done with capture. If so, then call a successCallback
- if (imagesTaken >= limit) {
- successCallback(mediaFiles);
- }
- }, fail);
- };
- writer.onerror = fail;
- // Since success callback for start preview returns
- // a base64 encoded string, we need to convert it to blob first
- writer.write(dataURItoBlob(data));
- });
- }, fail);
- }, fail);
- }, function (err) {
- ui.destroyPreview();
- fail(err.code);
- });
+ );
},
getFormatData: function (successCallback, errorCallback, args) {
-
var img = document.createElement('img');
img.src = args[0];
img.onload = function () {
@@ -231,4 +244,4 @@ module.exports = {
}
};
-require("cordova/exec/proxy").add("Capture",module.exports);
+require('cordova/exec/proxy').add('Capture', module.exports);
diff --git a/src/ios/CDVCapture.h b/src/ios/CDVCapture.h
index 090bcaf0..7b4d1ed3 100644
--- a/src/ios/CDVCapture.h
+++ b/src/ios/CDVCapture.h
@@ -28,6 +28,7 @@ enum CDVCaptureError {
CAPTURE_APPLICATION_BUSY = 1,
CAPTURE_INVALID_ARGUMENT = 2,
CAPTURE_NO_MEDIA_FILES = 3,
+ CAPTURE_PERMISSION_DENIED = 4,
CAPTURE_NOT_SUPPORTED = 20
};
typedef NSUInteger CDVCaptureError;
diff --git a/src/ios/CDVCapture.m b/src/ios/CDVCapture.m
index 99fae1bc..fb0b7c55 100644
--- a/src/ios/CDVCapture.m
+++ b/src/ios/CDVCapture.m
@@ -69,17 +69,17 @@ - (uint64_t)accessibilityTraits
- (BOOL)prefersStatusBarHidden {
return YES;
}
-
+
- (UIViewController*)childViewControllerForStatusBarHidden {
return nil;
}
-
+
- (void)viewWillAppear:(BOOL)animated {
SEL sel = NSSelectorFromString(@"setNeedsStatusBarAppearanceUpdate");
if ([self respondsToSelector:sel]) {
[self performSelector:sel withObject:nil afterDelay:0];
}
-
+
[super viewWillAppear:animated];
}
@@ -152,6 +152,7 @@ - (void)captureImage:(CDVInvokedUrlCommand*)command
pickerController = [[CDVImagePicker alloc] init];
}
+ [self showAlertIfAccessProhibited];
pickerController.delegate = self;
pickerController.sourceType = UIImagePickerControllerSourceTypeCamera;
pickerController.allowsEditing = NO;
@@ -168,7 +169,7 @@ - (void)captureImage:(CDVInvokedUrlCommand*)command
}*/
// CDVImagePicker specific property
pickerController.callbackId = callbackId;
-
+ pickerController.modalPresentationStyle = UIModalPresentationCurrentContext;
[self.viewController presentViewController:pickerController animated:YES completion:nil];
}
}
@@ -258,6 +259,8 @@ - (void)captureVideo:(CDVInvokedUrlCommand*)command
[self.commandDelegate sendPluginResult:result callbackId:callbackId];
pickerController = nil;
} else {
+ [self showAlertIfAccessProhibited];
+
pickerController.delegate = self;
pickerController.sourceType = UIImagePickerControllerSourceTypeCamera;
pickerController.allowsEditing = NO;
@@ -280,7 +283,7 @@ - (void)captureVideo:(CDVInvokedUrlCommand*)command
}
// CDVImagePicker specific property
pickerController.callbackId = callbackId;
-
+ pickerController.modalPresentationStyle = UIModalPresentationCurrentContext;
[self.viewController presentViewController:pickerController animated:YES completion:nil];
}
}
@@ -302,6 +305,51 @@ - (void)processVideo:(NSString*)moviePath forCallbackId:(NSString*)callbackId
[self.commandDelegate sendPluginResult:result callbackId:callbackId];
}
+- (void)showAlertIfAccessProhibited
+{
+ if (![self hasCameraAccess]) {
+ [self showPermissionsAlert];
+ }
+}
+
+- (BOOL)hasCameraAccess
+{
+ AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
+
+ return status != AVAuthorizationStatusDenied && status != AVAuthorizationStatusRestricted;
+}
+
+- (void)showPermissionsAlert
+{
+ UIAlertController *alertController = [UIAlertController alertControllerWithTitle:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]
+ message:NSLocalizedString(@"Access to the camera has been prohibited; please enable it in the Settings app to continue.", nil)
+ preferredStyle:UIAlertControllerStyleAlert];
+ [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction * action)
+ {
+ [self returnNoPermissionError];
+ }]];
+ [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Settings", nil)
+ style:UIAlertActionStyleDefault
+ handler:^(UIAlertAction * action)
+ {
+ [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]options:@{} completionHandler:nil];
+ [self returnNoPermissionError];
+ }]];
+ [self.viewController presentViewController:alertController animated:YES completion:^{}];
+}
+
+- (void)returnNoPermissionError
+{
+ CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageToErrorObject:CAPTURE_PERMISSION_DENIED];
+
+ [[pickerController presentingViewController] dismissViewControllerAnimated:YES completion:nil];
+ [self.commandDelegate sendPluginResult:result callbackId:pickerController.callbackId];
+ pickerController = nil;
+ self.inUse = NO;
+}
+
- (void)getMediaModes:(CDVInvokedUrlCommand*)command
{
// NSString* callbackId = [command argumentAtIndex:0];
@@ -347,7 +395,7 @@ - (void)getMediaModes:(CDVInvokedUrlCommand*)command
movieArray ? (NSObject*) movieArray:[NSNull null], @"video",
audioArray ? (NSObject*) audioArray:[NSNull null], @"audio",
nil];
-
+
NSData* jsonData = [NSJSONSerialization dataWithJSONObject:modes options:0 error:nil];
NSString* jsonStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
@@ -628,19 +676,11 @@ - (void)imagePickerControllerDidCancel:(UIImagePickerController*)picker
@implementation CDVAudioNavigationController
-#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
@@ -692,9 +732,9 @@ - (void)loadView
if ([self respondsToSelector:@selector(edgesForExtendedLayout)]) {
self.edgesForExtendedLayout = UIRectEdgeNone;
}
-
+
// create view and display
- CGRect viewRect = [[UIScreen mainScreen] applicationFrame];
+ CGRect viewRect = [[UIScreen mainScreen] bounds];
UIView* tmp = [[UIView alloc] initWithFrame:viewRect];
// make backgrounds
@@ -735,12 +775,7 @@ - (void)loadView
// timerLabel.autoresizingMask = reSizeMask;
[self.timerLabel setBackgroundColor:[UIColor clearColor]];
[self.timerLabel setTextColor:[UIColor whiteColor]];
-#ifdef __IPHONE_6_0
[self.timerLabel setTextAlignment:NSTextAlignmentCenter];
-#else
- // for iOS SDK < 6.0
- [self.timerLabel setTextAlignment:UITextAlignmentCenter];
-#endif
[self.timerLabel setText:@"0:00"];
[self.timerLabel setAccessibilityHint:PluginLocalizedString(captureCommand, @"recorded time in minutes and seconds", nil)];
self.timerLabel.accessibilityTraits |= UIAccessibilityTraitUpdatesFrequently;
@@ -815,31 +850,14 @@ - (void)viewDidLoad
}
}
-#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
-{
- [self setView:nil];
- [self.captureCommand setInUse:NO];
-}
- (void)processButton:(id)sender
{
@@ -856,7 +874,7 @@ - (void)processButton:(id)sender
__block NSError* error = nil;
__weak CDVAudioRecorderViewController* weakSelf = self;
-
+
void (^startRecording)(void) = ^{
[weakSelf.avSession setCategory:AVAudioSessionCategoryRecord error:&error];
[weakSelf.avSession setActive:YES error:&error];
@@ -867,7 +885,7 @@ - (void)processButton:(id)sender
} else {
if (weakSelf.duration) {
weakSelf.isTimed = true;
- [weakSelf.avRecorder recordForDuration:[duration doubleValue]];
+ [weakSelf.avRecorder recordForDuration:[weakSelf.duration doubleValue]];
} else {
[weakSelf.avRecorder record];
}
@@ -877,7 +895,7 @@ - (void)processButton:(id)sender
}
UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, nil);
};
-
+
SEL rrpSel = NSSelectorFromString(@"requestRecordPermission:");
if ([self.avSession respondsToSelector:rrpSel])
{
@@ -921,7 +939,7 @@ - (void)stopRecordingCleanup
//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));
+ UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, PluginLocalizedString(self->captureCommand, @"timed recording complete", nil));
});
}
} else {
@@ -947,10 +965,6 @@ - (void)dismissAudioView:(id)sender
UIAccessibilityPostNotification(UIAccessibilityScreenChangedNotification, nil);
// return result
[self.captureCommand.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
-
- if (IsAtLeastiOSVersion(@"7.0")) {
- [[UIApplication sharedApplication] setStatusBarStyle:_previousStatusBarStyle];
- }
}
- (void)updateTime
@@ -1001,18 +1015,4 @@ - (void)audioRecorderEncodeErrorDidOccur:(AVAudioRecorder*)recorder error:(NSErr
[self dismissAudioView:nil];
}
-- (UIStatusBarStyle)preferredStatusBarStyle
-{
- return UIStatusBarStyleDefault;
-}
-
-- (void)viewWillAppear:(BOOL)animated
-{
- if (IsAtLeastiOSVersion(@"7.0")) {
- [[UIApplication sharedApplication] setStatusBarStyle:[self preferredStatusBarStyle]];
- }
-
- [super viewWillAppear:animated];
-}
-
@end
diff --git a/src/ubuntu/MediaCaptureWidget.qml b/src/ubuntu/MediaCaptureWidget.qml
deleted file mode 100644
index 98350fad..00000000
--- a/src/ubuntu/MediaCaptureWidget.qml
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- *
- * Copyright 2013 Canonical Ltd.
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-import QtQuick 2.0
-import QtMultimedia 5.0
-
-Rectangle {
- property string recordOffImagePath: "record_off.png"
- property string recordOnImagePath: "record_on.png"
- property string shootImagePath: "shoot.png"
- function isSuffix(str, suffix) {
- return String(str).substr(String(str).length - suffix.length) == suffix
- }
-
- id: ui
- color: "#252423"
- anchors.fill: parent
- state: "off"
-
- Camera {
- objectName: "camera"
- id: camera
- onError: {
- console.log(errorString);
- shootButton.source = recordOffImagePath
- }
- imageCapture {
- onImageSaved: {
- root.exec("Capture", "onImageSaved", [path]);
- ui.destroy();
- }
- }
- videoRecorder {
- audioBitRate: 128000
- mediaContainer: "mp4"
- outputLocation: ui.parent.plugin('Capture').generateLocation("mp4")
- onRecorderStateChanged: {
- if (videoRecorder.recorderState === CameraRecorder.StoppedState) {
- ui.parent.exec("Capture", "onVideoRecordEnd", [camera.videoRecorder.outputLocation]);
- shootButton.source = recordOffImagePath
- }
- }
- }
- }
- Image {
- id: microphoneImage
- source: "microphone.png"
- smooth: true
- visible: false
- width: parent.width
- height: parent.height
- }
- VideoOutput {
- id: output
- focus : visible
- source: camera
- width: parent.width
- height: parent.height
- }
-
- Item {
- anchors.bottom: parent.bottom
- width: parent.width
- height: shootButton.height
- BorderImage {
- id: leftBackground
- anchors.left: parent.left
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.right: middle.left
- anchors.topMargin: units.dp(2)
- anchors.bottomMargin: units.dp(2)
- source: "toolbar-left.png"
- Image {
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.leftMargin: parent.iconSpacing
- source: "back.png"
- width: units.gu(6)
- height: units.gu(5)
- MouseArea {
- anchors.fill: parent
- onClicked: {
- root.exec("Capture", "cancel");
- }
- }
- }
- }
- BorderImage {
- id: middle
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.horizontalCenter: parent.horizontalCenter
- height: shootButton.height + units.gu(1)
- width: shootButton.width
- source: "toolbar-middle.png"
- Image {
- id: shootButton
- width: units.gu(8)
- height: width
- anchors.horizontalCenter: parent.horizontalCenter
- source: shootImagePath
- MouseArea {
- anchors.fill: parent
- onClicked: {
- if (ui.state === "camera") {
- camera.imageCapture.captureToLocation(ui.parent.plugin('Capture').generateLocation("jpg"));
- } else if (ui.state === "audio") {
- ui.parent.exec("Capture", "recordAudio");
- if (isSuffix(shootButton.source, recordOffImagePath)) {
- shootButton.source = recordOnImagePath
- } else {
- shootButton.source = recordOffImagePath
- }
- } else if (ui.state === "videoRecording") {
- if (!camera.videoRecorder.recorderState) {
- shootButton.source = recordOnImagePath
- camera.videoRecorder.record();
- } else {
- camera.videoRecorder.stop();
- }
- }
- }
- }
- }
- }
- BorderImage {
- id: rightBackground
- anchors.right: parent.right
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.left: middle.right
- anchors.topMargin: units.dp(2)
- anchors.bottomMargin: units.dp(2)
- source: "toolbar-right.png"
- }
- }
- states: [
- State {
- name: "off"
- StateChangeScript {
- script:{
- ui.visible = false;
- camera.stop();
- camera.unlock();
- }
- }
- },
- State {
- name: "camera"
- StateChangeScript {
- script: {
- camera.start();
- microphoneImage.visible = false
- output.visible = true
- shootButton.source = shootImagePath
- ui.visible = true
- }
- }
- },
- State {
- name: "videoRecording"
- StateChangeScript {
- script: {
- shootButton.source = recordOffImagePath
- camera.start();
- microphoneImage.visible = false
- output.visible = true
- ui.visible = true
- }
- }
- },
- State {
- name: "audio"
- StateChangeScript {
- script:{
- shootButton.source = recordOffImagePath
- camera.stop();
- microphoneImage.visible = true
- camera.unlock();
- output.visible = false
- ui.visible = true
- }
- }
- }
- ]
-}
diff --git a/src/ubuntu/back.png b/src/ubuntu/back.png
deleted file mode 100644
index af78faa8..00000000
Binary files a/src/ubuntu/back.png and /dev/null differ
diff --git a/src/ubuntu/capture.cpp b/src/ubuntu/capture.cpp
deleted file mode 100644
index aaf0910f..00000000
--- a/src/ubuntu/capture.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- *
- * Copyright 2013 Canonical Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-#include "capture.h"
-
-const char code[] = "\
-var component, object; \
-function createObject() { \
- component = Qt.createComponent(%1); \
- if (component.status == Component.Ready) \
- finishCreation(); \
- else \
- component.statusChanged.connect(finishCreation); \
-} \
-function finishCreation() { \
- CordovaWrapper.global.captureObject = component.createObject(root, \
- {root: root, cordova: cordova, state: \"%2\"}); \
-} \
-createObject()";
-
-static QString formatFile(const QMimeDatabase &db, const QString &path) {
- QFileInfo info(path);
- QMimeType mime = db.mimeTypeForFile(info.fileName());
-
- QVariantMap file;
- file.insert("name", info.fileName());
- file.insert("fullPath", info.absoluteFilePath());
- file.insert("lastModifiedDate", info.lastModified().toMSecsSinceEpoch());
- file.insert("size", info.size());
- file.insert("type", mime.name());
-
- return CordovaInternal::format(file);
-}
-
-MediaCapture::MediaCapture(Cordova *cordova): CPlugin(cordova), _scId(0), _ecId(0) {
-}
-
-void MediaCapture::captureAudio(int scId, int ecId, const QVariantMap &) {
- if (_scId || _ecId) {
- this->callback(_ecId, QString("{code: %1}").arg(CAPTURE_APPLICATION_BUSY));
- return;
- }
-
- QString path = m_cordova->get_app_dir() + "/../qml/MediaCaptureWidget.qml";
-
- QString qml = QString(code).arg(CordovaInternal::format(path)).arg("audio");
- m_cordova->execQML(qml);
-
- _scId = scId;
- _ecId = ecId;
-}
-
-void MediaCapture::onAudioRecordError(QMediaRecorder::Error) {
- if (!_ecId)
- return;
- this->callback(_ecId, QString("{code: %1}").arg(CAPTURE_INTERNAL_ERR));
- _ecId = _scId = 0;
-
- _recorder.clear();
- _files.clear();
-
- m_cordova->execQML("CordovaWrapper.global.captureObject.destroy()");
-}
-
-void MediaCapture::recordAudio() {
- if (_recorder.data()) {
- QUrl url = _recorder->outputLocation();
-
- QString path = url.toString();
- _recorder->stop();
-
- _recorder.clear();
-
- this->callback(_scId, QString("[%1]").arg(formatFile(_db, path)));
- _ecId = _scId = 0;
-
- m_cordova->execQML("CordovaWrapper.global.captureObject.destroy()");
- } else {
- _recorder = QSharedPointer' + - 'Click on preview to capture image. Click outside of preview to cancel.' + + 'Click on preview to capture image. Click outside of preview to cancel.' + '' + '
' +
- '' +
- '' +
- '' +
- '' +
+ '' +
+ '' +
+ '' +
+ '' +
'
';
document.body.appendChild(previewContainer);
@@ -99,42 +106,47 @@ function MediaCaptureProxy() {
* @param {function} selectCallback Callback for Select button
* @param {function} retakeCallback Callback for Retake button
*/
- function startCameraPreview(takeCallback, errorCallback, selectCallback, retakeCallback) {
+ function startCameraPreview (takeCallback, errorCallback, selectCallback, retakeCallback) {
// try to select appropriate device for capture
// rear camera is preferred option
var expectedPanel = Windows.Devices.Enumeration.Panel.back;
- Windows.Devices.Enumeration.DeviceInformation.findAllAsync(Windows.Devices.Enumeration.DeviceClass.videoCapture).done(function (devices) {
+ Windows.Devices.Enumeration.DeviceInformation.findAllAsync(Windows.Devices.Enumeration.DeviceClass.videoCapture).done(function (
+ devices
+ ) {
if (devices.length > 0) {
devices.forEach(function (currDev) {
- if (currDev.enclosureLocation && currDev.enclosureLocation.panel && currDev.enclosureLocation.panel == expectedPanel) {
+ if (currDev.enclosureLocation && currDev.enclosureLocation.panel && currDev.enclosureLocation.panel === expectedPanel) {
captureSettings.videoDeviceId = currDev.id;
}
});
- capture.initializeAsync(captureSettings).done(function () {
- // This is necessary since WP8.1 MediaCapture outputs video stream rotated 90 degrees CCW
- // TODO: This can be not consistent across devices, need additional testing on various devices
- // msdn.microsoft.com/en-us/library/windows/apps/hh452807.aspx
- capture.setPreviewRotation(Windows.Media.Capture.VideoRotation.clockwise90Degrees);
- capturePreview.msZoom = true;
-
- capturePreview.src = URL.createObjectURL(capture);
- capturePreview.play();
-
- previewContainer.style.display = 'block';
-
- // Bind events to controls
- capturePreview.onclick = takeCallback;
- document.getElementById('takePicture').onclick = takeCallback;
- document.getElementById('cancelCapture').onclick = function () {
- errorCallback(CaptureError.CAPTURE_NO_MEDIA_FILES);
- };
- document.getElementById('selectPicture').onclick = selectCallback;
- document.getElementById('retakePicture').onclick = retakeCallback;
- }, function (err) {
- destroyCameraPreview();
- errorCallback(CaptureError.CAPTURE_INTERNAL_ERR, err);
- });
+ capture.initializeAsync(captureSettings).done(
+ function () {
+ // This is necessary since WP8.1 MediaCapture outputs video stream rotated 90 degrees CCW
+ // TODO: This can be not consistent across devices, need additional testing on various devices
+ // msdn.microsoft.com/en-us/library/windows/apps/hh452807.aspx
+ capture.setPreviewRotation(Windows.Media.Capture.VideoRotation.clockwise90Degrees);
+ capturePreview.msZoom = true;
+
+ capturePreview.src = URL.createObjectURL(capture); // eslint-disable-line no-undef
+ capturePreview.play();
+
+ previewContainer.style.display = 'block';
+
+ // Bind events to controls
+ capturePreview.onclick = takeCallback;
+ document.getElementById('takePicture').onclick = takeCallback;
+ document.getElementById('cancelCapture').onclick = function () {
+ errorCallback(CaptureError.CAPTURE_NO_MEDIA_FILES);
+ };
+ document.getElementById('selectPicture').onclick = selectCallback;
+ document.getElementById('retakePicture').onclick = retakeCallback;
+ },
+ function (err) {
+ destroyCameraPreview();
+ errorCallback(CaptureError.CAPTURE_INTERNAL_ERR, err);
+ }
+ );
} else {
// no appropriate devices found
destroyCameraPreview();
@@ -146,7 +158,7 @@ function MediaCaptureProxy() {
/**
* Destroys camera preview, removes all elements created
*/
- function destroyCameraPreview() {
+ function destroyCameraPreview () {
capturePreview.pause();
capturePreview.src = null;
if (previewContainer) {
@@ -175,22 +187,30 @@ function MediaCaptureProxy() {
toggleElements('cancelCapture');
document.getElementById('takePicture').text = 'Stop';
- var encodingProperties = Windows.Media.MediaProperties.MediaEncodingProfile.createMp4(Windows.Media.MediaProperties.VideoEncodingQuality.auto),
- generateUniqueCollisionOption = Windows.Storage.CreationCollisionOption.generateUniqueName,
- localFolder = Windows.Storage.ApplicationData.current.localFolder;
-
- localFolder.createFileAsync("cameraCaptureVideo.mp4", generateUniqueCollisionOption).done(function(capturedFile) {
- capture.startRecordToStorageFileAsync(encodingProperties, capturedFile).done(function() {
- capturedVideoFile = capturedFile;
- captureStarted = true;
- }, function(err) {
+ var encodingProperties = Windows.Media.MediaProperties.MediaEncodingProfile.createMp4(
+ Windows.Media.MediaProperties.VideoEncodingQuality.auto
+ );
+ var generateUniqueCollisionOption = Windows.Storage.CreationCollisionOption.generateUniqueName;
+ var localFolder = Windows.Storage.ApplicationData.current.localFolder;
+
+ localFolder.createFileAsync('cameraCaptureVideo.mp4', generateUniqueCollisionOption).done(
+ function (capturedFile) {
+ capture.startRecordToStorageFileAsync(encodingProperties, capturedFile).done(
+ function () {
+ capturedVideoFile = capturedFile;
+ captureStarted = true;
+ },
+ function (err) {
+ destroyCameraPreview();
+ errorCallback(CaptureError.CAPTURE_INTERNAL_ERR, err);
+ }
+ );
+ },
+ function (err) {
destroyCameraPreview();
errorCallback(CaptureError.CAPTURE_INTERNAL_ERR, err);
- });
- }, function(err) {
- destroyCameraPreview();
- errorCallback(CaptureError.CAPTURE_INTERNAL_ERR, err);
- });
+ }
+ );
} else {
capture.stopRecordAsync().done(function () {
destroyCameraPreview();
@@ -215,25 +235,31 @@ function MediaCaptureProxy() {
startCameraPreview(
// Callback for Take button - captures intermediate image file.
function () {
- var encodingProperties = Windows.Media.MediaProperties.ImageEncodingProperties.createJpeg(),
- overwriteCollisionOption = Windows.Storage.CreationCollisionOption.replaceExisting,
- tempFolder = Windows.Storage.ApplicationData.current.temporaryFolder;
-
- tempFolder.createFileAsync("cameraCaptureImage.jpg", overwriteCollisionOption).done(function (capturedFile) {
- capture.capturePhotoToStorageFileAsync(encodingProperties, capturedFile).done(function () {
- // store intermediate result in object's global variable
- capturedPictureFile = capturedFile;
- // show pre-captured image and toggle visibility of all buttons
- previewContainer.style.backgroundImage = 'url("' + 'ms-appdata:///temp/' + capturedFile.name + '")';
- toggleElements('capturePreview', 'takePicture', 'cancelCapture', 'selectPicture', 'retakePicture');
- }, function (err) {
+ var encodingProperties = Windows.Media.MediaProperties.ImageEncodingProperties.createJpeg();
+ var overwriteCollisionOption = Windows.Storage.CreationCollisionOption.replaceExisting;
+ var tempFolder = Windows.Storage.ApplicationData.current.temporaryFolder;
+
+ tempFolder.createFileAsync('cameraCaptureImage.jpg', overwriteCollisionOption).done(
+ function (capturedFile) {
+ capture.capturePhotoToStorageFileAsync(encodingProperties, capturedFile).done(
+ function () {
+ // store intermediate result in object's global variable
+ capturedPictureFile = capturedFile;
+ // show pre-captured image and toggle visibility of all buttons
+ previewContainer.style.backgroundImage = 'url("' + 'ms-appdata:///temp/' + capturedFile.name + '")';
+ toggleElements('capturePreview', 'takePicture', 'cancelCapture', 'selectPicture', 'retakePicture');
+ },
+ function (err) {
+ destroyCameraPreview();
+ errorCallback(CaptureError.CAPTURE_INTERNAL_ERR, err);
+ }
+ );
+ },
+ function (err) {
destroyCameraPreview();
errorCallback(CaptureError.CAPTURE_INTERNAL_ERR, err);
- });
- }, function (err) {
- destroyCameraPreview();
- errorCallback(CaptureError.CAPTURE_INTERNAL_ERR, err);
- });
+ }
+ );
},
// error + cancel callback
function (err) {
@@ -242,16 +268,19 @@ function MediaCaptureProxy() {
},
// Callback for Select button - copies intermediate file into persistent application's storage
function () {
- var generateUniqueCollisionOption = Windows.Storage.CreationCollisionOption.generateUniqueName,
- localFolder = Windows.Storage.ApplicationData.current.localFolder;
+ var generateUniqueCollisionOption = Windows.Storage.CreationCollisionOption.generateUniqueName;
+ var localFolder = Windows.Storage.ApplicationData.current.localFolder;
- capturedPictureFile.copyAsync(localFolder, capturedPictureFile.name, generateUniqueCollisionOption).done(function (copiedFile) {
- destroyCameraPreview();
- successCallback(copiedFile);
- }, function(err) {
- destroyCameraPreview();
- errorCallback(err);
- });
+ capturedPictureFile.copyAsync(localFolder, capturedPictureFile.name, generateUniqueCollisionOption).done(
+ function (copiedFile) {
+ destroyCameraPreview();
+ successCallback(copiedFile);
+ },
+ function (err) {
+ destroyCameraPreview();
+ errorCallback(err);
+ }
+ );
},
// Callback for retake button - just toggles visibility of necessary elements
function () {
@@ -267,12 +296,11 @@ function MediaCaptureProxy() {
}
module.exports = {
-
- captureAudio:function(successCallback, errorCallback, args) {
+ captureAudio: function (successCallback, errorCallback, args) {
var options = args[0];
var audioOptions = new CaptureAudioOptions();
- if (typeof(options.duration) == 'undefined') {
+ if (typeof options.duration === 'undefined') {
audioOptions.duration = 3600; // Arbitrary amount, need to change later
} else if (options.duration > 0) {
audioOptions.duration = options.duration;
@@ -282,68 +310,91 @@ module.exports = {
}
// Some shortcuts for long namespaces
- var CaptureNS = Windows.Media.Capture,
- MediaPropsNS = Windows.Media.MediaProperties,
- localAppData = Windows.Storage.ApplicationData.current.localFolder,
- generateUniqueName = Windows.Storage.NameCollisionOption.generateUniqueName;
+ var CaptureNS = Windows.Media.Capture;
+ var MediaPropsNS = Windows.Media.MediaProperties;
+ var localAppData = Windows.Storage.ApplicationData.current.localFolder;
+ var generateUniqueName = Windows.Storage.NameCollisionOption.generateUniqueName;
- var mediaCapture = new CaptureNS.MediaCapture(),
- mediaCaptureSettings = new CaptureNS.MediaCaptureInitializationSettings(),
- mp3EncodingProfile = new MediaPropsNS.MediaEncodingProfile.createMp3(MediaPropsNS.AudioEncodingQuality.auto),
- m4aEncodingProfile = new MediaPropsNS.MediaEncodingProfile.createM4a(MediaPropsNS.AudioEncodingQuality.auto);
+ var mediaCapture = new CaptureNS.MediaCapture();
+ var mediaCaptureSettings = new CaptureNS.MediaCaptureInitializationSettings();
+ var mp3EncodingProfile = new MediaPropsNS.MediaEncodingProfile.createMp3(MediaPropsNS.AudioEncodingQuality.auto); // eslint-disable-line new-cap
+ var m4aEncodingProfile = new MediaPropsNS.MediaEncodingProfile.createM4a(MediaPropsNS.AudioEncodingQuality.auto); // eslint-disable-line new-cap
mediaCaptureSettings.streamingCaptureMode = CaptureNS.StreamingCaptureMode.audio;
- var capturedFile,
- stopRecordTimeout;
+ var capturedFile;
+ var stopRecordTimeout;
var stopRecord = function () {
- mediaCapture.stopRecordAsync().then(function() {
- capturedFile.getBasicPropertiesAsync().then(function (basicProperties) {
- var result = new MediaFile(capturedFile.name, 'ms-appdata:///local/' + capturedFile.name, capturedFile.contentType, basicProperties.dateModified, basicProperties.size);
- result.fullPath = capturedFile.path;
- successCallback([result]);
- }, function() {
+ mediaCapture.stopRecordAsync().then(
+ function () {
+ capturedFile.getBasicPropertiesAsync().then(
+ function (basicProperties) {
+ var result = new MediaFile(
+ capturedFile.name,
+ 'ms-appdata:///local/' + capturedFile.name,
+ capturedFile.contentType,
+ basicProperties.dateModified,
+ basicProperties.size
+ );
+ result.fullPath = capturedFile.path;
+ successCallback([result]);
+ },
+ function () {
+ errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES));
+ }
+ );
+ },
+ function () {
errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES));
- });
- }, function() { errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES)); });
+ }
+ );
};
mediaCapture.initializeAsync(mediaCaptureSettings).done(function () {
- localAppData.createFileAsync("captureAudio.mp3", generateUniqueName).then(function (storageFile) {
- capturedFile = storageFile;
- mediaCapture.startRecordToStorageFileAsync(mp3EncodingProfile, capturedFile).then(function () {
- stopRecordTimeout = setTimeout(stopRecord, audioOptions.duration * 1000);
- }, function (err) {
- // -1072868846 is the error code for "No suitable transform was found to encode or decode the content."
- // so we try to use another (m4a) format
- if (err.number === -1072868846) {
- // first we clear existing timeout to prevent success callback to be called with invalid arguments
- // second we start same actions to try to record m4a audio
- clearTimeout(stopRecordTimeout);
- localAppData.createFileAsync("captureAudio.m4a", generateUniqueName).then(function (storageFile) {
- capturedFile = storageFile;
- mediaCapture.startRecordToStorageFileAsync(m4aEncodingProfile, capturedFile).then(function () {
- stopRecordTimeout = setTimeout(stopRecord, audioOptions.duration * 1000);
- }, function() {
- // if we here, we're totally failed to record either mp3 or m4a
+ localAppData.createFileAsync('captureAudio.mp3', generateUniqueName).then(
+ function (storageFile) {
+ capturedFile = storageFile;
+ mediaCapture.startRecordToStorageFileAsync(mp3EncodingProfile, capturedFile).then(
+ function () {
+ stopRecordTimeout = setTimeout(stopRecord, audioOptions.duration * 1000);
+ },
+ function (err) {
+ // -1072868846 is the error code for "No suitable transform was found to encode or decode the content."
+ // so we try to use another (m4a) format
+ if (err.number === -1072868846) {
+ // first we clear existing timeout to prevent success callback to be called with invalid arguments
+ // second we start same actions to try to record m4a audio
+ clearTimeout(stopRecordTimeout);
+ localAppData.createFileAsync('captureAudio.m4a', generateUniqueName).then(function (storageFile) {
+ capturedFile = storageFile;
+ mediaCapture.startRecordToStorageFileAsync(m4aEncodingProfile, capturedFile).then(
+ function () {
+ stopRecordTimeout = setTimeout(stopRecord, audioOptions.duration * 1000);
+ },
+ function () {
+ // if we here, we're totally failed to record either mp3 or m4a
+ errorCallback(new CaptureError(CaptureError.CAPTURE_INTERNAL_ERR));
+ }
+ );
+ });
+ } else {
errorCallback(new CaptureError(CaptureError.CAPTURE_INTERNAL_ERR));
- return;
- });
- });
- } else {
- errorCallback(new CaptureError(CaptureError.CAPTURE_INTERNAL_ERR));
- return;
- }
- });
- }, function () { errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES)); });
+ }
+ }
+ );
+ },
+ function () {
+ errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES));
+ }
+ );
});
},
- captureImage:function (successCallback, errorCallback, args) {
+ captureImage: function (successCallback, errorCallback, args) {
var CaptureNS = Windows.Media.Capture;
- function fail(code, data) {
+ function fail (code, data) {
var err = new CaptureError(code);
err.message = data;
errorCallback(err);
@@ -356,50 +407,80 @@ module.exports = {
var proxy = new MediaCaptureProxy();
- proxy.capturePhoto(function (photoFile) {
- photoFile.getBasicPropertiesAsync().done(function (basicProperties) {
- var result = new MediaFile(photoFile.name, 'ms-appdata:///local/' + photoFile.name, photoFile.contentType, basicProperties.dateModified, basicProperties.size);
- result.fullPath = photoFile.path;
- successCallback([result]);
- }, function (err) {
- fail(CaptureError.CAPTURE_INTERNAL_ERR, err);
- });
- }, function (err) {
- fail(err);
- });
-
+ proxy.capturePhoto(
+ function (photoFile) {
+ photoFile.getBasicPropertiesAsync().done(
+ function (basicProperties) {
+ var result = new MediaFile(
+ photoFile.name,
+ 'ms-appdata:///local/' + photoFile.name,
+ photoFile.contentType,
+ basicProperties.dateModified,
+ basicProperties.size
+ );
+ result.fullPath = photoFile.path;
+ successCallback([result]);
+ },
+ function (err) {
+ fail(CaptureError.CAPTURE_INTERNAL_ERR, err);
+ }
+ );
+ },
+ function (err) {
+ fail(err);
+ }
+ );
} else {
var cameraCaptureUI = new Windows.Media.Capture.CameraCaptureUI();
cameraCaptureUI.photoSettings.allowCropping = true;
cameraCaptureUI.photoSettings.maxResolution = Windows.Media.Capture.CameraCaptureUIMaxPhotoResolution.highestAvailable;
cameraCaptureUI.photoSettings.format = Windows.Media.Capture.CameraCaptureUIPhotoFormat.jpeg;
- cameraCaptureUI.captureFileAsync(Windows.Media.Capture.CameraCaptureUIMode.photo).done(function (file) {
- if (file) {
- file.moveAsync(Windows.Storage.ApplicationData.current.localFolder, "cameraCaptureImage.jpg", Windows.Storage.NameCollisionOption.generateUniqueName).then(function () {
- file.getBasicPropertiesAsync().then(function (basicProperties) {
- var result = new MediaFile(file.name, 'ms-appdata:///local/' + file.name, file.contentType, basicProperties.dateModified, basicProperties.size);
- result.fullPath = file.path;
- successCallback([result]);
- }, function () {
- errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES));
- });
- }, function () {
+ cameraCaptureUI.captureFileAsync(Windows.Media.Capture.CameraCaptureUIMode.photo).done(
+ function (file) {
+ if (file) {
+ file.moveAsync(
+ Windows.Storage.ApplicationData.current.localFolder,
+ 'cameraCaptureImage.jpg',
+ Windows.Storage.NameCollisionOption.generateUniqueName
+ ).then(
+ function () {
+ file.getBasicPropertiesAsync().then(
+ function (basicProperties) {
+ var result = new MediaFile(
+ file.name,
+ 'ms-appdata:///local/' + file.name,
+ file.contentType,
+ basicProperties.dateModified,
+ basicProperties.size
+ );
+ result.fullPath = file.path;
+ successCallback([result]);
+ },
+ function () {
+ errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES));
+ }
+ );
+ },
+ function () {
+ errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES));
+ }
+ );
+ } else {
errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES));
- });
- } else {
+ }
+ },
+ function () {
errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES));
}
- }, function () {
- errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES));
- });
+ );
}
},
- captureVideo:function (successCallback, errorCallback, args) {
+ captureVideo: function (successCallback, errorCallback, args) {
var options = args[0];
var CaptureNS = Windows.Media.Capture;
- function fail(code, data) {
+ function fail (code, data) {
var err = new CaptureError(code);
err.message = data;
errorCallback(err);
@@ -413,17 +494,24 @@ module.exports = {
var proxy = new MediaCaptureProxy();
proxy.captureVideo(function (videoFile) {
- videoFile.getBasicPropertiesAsync().done(function (basicProperties) {
- var result = new MediaFile(videoFile.name, 'ms-appdata:///local/' + videoFile.name, videoFile.contentType, basicProperties.dateModified, basicProperties.size);
- result.fullPath = videoFile.path;
- successCallback([result]);
- }, function (err) {
- fail(CaptureError.CAPTURE_INTERNAL_ERR, err);
- });
+ videoFile.getBasicPropertiesAsync().done(
+ function (basicProperties) {
+ var result = new MediaFile(
+ videoFile.name,
+ 'ms-appdata:///local/' + videoFile.name,
+ videoFile.contentType,
+ basicProperties.dateModified,
+ basicProperties.size
+ );
+ result.fullPath = videoFile.path;
+ successCallback([result]);
+ },
+ function (err) {
+ fail(CaptureError.CAPTURE_INTERNAL_ERR, err);
+ }
+ );
}, fail);
-
} else {
-
var videoOptions = new CaptureVideoOptions();
if (options.duration && options.duration > 0) {
videoOptions.duration = options.duration;
@@ -435,57 +523,95 @@ module.exports = {
cameraCaptureUI.videoSettings.allowTrimming = true;
cameraCaptureUI.videoSettings.format = Windows.Media.Capture.CameraCaptureUIVideoFormat.mp4;
cameraCaptureUI.videoSettings.maxDurationInSeconds = videoOptions.duration;
- cameraCaptureUI.captureFileAsync(Windows.Media.Capture.CameraCaptureUIMode.video).then(function(file) {
- if (file) {
- file.moveAsync(Windows.Storage.ApplicationData.current.localFolder, "cameraCaptureVideo.mp4", Windows.Storage.NameCollisionOption.generateUniqueName).then(function () {
- file.getBasicPropertiesAsync().then(function(basicProperties) {
- var result = new MediaFile(file.name, 'ms-appdata:///local/' + file.name, file.contentType, basicProperties.dateModified, basicProperties.size);
- result.fullPath = file.path;
- successCallback([result]);
- }, function() {
- errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES));
- });
- }, function() {
+ cameraCaptureUI.captureFileAsync(Windows.Media.Capture.CameraCaptureUIMode.video).then(
+ function (file) {
+ if (file) {
+ file.moveAsync(
+ Windows.Storage.ApplicationData.current.localFolder,
+ 'cameraCaptureVideo.mp4',
+ Windows.Storage.NameCollisionOption.generateUniqueName
+ ).then(
+ function () {
+ file.getBasicPropertiesAsync().then(
+ function (basicProperties) {
+ var result = new MediaFile(
+ file.name,
+ 'ms-appdata:///local/' + file.name,
+ file.contentType,
+ basicProperties.dateModified,
+ basicProperties.size
+ );
+ result.fullPath = file.path;
+ successCallback([result]);
+ },
+ function () {
+ errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES));
+ }
+ );
+ },
+ function () {
+ errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES));
+ }
+ );
+ } else {
errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES));
- });
- } else {
+ }
+ },
+ function () {
errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES));
}
- }, function() { errorCallback(new CaptureError(CaptureError.CAPTURE_NO_MEDIA_FILES)); });
+ );
}
},
getFormatData: function (successCallback, errorCallback, args) {
Windows.Storage.StorageFile.getFileFromPathAsync(args[0]).then(
function (storageFile) {
- var mediaTypeFlag = String(storageFile.contentType).split("/")[0].toLowerCase();
- if (mediaTypeFlag === "audio") {
- storageFile.properties.getMusicPropertiesAsync().then(function (audioProperties) {
- successCallback(new MediaFileData(null, audioProperties.bitrate, 0, 0, audioProperties.duration / 1000));
- }, function () {
- errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
- });
- }
- else if (mediaTypeFlag === "video") {
- storageFile.properties.getVideoPropertiesAsync().then(function (videoProperties) {
- successCallback(new MediaFileData(null, videoProperties.bitrate, videoProperties.height, videoProperties.width, videoProperties.duration / 1000));
- }, function () {
- errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
- });
- }
- else if (mediaTypeFlag === "image") {
- storageFile.properties.getImagePropertiesAsync().then(function (imageProperties) {
- successCallback(new MediaFileData(null, 0, imageProperties.height, imageProperties.width, 0));
- }, function () {
- errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
- });
+ var mediaTypeFlag = String(storageFile.contentType).split('/')[0].toLowerCase();
+ if (mediaTypeFlag === 'audio') {
+ storageFile.properties.getMusicPropertiesAsync().then(
+ function (audioProperties) {
+ successCallback(new MediaFileData(null, audioProperties.bitrate, 0, 0, audioProperties.duration / 1000));
+ },
+ function () {
+ errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
+ }
+ );
+ } else if (mediaTypeFlag === 'video') {
+ storageFile.properties.getVideoPropertiesAsync().then(
+ function (videoProperties) {
+ successCallback(
+ new MediaFileData(
+ null,
+ videoProperties.bitrate,
+ videoProperties.height,
+ videoProperties.width,
+ videoProperties.duration / 1000
+ )
+ );
+ },
+ function () {
+ errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
+ }
+ );
+ } else if (mediaTypeFlag === 'image') {
+ storageFile.properties.getImagePropertiesAsync().then(
+ function (imageProperties) {
+ successCallback(new MediaFileData(null, 0, imageProperties.height, imageProperties.width, 0));
+ },
+ function () {
+ errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
+ }
+ );
+ } else {
+ errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
}
- else { errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT)); }
- }, function () {
+ },
+ function () {
errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
}
);
}
};
-require("cordova/exec/proxy").add("Capture",module.exports);
+require('cordova/exec/proxy').add('Capture', module.exports);
diff --git a/src/windows/MediaFile.js b/src/windows/MediaFile.js
index a8b0bc3b..e57d14c8 100644
--- a/src/windows/MediaFile.js
+++ b/src/windows/MediaFile.js
@@ -17,47 +17,58 @@
* specific language governing permissions and limitations
* under the License.
*
-*/
+ */
-/*global Windows:true */
+/* global Windows */
var MediaFileData = require('cordova-plugin-media-capture.MediaFileData');
var CaptureError = require('cordova-plugin-media-capture.CaptureError');
module.exports = {
-
getFormatData: function (successCallback, errorCallback, args) {
Windows.Storage.StorageFile.getFileFromPathAsync(this.fullPath).then(
function (storageFile) {
- var mediaTypeFlag = String(storageFile.contentType).split("/")[0].toLowerCase();
- if (mediaTypeFlag === "audio") {
+ var mediaTypeFlag = String(storageFile.contentType).split('/')[0].toLowerCase();
+ if (mediaTypeFlag === 'audio') {
storageFile.properties.getMusicPropertiesAsync().then(
function (audioProperties) {
successCallback(new MediaFileData(null, audioProperties.bitrate, 0, 0, audioProperties.duration / 1000));
- }, function () {
+ },
+ function () {
errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
}
);
- } else if (mediaTypeFlag === "video") {
+ } else if (mediaTypeFlag === 'video') {
storageFile.properties.getVideoPropertiesAsync().then(
function (videoProperties) {
- successCallback(new MediaFileData(null, videoProperties.bitrate, videoProperties.height, videoProperties.width, videoProperties.duration / 1000));
- }, function () {
+ successCallback(
+ new MediaFileData(
+ null,
+ videoProperties.bitrate,
+ videoProperties.height,
+ videoProperties.width,
+ videoProperties.duration / 1000
+ )
+ );
+ },
+ function () {
errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
}
);
- } else if (mediaTypeFlag === "image") {
+ } else if (mediaTypeFlag === 'image') {
storageFile.properties.getImagePropertiesAsync().then(
function (imageProperties) {
successCallback(new MediaFileData(null, 0, imageProperties.height, imageProperties.width, 0));
- }, function () {
+ },
+ function () {
errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
}
);
} else {
errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
}
- }, function () {
+ },
+ function () {
errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
}
);
diff --git a/src/wp/Capture.cs b/src/wp/Capture.cs
deleted file mode 100644
index 1f5a3272..00000000
--- a/src/wp/Capture.cs
+++ /dev/null
@@ -1,736 +0,0 @@
-/*
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.IsolatedStorage;
-using System.Runtime.Serialization;
-using System.Windows.Media.Imaging;
-using Microsoft.Phone;
-using Microsoft.Phone.Tasks;
-using Microsoft.Xna.Framework.Media;
-using WPCordovaClassLib.Cordova.UI;
-using AudioResult = WPCordovaClassLib.Cordova.UI.AudioCaptureTask.AudioResult;
-using VideoResult = WPCordovaClassLib.Cordova.UI.VideoCaptureTask.VideoResult;
-using System.Windows;
-using System.Diagnostics;
-using Microsoft.Phone.Controls;
-
-namespace WPCordovaClassLib.Cordova.Commands
-{
- /// ' +
+ contentEl.innerHTML =
+ '
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+//
+// Copyright (c) Microsoft Open Technologies Inc
+// Licensed under the MIT license
+
+interface Navigator {
+ device: Device;
+}
+
+interface Device {
+ capture: Capture;
+}
+
+/** This plugin provides access to the device's audio, image, and video capture capabilities. */
+interface Capture {
+ /**
+ * Start the audio recorder application and return information about captured audio clip files.
+ * @param onSuccess Executes when the capture operation finishes with an array
+ * of MediaFile objects describing each captured audio clip file.
+ * @param onError Executes, if the user terminates the operation before an audio clip is captured,
+ * with a CaptureError object, featuring the CaptureError.CAPTURE_NO_MEDIA_FILES error code.
+ * @param options Encapsulates audio capture configuration options.
+ */
+ captureAudio(
+ onSuccess: (mediaFiles: MediaFile[]) => void,
+ onError: (error: CaptureError) => void,
+ options?: AudioOptions): void ;
+ /**
+ * Start the camera application and return information about captured image files.
+ * @param onSuccess Executes when the capture operation finishes with an array
+ * of MediaFile objects describing each captured image clip file.
+ * @param onError Executes, if the user terminates the operation before an audio clip is captured,
+ * with a CaptureError object, featuring the CaptureError.CAPTURE_NO_MEDIA_FILES error code.
+ * @param options Encapsulates audio capture configuration options.
+ */
+ captureImage(
+ onSuccess: (mediaFiles: MediaFile[]) => void,
+ onError: (error: CaptureError) => void,
+ options?: ImageOptions): void ;
+ /**
+ * Start the video recorder application and return information about captured video clip files.
+ * @param onSuccess Executes when the capture operation finishes with an array
+ * of MediaFile objects describing each captured video clip file.
+ * @param onError Executes, if the user terminates the operation before an audio clip is captured,
+ * with a CaptureError object, featuring the CaptureError.CAPTURE_NO_MEDIA_FILES error code.
+ * @param options Encapsulates audio capture configuration options.
+ */
+ captureVideo(
+ onSuccess: (mediaFiles: MediaFile[]) => void,
+ onError: (error: CaptureError) => void,
+ options?: VideoOptions): void ;
+ /** The audio recording formats supported by the device. */
+ supportedAudioModes: ConfigurationData[];
+ /** The recording image sizes and formats supported by the device. */
+ supportedImageModes: ConfigurationData[];
+ /** The recording video resolutions and formats supported by the device. */
+ supportedVideoModes: ConfigurationData[];
+}
+
+/** Encapsulates properties of a media capture file. */
+interface MediaFile {
+ /** The name of the file, without path information. */
+ name: string;
+ /** The full path of the file, including the name. */
+ fullPath: string;
+ /** The file's mime type */
+ type: string;
+ /** The date and time when the file was last modified. */
+ lastModifiedDate: Date;
+ /** The size of the file, in bytes. */
+ size: number;
+ /**
+ * Retrieves format information about the media capture file.
+ * @param successCallback Invoked with a MediaFileData object when successful.
+ * @param errorCallback Invoked if the attempt fails, this function.
+ */
+ getFormatData(
+ successCallback: (data: MediaFileData) => void,
+ errorCallback?: () => void): void;
+}
+
+/** Encapsulates format information about a media file. */
+interface MediaFileData {
+ /** The actual format of the audio and video content. */
+ codecs: string;
+ /** The average bitrate of the content. The value is zero for images. */
+ bitrate: number;
+ /** The height of the image or video in pixels. The value is zero for audio clips. */
+ height: number;
+ /** The width of the image or video in pixels. The value is zero for audio clips. */
+ width: number;
+ /** The length of the video or sound clip in seconds. The value is zero for images. */
+ duration: number;
+}
+
+/** Encapsulates the error code resulting from a failed media capture operation. */
+interface CaptureError {
+ /**
+ * One of the pre-defined error codes listed below.
+ * CaptureError.CAPTURE_INTERNAL_ERR
+ * The camera or microphone failed to capture image or sound.
+ * CaptureError.CAPTURE_APPLICATION_BUSY
+ * The camera or audio capture application is currently serving another capture request.
+ * CaptureError.CAPTURE_INVALID_ARGUMENT
+ * Invalid use of the API (e.g., the value of limit is less than one).
+ * CaptureError.CAPTURE_NO_MEDIA_FILES
+ * The user exits the camera or audio capture application before capturing anything.
+ * CaptureError.CAPTURE_NOT_SUPPORTED
+ * The requested capture operation is not supported.
+ */
+ code: number;
+ message: string;
+}
+
+declare var CaptureError: {
+ /** Constructor for CaptureError */
+ new (code: number, message: string): CaptureError;
+ CAPTURE_INTERNAL_ERR: number;
+ CAPTURE_APPLICATION_BUSY: number;
+ CAPTURE_INVALID_ARGUMENT: number;
+ CAPTURE_NO_MEDIA_FILES: number;
+ CAPTURE_NOT_SUPPORTED: number;
+ CAPTURE_PERMISSION_DENIED: number;
+}
+
+/** Encapsulates audio capture configuration options. */
+interface AudioOptions {
+ /**
+ * The maximum number of audio clips the device's user can capture in a single
+ * capture operation. The value must be greater than or equal to 1.
+ */
+ limit?: number;
+ /** The maximum duration of a audio clip, in seconds. */
+ duration?: number;
+}
+
+/** Encapsulates image capture configuration options. */
+interface ImageOptions {
+ /**
+ * The maximum number of images the user can capture in a single capture operation.
+ * The value must be greater than or equal to 1 (defaults to 1).
+ */
+ limit?: number;
+}
+
+/** Encapsulates video capture configuration options. */
+interface VideoOptions {
+ /**
+ * The maximum number of video clips the device's user can capture in a single
+ * capture operation. The value must be greater than or equal to 1.
+ */
+ limit?: number;
+ /** The maximum duration of a video clip, in seconds. */
+ duration?: number;
+}
+
+/** Encapsulates a set of media capture parameters that a device supports. */
+interface ConfigurationData {
+ /** The ASCII-encoded lowercase string representing the media type. */
+ type: string;
+ /** The height of the image or video in pixels. The value is zero for sound clips. */
+ height: number;
+ /** The width of the image or video in pixels. The value is zero for sound clips. */
+ width: number;
+}
\ No newline at end of file
diff --git a/www/CaptureAudioOptions.js b/www/CaptureAudioOptions.js
index b5f56051..65aad35b 100644
--- a/www/CaptureAudioOptions.js
+++ b/www/CaptureAudioOptions.js
@@ -17,12 +17,12 @@
* specific language governing permissions and limitations
* under the License.
*
-*/
+ */
/**
* Encapsulates all audio capture operation configuration options.
*/
-var CaptureAudioOptions = function(){
+var CaptureAudioOptions = function () {
// Upper limit of sound clips user can record. Value must be equal or greater than 1.
this.limit = 1;
// Maximum duration of a single sound clip in seconds.
diff --git a/www/CaptureError.js b/www/CaptureError.js
index 98927091..63c1997c 100644
--- a/www/CaptureError.js
+++ b/www/CaptureError.js
@@ -17,13 +17,13 @@
* specific language governing permissions and limitations
* under the License.
*
-*/
+ */
/**
* The CaptureError interface encapsulates all errors in the Capture API.
*/
-var CaptureError = function(c) {
- this.code = c || null;
+var CaptureError = function (c) {
+ this.code = c || null;
};
// Camera or microphone failed to capture image or sound.
diff --git a/www/CaptureImageOptions.js b/www/CaptureImageOptions.js
index 1fb5615e..869661fe 100644
--- a/www/CaptureImageOptions.js
+++ b/www/CaptureImageOptions.js
@@ -17,12 +17,12 @@
* specific language governing permissions and limitations
* under the License.
*
-*/
+ */
/**
* Encapsulates all image capture operation configuration options.
*/
-var CaptureImageOptions = function(){
+var CaptureImageOptions = function () {
// Upper limit of images user can take. Value must be equal or greater than 1.
this.limit = 1;
};
diff --git a/www/CaptureVideoOptions.js b/www/CaptureVideoOptions.js
index 261dbae8..6487174e 100644
--- a/www/CaptureVideoOptions.js
+++ b/www/CaptureVideoOptions.js
@@ -17,12 +17,12 @@
* specific language governing permissions and limitations
* under the License.
*
-*/
+ */
/**
* Encapsulates all video capture operation configuration options.
*/
-var CaptureVideoOptions = function(){
+var CaptureVideoOptions = function () {
// Upper limit of videos user can record. Value must be equal or greater than 1.
this.limit = 1;
// Maximum duration of a single video clip in seconds.
diff --git a/www/ConfigurationData.js b/www/ConfigurationData.js
index 57cfbf57..abaf4b39 100644
--- a/www/ConfigurationData.js
+++ b/www/ConfigurationData.js
@@ -17,12 +17,12 @@
* specific language governing permissions and limitations
* under the License.
*
-*/
+ */
/**
* Encapsulates a set of parameters that the capture device supports.
*/
-function ConfigurationData() {
+function ConfigurationData () {
// The ASCII-encoded string in lower case representing the media type.
this.type = null;
// The height attribute represents height of the image or video in pixels.
diff --git a/www/MediaFile.js b/www/MediaFile.js
index 1bc600ff..311386ed 100644
--- a/www/MediaFile.js
+++ b/www/MediaFile.js
@@ -17,12 +17,12 @@
* specific language governing permissions and limitations
* under the License.
*
-*/
+ */
-var utils = require('cordova/utils'),
- exec = require('cordova/exec'),
- File = require('cordova-plugin-file.File'),
- CaptureError = require('./CaptureError');
+var utils = require('cordova/utils');
+var exec = require('cordova/exec');
+var File = require('cordova-plugin-file.File');
+var CaptureError = require('./CaptureError');
/**
* Represents a single file.
*
@@ -32,7 +32,7 @@ var utils = require('cordova/utils'),
* lastModifiedDate {Date} last modified date
* size {Number} size of the file in bytes
*/
-var MediaFile = function(name, localURL, type, lastModifiedDate, size){
+var MediaFile = function (name, localURL, type, lastModifiedDate, size) {
MediaFile.__super__.constructor.apply(this, arguments);
};
@@ -44,11 +44,11 @@ utils.extend(MediaFile, File);
* @param {Function} successCB
* @param {Function} errorCB
*/
-MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
- if (typeof this.fullPath === "undefined" || this.fullPath === null) {
+MediaFile.prototype.getFormatData = function (successCallback, errorCallback) {
+ if (typeof this.fullPath === 'undefined' || this.fullPath === null) {
errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT));
} else {
- exec(successCallback, errorCallback, "Capture", "getFormatData", [this.localURL, this.type]);
+ exec(successCallback, errorCallback, 'Capture', 'getFormatData', [this.fullPath, this.type]);
}
};
diff --git a/www/MediaFileData.js b/www/MediaFileData.js
index 75e467b4..2031f6aa 100644
--- a/www/MediaFileData.js
+++ b/www/MediaFileData.js
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
*
-*/
+ */
/**
* MediaFileData encapsulates format information of a media file.
@@ -28,7 +28,7 @@
* @param {long} width
* @param {float} duration
*/
-var MediaFileData = function(codecs, bitrate, height, width, duration){
+var MediaFileData = function (codecs, bitrate, height, width, duration) {
this.codecs = codecs || null;
this.bitrate = bitrate || 0;
this.height = height || 0;
diff --git a/www/android/init.js b/www/android/init.js
index ace39e2e..928d0089 100644
--- a/www/android/init.js
+++ b/www/android/init.js
@@ -1,44 +1,44 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-var cordova = require('cordova'),
- helpers = require('./helpers');
-
-var SUCCESS_EVENT = "pendingcaptureresult";
-var FAILURE_EVENT = "pendingcaptureerror";
-
-var sChannel = cordova.addStickyDocumentEventHandler(SUCCESS_EVENT);
-var fChannel = cordova.addStickyDocumentEventHandler(FAILURE_EVENT);
-
-// We fire one of two events in the case where the activity gets killed while
-// the user is capturing audio, image, video, etc. in a separate activity
-document.addEventListener("deviceready", function() {
- document.addEventListener("resume", function(event) {
- if (event.pendingResult && event.pendingResult.pluginServiceName === "Capture") {
- if (event.pendingResult.pluginStatus === "OK") {
- var mediaFiles = helpers.wrapMediaFiles(event.pendingResult.result);
- sChannel.fire(mediaFiles);
- } else {
- fChannel.fire(event.pendingResult.result);
- }
- }
- });
-});
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+var cordova = require('cordova');
+var helpers = require('./helpers');
+
+var SUCCESS_EVENT = 'pendingcaptureresult';
+var FAILURE_EVENT = 'pendingcaptureerror';
+
+var sChannel = cordova.addStickyDocumentEventHandler(SUCCESS_EVENT);
+var fChannel = cordova.addStickyDocumentEventHandler(FAILURE_EVENT);
+
+// We fire one of two events in the case where the activity gets killed while
+// the user is capturing audio, image, video, etc. in a separate activity
+document.addEventListener('deviceready', function () {
+ document.addEventListener('resume', function (event) {
+ if (event.pendingResult && event.pendingResult.pluginServiceName === 'Capture') {
+ if (event.pendingResult.pluginStatus === 'OK') {
+ var mediaFiles = helpers.wrapMediaFiles(event.pendingResult.result);
+ sChannel.fire(mediaFiles);
+ } else {
+ fChannel.fire(event.pendingResult.result);
+ }
+ }
+ });
+});
diff --git a/www/capture.js b/www/capture.js
index 11c916b8..26b08ed3 100644
--- a/www/capture.js
+++ b/www/capture.js
@@ -17,10 +17,10 @@
* specific language governing permissions and limitations
* under the License.
*
-*/
+ */
-var exec = require('cordova/exec'),
- helpers = require('./helpers');
+var exec = require('cordova/exec');
+var helpers = require('./helpers');
/**
* Launches a capture of different types.
@@ -30,18 +30,17 @@ var exec = require('cordova/exec'),
* @param {Function} errorCB
* @param {CaptureVideoOptions} options
*/
-function _capture(type, successCallback, errorCallback, options) {
- var win = function(pluginResult) {
+function _capture (type, successCallback, errorCallback, options) {
+ var win = function (pluginResult) {
successCallback(helpers.wrapMediaFiles(pluginResult));
};
- exec(win, errorCallback, "Capture", type, [options]);
+ exec(win, errorCallback, 'Capture', type, [options]);
}
-
/**
* The Capture interface exposes an interface to the camera and microphone of the hosting device.
*/
-function Capture() {
+function Capture () {
this.supportedAudioModes = [];
this.supportedImageModes = [];
this.supportedVideoModes = [];
@@ -54,8 +53,8 @@ function Capture() {
* @param {Function} errorCB
* @param {CaptureAudioOptions} options
*/
-Capture.prototype.captureAudio = function(successCallback, errorCallback, options){
- _capture("captureAudio", successCallback, errorCallback, options);
+Capture.prototype.captureAudio = function (successCallback, errorCallback, options) {
+ _capture('captureAudio', successCallback, errorCallback, options);
};
/**
@@ -65,8 +64,8 @@ Capture.prototype.captureAudio = function(successCallback, errorCallback, option
* @param {Function} errorCB
* @param {CaptureImageOptions} options
*/
-Capture.prototype.captureImage = function(successCallback, errorCallback, options){
- _capture("captureImage", successCallback, errorCallback, options);
+Capture.prototype.captureImage = function (successCallback, errorCallback, options) {
+ _capture('captureImage', successCallback, errorCallback, options);
};
/**
@@ -76,9 +75,8 @@ Capture.prototype.captureImage = function(successCallback, errorCallback, option
* @param {Function} errorCB
* @param {CaptureVideoOptions} options
*/
-Capture.prototype.captureVideo = function(successCallback, errorCallback, options){
- _capture("captureVideo", successCallback, errorCallback, options);
+Capture.prototype.captureVideo = function (successCallback, errorCallback, options) {
+ _capture('captureVideo', successCallback, errorCallback, options);
};
-
module.exports = new Capture();
diff --git a/www/helpers.js b/www/helpers.js
index df726d99..b1a99fc6 100644
--- a/www/helpers.js
+++ b/www/helpers.js
@@ -1,44 +1,44 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-var MediaFile = require('./MediaFile');
-
-function wrapMediaFiles(pluginResult) {
- var mediaFiles = [];
- var i;
- for (i = 0; i < pluginResult.length; i++) {
- var mediaFile = new MediaFile();
- mediaFile.name = pluginResult[i].name;
-
- // Backwards compatibility
- mediaFile.localURL = pluginResult[i].localURL || pluginResult[i].fullPath;
- mediaFile.fullPath = pluginResult[i].fullPath;
- mediaFile.type = pluginResult[i].type;
- mediaFile.lastModifiedDate = pluginResult[i].lastModifiedDate;
- mediaFile.size = pluginResult[i].size;
- mediaFiles.push(mediaFile);
- }
- return mediaFiles;
-}
-
-module.exports = {
- wrapMediaFiles: wrapMediaFiles
-};
\ No newline at end of file
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+var MediaFile = require('./MediaFile');
+
+function wrapMediaFiles (pluginResult) {
+ var mediaFiles = [];
+ var i;
+ for (i = 0; i < pluginResult.length; i++) {
+ var mediaFile = new MediaFile();
+ mediaFile.name = pluginResult[i].name;
+
+ // Backwards compatibility
+ mediaFile.localURL = pluginResult[i].localURL || pluginResult[i].fullPath;
+ mediaFile.fullPath = pluginResult[i].fullPath;
+ mediaFile.type = pluginResult[i].type;
+ mediaFile.lastModifiedDate = pluginResult[i].lastModifiedDate;
+ mediaFile.size = pluginResult[i].size;
+ mediaFiles.push(mediaFile);
+ }
+ return mediaFiles;
+}
+
+module.exports = {
+ wrapMediaFiles: wrapMediaFiles
+};
' +
'Status: ' +
- 'img: ![]()
' +
+ 'img1: ![]()
' +
+ 'img2: ![]()
' +
+ 'img3: ![]()
' +
'video: ' +
'
' +
'Expected result: Audio recorder will come up. Press record button to record for 10 seconds. Press Done. Status box will update with audio file and automatically play recording.' +
' ' +
'Expected result: Status box will update with image just taken.' +
+ ' ' +
+ 'Expected result: Status box will update with images just taken.' +
' ' +
'Expected result: Record 10 second video. Status box will update with video file that you can play.' +
' ' +
- 'Expected result: Record 5 second video. Status box will show that URL was resolved and video will get added at the bottom of the status box for playback.';
-
- createActionButton('Capture 10 sec of audio and play', function () {
- getAudio();
- }, 'audio');
-
- createActionButton('Capture 1 image', function () {
- getImage();
- }, 'image');
-
- createActionButton('Capture 10 sec of video', function () {
- getVideo();
- }, 'video');
-
- createActionButton('Capture 5 sec of video and resolve', function () {
- resolveVideo();
- }, 'video_and_resolve');
+ 'Expected result: Record 5 second video. Status box will show that URL was resolved and video will get added at the bottom of the status box for playback.' +
+ ' ' +
+ 'Expected result (iOS only): camera picker and alert with message that camera access is prohibited are shown. The alert has 2 buttons: OK and Settings. By click on "OK" camera is hidden, by pressing Settings it shows privacy settings for the app' +
+ ' ' +
+ 'Expected result (iOS only): camera picker and alert with message that camera access is prohibited are shown. The alert has 2 buttons: OK and Settings. By click on "OK" camera is hidden, by pressing Settings it shows privacy settings for the app';
+
+ createActionButton(
+ 'Capture 10 sec of audio and play',
+ function () {
+ getAudio();
+ },
+ 'audio'
+ );
+
+ createActionButton(
+ 'Capture 1 image',
+ function () {
+ getImage();
+ },
+ 'image'
+ );
+
+ createActionButton(
+ 'Capture 3 images',
+ function () {
+ getImages();
+ },
+ 'images'
+ );
+
+ createActionButton(
+ 'Capture 10 sec of video',
+ function () {
+ getVideo();
+ },
+ 'video'
+ );
+
+ createActionButton(
+ 'Capture 5 sec of video and resolve',
+ function () {
+ resolveVideo();
+ },
+ 'video_and_resolve'
+ );
+
+ createActionButton(
+ 'Disable access to Camera and click to capture video',
+ function () {
+ getVideoPermissionError();
+ },
+ 'prohibited_camera_video'
+ );
+
+ createActionButton(
+ 'Disable access to Camera and click to capture image',
+ function () {
+ getImagePermissionError();
+ },
+ 'prohibited_camera_image'
+ );
};
diff --git a/types/index.d.ts b/types/index.d.ts
new file mode 100644
index 00000000..17f53858
--- /dev/null
+++ b/types/index.d.ts
@@ -0,0 +1,168 @@
+// Type definitions for Apache Cordova MediaCapture plugin
+// Project: https://github.com/apache/cordova-plugin-media-capture
+// Definitions by: Microsoft Open Technologies Inc