You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/10/28 23:13:06 UTC
[1/7] git commit: [CB-4847] iOS 7 microphone access requires user
permission - if denied, CDVCapture, CDVSound does not handle it properly
Updated Branches:
refs/heads/dev d592158d8 -> 5784fdaa8
[CB-4847] iOS 7 microphone access requires user permission - if denied, CDVCapture, CDVSound does not handle it properly
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/0259d766
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/0259d766
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/0259d766
Branch: refs/heads/dev
Commit: 0259d766615724531a961058b591bc5903fc6c68
Parents: b5f24d7
Author: Shazron Abdullah <sh...@apache.org>
Authored: Mon Sep 16 16:43:50 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Mon Sep 16 16:43:50 2013 -0700
----------------------------------------------------------------------
src/ios/CDVSound.m | 117 +++++++++++++++++++++++++++++-------------------
1 file changed, 72 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/0259d766/src/ios/CDVSound.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVSound.m b/src/ios/CDVSound.m
index 5e9fd25..17ead13 100644
--- a/src/ios/CDVSound.m
+++ b/src/ios/CDVSound.m
@@ -527,64 +527,91 @@
NSString* mediaId = [command.arguments objectAtIndex:0];
CDVAudioFile* audioFile = [self audioFileForResource:[command.arguments objectAtIndex:1] withId:mediaId doValidation:YES forRecording:YES];
- NSString* jsString = nil;
- NSString* errorMsg = @"";
+ __block NSString* jsString = nil;
+ __block NSString* errorMsg = @"";
if ((audioFile != nil) && (audioFile.resourceURL != nil)) {
- NSError* __autoreleasing error = nil;
-
- if (audioFile.recorder != nil) {
- [audioFile.recorder stop];
- audioFile.recorder = nil;
- }
- // get the audioSession and set the category to allow recording when device is locked or ring/silent switch engaged
- if ([self hasAudioSession]) {
- [self.avSession setCategory:AVAudioSessionCategoryRecord error:nil];
- if (![self.avSession setActive:YES error:&error]) {
- // other audio with higher priority that does not allow mixing could cause this to fail
- errorMsg = [NSString stringWithFormat:@"Unable to record audio: %@", [error localizedFailureReason]];
- // jsString = [NSString stringWithFormat: @"%@(\"%@\",%d,%d);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_ERROR, MEDIA_ERR_ABORTED];
- jsString = [NSString stringWithFormat:@"%@(\"%@\",%d,%@);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_ERROR, [self createMediaErrorWithCode:MEDIA_ERR_ABORTED message:errorMsg]];
- [self.commandDelegate evalJs:jsString];
- return;
+ void (^startRecording)(void) = ^{
+ NSError* __autoreleasing error = nil;
+
+ if (audioFile.recorder != nil) {
+ [audioFile.recorder stop];
+ audioFile.recorder = nil;
}
- }
-
- // create a new recorder for each start record
- audioFile.recorder = [[CDVAudioRecorder alloc] initWithURL:audioFile.resourceURL settings:nil error:&error];
-
- bool recordingSuccess = NO;
- if (error == nil) {
- audioFile.recorder.delegate = self;
- audioFile.recorder.mediaId = mediaId;
- recordingSuccess = [audioFile.recorder record];
- if (recordingSuccess) {
- NSLog(@"Started recording audio sample '%@'", audioFile.resourcePath);
- jsString = [NSString stringWithFormat:@"%@(\"%@\",%d,%d);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_STATE, MEDIA_RUNNING];
+ // get the audioSession and set the category to allow recording when device is locked or ring/silent switch engaged
+ if ([self hasAudioSession]) {
+ [self.avSession setCategory:AVAudioSessionCategoryRecord error:nil];
+ if (![self.avSession setActive:YES error:&error]) {
+ // other audio with higher priority that does not allow mixing could cause this to fail
+ errorMsg = [NSString stringWithFormat:@"Unable to record audio: %@", [error localizedFailureReason]];
+ // jsString = [NSString stringWithFormat: @"%@(\"%@\",%d,%d);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_ERROR, MEDIA_ERR_ABORTED];
+ jsString = [NSString stringWithFormat:@"%@(\"%@\",%d,%@);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_ERROR, [self createMediaErrorWithCode:MEDIA_ERR_ABORTED message:errorMsg]];
+ [self.commandDelegate evalJs:jsString];
+ return;
+ }
}
- }
-
- if ((error != nil) || (recordingSuccess == NO)) {
- if (error != nil) {
- errorMsg = [NSString stringWithFormat:@"Failed to initialize AVAudioRecorder: %@\n", [error localizedFailureReason]];
- } else {
- errorMsg = @"Failed to start recording using AVAudioRecorder";
+
+ // create a new recorder for each start record
+ audioFile.recorder = [[CDVAudioRecorder alloc] initWithURL:audioFile.resourceURL settings:nil error:&error];
+
+ bool recordingSuccess = NO;
+ if (error == nil) {
+ audioFile.recorder.delegate = self;
+ audioFile.recorder.mediaId = mediaId;
+ recordingSuccess = [audioFile.recorder record];
+ if (recordingSuccess) {
+ NSLog(@"Started recording audio sample '%@'", audioFile.resourcePath);
+ jsString = [NSString stringWithFormat:@"%@(\"%@\",%d,%d);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_STATE, MEDIA_RUNNING];
+ }
}
- audioFile.recorder = nil;
- if (self.avSession) {
- [self.avSession setActive:NO error:nil];
+
+ if ((error != nil) || (recordingSuccess == NO)) {
+ if (error != nil) {
+ errorMsg = [NSString stringWithFormat:@"Failed to initialize AVAudioRecorder: %@\n", [error localizedFailureReason]];
+ } else {
+ errorMsg = @"Failed to start recording using AVAudioRecorder";
+ }
+ audioFile.recorder = nil;
+ if (self.avSession) {
+ [self.avSession setActive:NO error:nil];
+ }
+ jsString = [NSString stringWithFormat:@"%@(\"%@\",%d,%@);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_ERROR, [self createMediaErrorWithCode:MEDIA_ERR_ABORTED message:errorMsg]];
}
- jsString = [NSString stringWithFormat:@"%@(\"%@\",%d,%@);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_ERROR, [self createMediaErrorWithCode:MEDIA_ERR_ABORTED message:errorMsg]];
+ if (jsString) {
+ [self.commandDelegate evalJs:jsString];
+ }
+ };
+
+ SEL rrpSel = NSSelectorFromString(@"requestRecordPermission:");
+ if ([self hasAudioSession] && [self.avSession respondsToSelector:rrpSel])
+ {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+ [self.avSession performSelector:rrpSel withObject:^(BOOL granted){
+ if (granted) {
+ startRecording();
+ } else {
+ NSString* msg = @"Error creating audio session, microphone permission denied.";
+ NSLog(@"%@", msg);
+ audioFile.recorder = nil;
+ if (self.avSession) {
+ [self.avSession setActive:NO error:nil];
+ }
+ jsString = [NSString stringWithFormat:@"%@(\"%@\",%d,%@);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_ERROR, [self createMediaErrorWithCode:MEDIA_ERR_ABORTED message:msg]];
+ [self.commandDelegate evalJs:jsString];
+ }
+ }];
+#pragma clang diagnostic pop
+ } else {
+ startRecording();
}
+
} else {
// file did not validate
NSString* errorMsg = [NSString stringWithFormat:@"Could not record audio at '%@'", audioFile.resourcePath];
jsString = [NSString stringWithFormat:@"%@(\"%@\",%d,%@);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_ERROR, [self createMediaErrorWithCode:MEDIA_ERR_ABORTED message:errorMsg]];
- }
- if (jsString) {
[self.commandDelegate evalJs:jsString];
}
- return;
}
- (void)stopRecordingAudio:(CDVInvokedUrlCommand*)command
[7/7] git commit: CB-5188:
Posted by st...@apache.org.
CB-5188:
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/5784fdaa
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/5784fdaa
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/5784fdaa
Branch: refs/heads/dev
Commit: 5784fdaa8eaa7fb1ae23f7fb05c1673bd48deb02
Parents: a309eba
Author: Steven Gill <st...@gmail.com>
Authored: Mon Oct 28 12:27:16 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Oct 28 12:27:16 2013 -0700
----------------------------------------------------------------------
plugin.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/5784fdaa/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 47231bf..64aef0f 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,7 +3,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.media"
- version="0.2.5">
+ version="0.2.6-dev">
<name>Media</name>
<description>Cordova Media Plugin</description>
<license>Apache 2.0</license>
[3/7] git commit: Merge branch 'dev'
Posted by st...@apache.org.
Merge branch 'dev'
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/6de7e53f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/6de7e53f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/6de7e53f
Branch: refs/heads/dev
Commit: 6de7e53f40be0160dff9789e98ad664574ca6ff4
Parents: 29d8c38 9fdbb3e
Author: Steven Gill <st...@gmail.com>
Authored: Wed Sep 25 18:18:38 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Sep 25 18:18:38 2013 -0700
----------------------------------------------------------------------
CHANGELOG.md | 25 -------
RELEASENOTES.md | 37 ++++++++++
plugin.xml | 5 +-
src/android/AudioHandler.java | 1 -
src/android/AudioPlayer.java | 38 +++++-----
src/android/FileHelper.java | 38 ++++++++++
src/ios/CDVSound.m | 148 +++++++++++++++++++++----------------
src/windows8/MediaProxy.js | 6 +-
8 files changed, 186 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
[6/7] git commit: Merge branch 'dev'
Posted by st...@apache.org.
Merge branch 'dev'
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/a309eba0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/a309eba0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/a309eba0
Branch: refs/heads/dev
Commit: a309eba0102d4000bd9ed5dcc1f2819f920ec43b
Parents: 9ea403d 7c96534
Author: Steven Gill <st...@gmail.com>
Authored: Mon Oct 28 12:13:54 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Oct 28 12:13:54 2013 -0700
----------------------------------------------------------------------
RELEASENOTES.md | 6 +++++-
plugin.xml | 4 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/7] git commit: Revert "[CB-4847] iOS 7 microphone access requires
user permission - if denied, CDVCapture, CDVSound does not handle it properly"
Posted by st...@apache.org.
Revert "[CB-4847] iOS 7 microphone access requires user permission - if denied, CDVCapture, CDVSound does not handle it properly"
This reverts commit 0259d766615724531a961058b591bc5903fc6c68.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/29d8c381
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/29d8c381
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/29d8c381
Branch: refs/heads/dev
Commit: 29d8c381255c92d2b8b8d70e292b018ff0e3c3f5
Parents: 0259d76
Author: Shazron Abdullah <sh...@apache.org>
Authored: Mon Sep 16 17:22:25 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Mon Sep 16 17:22:25 2013 -0700
----------------------------------------------------------------------
src/ios/CDVSound.m | 117 +++++++++++++++++++-----------------------------
1 file changed, 45 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/29d8c381/src/ios/CDVSound.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVSound.m b/src/ios/CDVSound.m
index 17ead13..5e9fd25 100644
--- a/src/ios/CDVSound.m
+++ b/src/ios/CDVSound.m
@@ -527,91 +527,64 @@
NSString* mediaId = [command.arguments objectAtIndex:0];
CDVAudioFile* audioFile = [self audioFileForResource:[command.arguments objectAtIndex:1] withId:mediaId doValidation:YES forRecording:YES];
- __block NSString* jsString = nil;
- __block NSString* errorMsg = @"";
+ NSString* jsString = nil;
+ NSString* errorMsg = @"";
if ((audioFile != nil) && (audioFile.resourceURL != nil)) {
- void (^startRecording)(void) = ^{
- NSError* __autoreleasing error = nil;
-
- if (audioFile.recorder != nil) {
- [audioFile.recorder stop];
- audioFile.recorder = nil;
- }
- // get the audioSession and set the category to allow recording when device is locked or ring/silent switch engaged
- if ([self hasAudioSession]) {
- [self.avSession setCategory:AVAudioSessionCategoryRecord error:nil];
- if (![self.avSession setActive:YES error:&error]) {
- // other audio with higher priority that does not allow mixing could cause this to fail
- errorMsg = [NSString stringWithFormat:@"Unable to record audio: %@", [error localizedFailureReason]];
- // jsString = [NSString stringWithFormat: @"%@(\"%@\",%d,%d);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_ERROR, MEDIA_ERR_ABORTED];
- jsString = [NSString stringWithFormat:@"%@(\"%@\",%d,%@);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_ERROR, [self createMediaErrorWithCode:MEDIA_ERR_ABORTED message:errorMsg]];
- [self.commandDelegate evalJs:jsString];
- return;
- }
- }
-
- // create a new recorder for each start record
- audioFile.recorder = [[CDVAudioRecorder alloc] initWithURL:audioFile.resourceURL settings:nil error:&error];
-
- bool recordingSuccess = NO;
- if (error == nil) {
- audioFile.recorder.delegate = self;
- audioFile.recorder.mediaId = mediaId;
- recordingSuccess = [audioFile.recorder record];
- if (recordingSuccess) {
- NSLog(@"Started recording audio sample '%@'", audioFile.resourcePath);
- jsString = [NSString stringWithFormat:@"%@(\"%@\",%d,%d);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_STATE, MEDIA_RUNNING];
- }
- }
-
- if ((error != nil) || (recordingSuccess == NO)) {
- if (error != nil) {
- errorMsg = [NSString stringWithFormat:@"Failed to initialize AVAudioRecorder: %@\n", [error localizedFailureReason]];
- } else {
- errorMsg = @"Failed to start recording using AVAudioRecorder";
- }
- audioFile.recorder = nil;
- if (self.avSession) {
- [self.avSession setActive:NO error:nil];
- }
+ NSError* __autoreleasing error = nil;
+
+ if (audioFile.recorder != nil) {
+ [audioFile.recorder stop];
+ audioFile.recorder = nil;
+ }
+ // get the audioSession and set the category to allow recording when device is locked or ring/silent switch engaged
+ if ([self hasAudioSession]) {
+ [self.avSession setCategory:AVAudioSessionCategoryRecord error:nil];
+ if (![self.avSession setActive:YES error:&error]) {
+ // other audio with higher priority that does not allow mixing could cause this to fail
+ errorMsg = [NSString stringWithFormat:@"Unable to record audio: %@", [error localizedFailureReason]];
+ // jsString = [NSString stringWithFormat: @"%@(\"%@\",%d,%d);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_ERROR, MEDIA_ERR_ABORTED];
jsString = [NSString stringWithFormat:@"%@(\"%@\",%d,%@);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_ERROR, [self createMediaErrorWithCode:MEDIA_ERR_ABORTED message:errorMsg]];
- }
- if (jsString) {
[self.commandDelegate evalJs:jsString];
+ return;
+ }
+ }
+
+ // create a new recorder for each start record
+ audioFile.recorder = [[CDVAudioRecorder alloc] initWithURL:audioFile.resourceURL settings:nil error:&error];
+
+ bool recordingSuccess = NO;
+ if (error == nil) {
+ audioFile.recorder.delegate = self;
+ audioFile.recorder.mediaId = mediaId;
+ recordingSuccess = [audioFile.recorder record];
+ if (recordingSuccess) {
+ NSLog(@"Started recording audio sample '%@'", audioFile.resourcePath);
+ jsString = [NSString stringWithFormat:@"%@(\"%@\",%d,%d);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_STATE, MEDIA_RUNNING];
}
- };
-
- SEL rrpSel = NSSelectorFromString(@"requestRecordPermission:");
- if ([self hasAudioSession] && [self.avSession respondsToSelector:rrpSel])
- {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
- [self.avSession performSelector:rrpSel withObject:^(BOOL granted){
- if (granted) {
- startRecording();
- } else {
- NSString* msg = @"Error creating audio session, microphone permission denied.";
- NSLog(@"%@", msg);
- audioFile.recorder = nil;
- if (self.avSession) {
- [self.avSession setActive:NO error:nil];
- }
- jsString = [NSString stringWithFormat:@"%@(\"%@\",%d,%@);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_ERROR, [self createMediaErrorWithCode:MEDIA_ERR_ABORTED message:msg]];
- [self.commandDelegate evalJs:jsString];
- }
- }];
-#pragma clang diagnostic pop
- } else {
- startRecording();
}
+ if ((error != nil) || (recordingSuccess == NO)) {
+ if (error != nil) {
+ errorMsg = [NSString stringWithFormat:@"Failed to initialize AVAudioRecorder: %@\n", [error localizedFailureReason]];
+ } else {
+ errorMsg = @"Failed to start recording using AVAudioRecorder";
+ }
+ audioFile.recorder = nil;
+ if (self.avSession) {
+ [self.avSession setActive:NO error:nil];
+ }
+ jsString = [NSString stringWithFormat:@"%@(\"%@\",%d,%@);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_ERROR, [self createMediaErrorWithCode:MEDIA_ERR_ABORTED message:errorMsg]];
+ }
} else {
// file did not validate
NSString* errorMsg = [NSString stringWithFormat:@"Could not record audio at '%@'", audioFile.resourcePath];
jsString = [NSString stringWithFormat:@"%@(\"%@\",%d,%@);", @"cordova.require('org.apache.cordova.core.AudioHandler.Media').onStatus", mediaId, MEDIA_ERROR, [self createMediaErrorWithCode:MEDIA_ERR_ABORTED message:errorMsg]];
+ }
+ if (jsString) {
[self.commandDelegate evalJs:jsString];
}
+ return;
}
- (void)stopRecordingAudio:(CDVInvokedUrlCommand*)command
[5/7] git commit: [CB-5188] Updated version and RELEASENOTES.md for
release 0.2.5
Posted by st...@apache.org.
[CB-5188] Updated version and RELEASENOTES.md for release 0.2.5
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/7c965343
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/7c965343
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/7c965343
Branch: refs/heads/dev
Commit: 7c9653431f92e5a90a676ea9e1bdd06e2790350a
Parents: d592158
Author: Steven Gill <st...@gmail.com>
Authored: Mon Oct 28 12:04:51 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Oct 28 12:04:51 2013 -0700
----------------------------------------------------------------------
RELEASENOTES.md | 6 +++++-
plugin.xml | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/7c965343/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2c5b2b2..fa4e610 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -38,4 +38,8 @@
### 0.2.4 (Oct 9, 2013)
* [CB-4928] plugin-media doesn't load on windows8
-* [CB-4915] Incremented plugin version on dev branch.
\ No newline at end of file
+* [CB-4915] Incremented plugin version on dev branch.
+
+### 0.2.5 (Oct 28, 2013)
+* CB-5128: add repo + issue tag to plugin.xml for media plugin
+* [CB-5010] Incremented plugin version on dev branch.
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/7c965343/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 411f146..47231bf 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,7 +3,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.media"
- version="0.2.5-dev">
+ version="0.2.5">
<name>Media</name>
<description>Cordova Media Plugin</description>
<license>Apache 2.0</license>
[4/7] git commit: Merge branch 'dev'
Posted by st...@apache.org.
Merge branch 'dev'
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/9ea403d4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/9ea403d4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/9ea403d4
Branch: refs/heads/dev
Commit: 9ea403d413a22f8c75e9bc0312c8651e467f65a9
Parents: 6de7e53 e04381e
Author: Steven Gill <st...@gmail.com>
Authored: Wed Oct 9 15:45:41 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Oct 9 15:45:41 2013 -0700
----------------------------------------------------------------------
RELEASENOTES.md | 4 ++++
plugin.xml | 2 +-
src/windows8/MediaProxy.js | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------