You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by do...@apache.org on 2013/06/25 20:40:44 UTC
android commit: [CB-3998] video duration is an int
Updated Branches:
refs/heads/master 7e15ff930 -> e64ebdfae
[CB-3998] video duration is an int
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e64ebdfa
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e64ebdfa
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e64ebdfa
Branch: refs/heads/master
Commit: e64ebdfaeeadfa679408d4906f06fa73e310d02b
Parents: 7e15ff9
Author: Don Coleman <dc...@chariotsolutions.com>
Authored: Tue Jun 25 00:29:16 2013 -0400
Committer: Don Coleman <do...@apache.org>
Committed: Tue Jun 25 14:35:23 2013 -0400
----------------------------------------------------------------------
framework/src/org/apache/cordova/Capture.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e64ebdfa/framework/src/org/apache/cordova/Capture.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/Capture.java b/framework/src/org/apache/cordova/Capture.java
index 5f737ca..e6e9ece 100644
--- a/framework/src/org/apache/cordova/Capture.java
+++ b/framework/src/org/apache/cordova/Capture.java
@@ -62,7 +62,7 @@ public class Capture extends CordovaPlugin {
private CallbackContext callbackContext; // The callback context from which we were invoked.
private long limit; // the number of pics/vids/clips to take
- private double duration; // optional duration parameter for video recording
+ private int duration; // optional max duration of video recording in seconds
private JSONArray results; // The array of results to be returned to the user
private int numPics; // Number of pictures before capture activity
@@ -80,13 +80,13 @@ public class Capture extends CordovaPlugin {
public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
this.callbackContext = callbackContext;
this.limit = 1;
- this.duration = 0.0f;
+ this.duration = 0;
this.results = new JSONArray();
JSONObject options = args.optJSONObject(0);
if (options != null) {
limit = options.optLong("limit", 1);
- duration = options.optDouble("duration", 0.0f);
+ duration = options.optInt("duration", 0);
}
if (action.equals("getFormatData")) {
@@ -215,10 +215,10 @@ public class Capture extends CordovaPlugin {
/**
* Sets up an intent to capture video. Result handled by onActivityResult()
*/
- private void captureVideo(double duration) {
+ private void captureVideo(int duration) {
Intent intent = new Intent(android.provider.MediaStore.ACTION_VIDEO_CAPTURE);
- if(Build.VERSION.SDK_INT > 8){
+ if(Build.VERSION.SDK_INT > 7){
intent.putExtra("android.intent.extra.durationLimit", duration);
}
this.cordova.startActivityForResult((CordovaPlugin) this, intent, CAPTURE_VIDEO);