You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2015/07/10 21:20:14 UTC
[9/9] cordova-plugin-media git commit: resolved conflicts,
added manual test button to change audio playback rate.
resolved conflicts, added manual test button to change audio playback rate.
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/9175d5d3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/9175d5d3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/9175d5d3
Branch: refs/heads/master
Commit: 9175d5d322d6e603a4c8531a197d3f0d67fa50d0
Parents: 66d0f27
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Fri Jul 10 12:19:37 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Fri Jul 10 12:19:37 2015 -0700
----------------------------------------------------------------------
tests/tests.js | 54 ++++++++++++++++++++++++++---------------------------
1 file changed, 26 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/9175d5d3/tests/tests.js
----------------------------------------------------------------------
diff --git a/tests/tests.js b/tests/tests.js
index 0e98b72..a2b427f 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -199,35 +199,10 @@ exports.defineAutoTests = function () {
}
});
-<<<<<<< HEAD
it("media.spec.16 position should be set properly", function (done) {
// no audio hardware available
if (!isAudioSupported) {
pending();
-=======
- it("media.spec.17 duration should be set properly", function (done) {
- if (cordova.platformId === 'blackberry10') {
- expect(true).toFailWithMessage('Platform does not supported this feature');
- done();
- return
- }
- var mediaFile = 'http://cordova.apache.org/downloads/BlueZedEx.mp3',
- mediaState = Media.MEDIA_STOPPED,
- successCallback,
- flag = true,
- statusChange = function (statusCode) {
- if (statusCode == Media.MEDIA_RUNNING && flag) {
- //flag variable used to ensure an extra security statement to ensure that the callback is processed only once,
- //in case for some reason the statusChange callback is reached more than one time with the same status code.
- //Some information about this kind of behavior it can be found at JIRA: CB-7099.
- flag = false;
- setTimeout(function () {
- expect(media1.getDuration()).toBeGreaterThan(0.0);
- media1.stop();
- media1.release();
- done();
- }, 1000);
->>>>>>> 062221e90883db49da05ad75f322ccea33433468
}
//context variable used as an extra security statement to ensure that the callback is processed only once,
@@ -294,8 +269,8 @@ exports.defineAutoTests = function () {
it("media.spec.19 playback rate should be set properly using setRate", function (done) {
if (cordova.platformId !== 'ios') {
expect(true).toFailWithMessage('Platform does not supported this feature');
- done();
- return
+ pending();
+ return;
}
var mediaFile = 'http://cordova.apache.org/downloads/BlueZedEx.mp3',
mediaState = Media.MEDIA_STOPPED,
@@ -545,7 +520,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
function recordAudio() {
console.log("recordAudio()");
console.log(" -- media=" + mediaRec);
- if (mediaRec == null) {
+ if (!mediaRec) {
var src = recordSrc;
mediaRec = new Media(src,
function () {
@@ -776,6 +751,14 @@ exports.defineManualTests = function (contentEl, createActionButton) {
row : 2,
cell : 2
}
+ }, {
+ id: "halfSpeedBtn",
+ content:"",
+ tag:"div",
+ position:{
+ row:0,
+ cell:2
+ }
}
],
elementsRecord =
@@ -835,6 +818,21 @@ exports.defineManualTests = function (contentEl, createActionButton) {
createActionButton('Pause', function () {
pauseAudio();
}, 'pauseBtn');
+ createActionButton('HalfSpeed', function() {
+
+ if(halfSpeedBtn.firstChild.firstChild.innerText == 'HalfSpeed') {
+ halfSpeedBtn.firstChild.firstChild.innerText = 'FullSpeed';
+ media1.setRate(0.5);
+ }
+ else if(halfSpeedBtn.firstChild.firstChild.innerText == 'FullSpeed') {
+ halfSpeedBtn.firstChild.firstChild.innerText = 'DoubleSpeed';
+ media1.setRate(1.0);
+ }
+ else {
+ halfSpeedBtn.firstChild.firstChild.innerText = 'HalfSpeed';
+ media1.setRate(2.0);
+ }
+ }, 'halfSpeedBtn');
createActionButton('Stop', function () {
stopAudio();
}, 'stopBtn');
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org