From 106dd0948a2eea07d3a60909924ccb3371cdf950 Mon Sep 17 00:00:00 2001 From: Frank Owusu Date: Wed, 20 Dec 2017 04:45:05 +0000 Subject: [PATCH 1/3] Added src change to method to Media object New method to change node src when change audio src, best for playing multiple files/url Release method now unset node src to empty to cancel ongoing network request before collecting garbage --- www/browser/Media.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/www/browser/Media.js b/www/browser/Media.js index 633e425fa..3b12ced39 100644 --- a/www/browser/Media.js +++ b/www/browser/Media.js @@ -108,7 +108,9 @@ Media.MEDIA_STARTING = 1; Media.MEDIA_RUNNING = 2; Media.MEDIA_PAUSED = 3; Media.MEDIA_STOPPED = 4; -Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped"]; +Media.MEDIA_CHANGED = 5; + +Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped", "Changed"]; /** * Start or resume playing audio file. @@ -185,6 +187,21 @@ Media.prototype.getCurrentPosition = function(success, fail) { } }; +/** +* Change src of audio +*/ +Media.prototype.changeSrc = function(src){ + if(this.node){ + try{ + this.node.pause(); + this.node.src = src; + Media.onStatus(this.id, Media.MEDIA_STATE, Media.MEDIA_CHANGED); + }catch(err){ + Media.onStatus(this.id, Media.MEDIA_ERROR, err); + } + } +} + /** * Start recording audio file. */ @@ -232,6 +249,7 @@ Media.prototype.setRate = function() { */ Media.prototype.release = function() { try { + this.node.src = ""; delete this.node; } catch (err) { Media.onStatus(this.id, Media.MEDIA_ERROR, err); From 3d1a04be19c0aec8bcfe7ba9d84ae4d228f94301 Mon Sep 17 00:00:00 2001 From: Jan Piotrowski Date: Mon, 1 Oct 2018 22:05:40 +0200 Subject: [PATCH 2/3] add missing semicolon --- www/browser/Media.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/browser/Media.js b/www/browser/Media.js index 3b12ced39..ff8ebd534 100644 --- a/www/browser/Media.js +++ b/www/browser/Media.js @@ -200,7 +200,7 @@ Media.prototype.changeSrc = function(src){ Media.onStatus(this.id, Media.MEDIA_ERROR, err); } } -} +};ad /** * Start recording audio file. From fd40b68a70b356aa6184f5578f72349bd8637a60 Mon Sep 17 00:00:00 2001 From: Jan Piotrowski Date: Mon, 1 Oct 2018 22:25:26 +0200 Subject: [PATCH 3/3] oops --- www/browser/Media.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/browser/Media.js b/www/browser/Media.js index ff8ebd534..e1e9f32b2 100644 --- a/www/browser/Media.js +++ b/www/browser/Media.js @@ -200,7 +200,7 @@ Media.prototype.changeSrc = function(src){ Media.onStatus(this.id, Media.MEDIA_ERROR, err); } } -};ad +}; /** * Start recording audio file.