Skip to content

solve loop issues in most mobile devices which use HTML audio tag #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kambing86 wants to merge 1 commit into from
Closed

solve loop issues in most mobile devices which use HTML audio tag #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 11 additions & 46 deletions lib/soundjs-NEXT.combined.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ this.createjs = this.createjs || {};
* @type String
* @static
**/
s.buildDate = /*date*/"Mon, 27 Oct 2014 20:40:07 GMT"; // injected by build process
s.buildDate = /*date*/"Wed, 26 Nov 2014 09:43:02 GMT"; // injected by build process

})();
/*
Expand Down Expand Up @@ -4508,18 +4508,6 @@ this.createjs = this.createjs || {};
return this._remainingLoops;
},
set: function(value) {
if (this.tag != null) {
// remove looping
if (this._remainingLoops != 0 && value == 0) {
this.tag.loop = false;
this.tag.removeEventListener(createjs.HTMLAudioPlugin._AUDIO_SEEKED, this.loopHandler, false);
}
// add looping
if (this._remainingLoops == 0 && value != 0) {
this.tag.addEventListener(createjs.HTMLAudioPlugin._AUDIO_SEEKED, this.loopHandler, false);
this.tag.loop = true;
}
}
this._remainingLoops = value;
}
});
Expand All @@ -4535,7 +4523,6 @@ this.createjs = this.createjs || {};
p._readyHandler = null;
p._stalledHandler = null;
p._audioSpriteEndHandler = null;
p.loopHandler = null;

// Constructor
p._init = function (src, startTime, duration, owner) {
Expand All @@ -4552,8 +4539,7 @@ this.createjs = this.createjs || {};
this._endedHandler = createjs.proxy(this._handleSoundComplete, this);
this._readyHandler = createjs.proxy(this._handleSoundReady, this);
this._stalledHandler = createjs.proxy(this._handleSoundStalled, this);
this.__audioSpriteEndHandler = createjs.proxy(this._handleAudioSpriteLoop, this);
this.loopHandler = createjs.proxy(this.handleSoundLoop, this);
this._audioSpriteEndHandler = createjs.proxy(this._handleAudioSpriteLoop, this);
};

p._sendEvent = function (type) {
Expand All @@ -4568,8 +4554,7 @@ this.createjs = this.createjs || {};
this.tag.loop = false;
tag.removeEventListener(createjs.HTMLAudioPlugin._AUDIO_ENDED, this._endedHandler, false);
tag.removeEventListener(createjs.HTMLAudioPlugin._AUDIO_READY, this._readyHandler, false);
tag.removeEventListener(createjs.HTMLAudioPlugin._AUDIO_SEEKED, this.loopHandler, false);
tag.removeEventListener(createjs.HTMLAudioPlugin._TIME_UPDATE, this.__audioSpriteEndHandler, false);
tag.removeEventListener(createjs.HTMLAudioPlugin._TIME_UPDATE, this._audioSpriteEndHandler, false);

try {
tag.currentTime = this._startTime;
Expand Down Expand Up @@ -4650,7 +4635,6 @@ this.createjs = this.createjs || {};
this.playState = createjs.Sound.PLAY_SUCCEEDED;
this.paused = this._paused = false;
this.tag.removeEventListener(createjs.HTMLAudioPlugin._AUDIO_READY, this._readyHandler, false);
this.tag.removeEventListener(createjs.HTMLAudioPlugin._AUDIO_SEEKED, this.loopHandler, false);

if (this._offset >= this.getDuration()) {
this.playFailed();
Expand All @@ -4660,12 +4644,7 @@ this.createjs = this.createjs || {};

if (this._audioSpriteStopTime) {
this.tag.removeEventListener(createjs.HTMLAudioPlugin._AUDIO_ENDED, this._endedHandler, false);
this.tag.addEventListener(createjs.HTMLAudioPlugin._TIME_UPDATE, this.__audioSpriteEndHandler, false);
} else {
if(this._remainingLoops != 0) {
this.tag.addEventListener(createjs.HTMLAudioPlugin._AUDIO_SEEKED, this.loopHandler, false);
this.tag.loop = true;
}
this.tag.addEventListener(createjs.HTMLAudioPlugin._TIME_UPDATE, this._audioSpriteEndHandler, false);
}

this.tag.play();
Expand Down Expand Up @@ -4749,31 +4728,29 @@ this.createjs = this.createjs || {};
if (this.tag == null) {
this._offset = value
} else {
this.tag.removeEventListener(createjs.HTMLAudioPlugin._AUDIO_SEEKED, this.loopHandler, false);
this.tag.addEventListener(createjs.HTMLAudioPlugin._AUDIO_SEEKED, this._handleSetPositionSeek, false);
try {
value = value + this._startTime;
this.tag.currentTime = value * 0.001;
} catch (error) { // Out of range
this._handleSetPositionSeek(null);
return false;
}
}
return true;
};

p._handleSetPositionSeek = function(event) {
if (this.tag == null) { return; }
this.tag.removeEventListener(createjs.HTMLAudioPlugin._AUDIO_SEEKED, this._handleSetPositionSeek, false);
this.tag.addEventListener(createjs.HTMLAudioPlugin._AUDIO_SEEKED, this.loopHandler, false);
};

p.getDuration = function () { // NOTE this will always return 0 until sound has been played unless it is set
return this._duration;
};

p._handleSoundComplete = function (event) {
this._offset = 0;
if (this._remainingLoops != 0) {
this._remainingLoops--;
this.tag.currentTime = this._startTime * 0.001;
if (!this._paused) { this.tag.play(); }
this._sendEvent("loop");
return;
}
this.playState = createjs.Sound.PLAY_FINISHED;
this._cleanUp();
this._sendEvent("complete");
Expand All @@ -4795,18 +4772,6 @@ this.createjs = this.createjs || {};
}
};

// NOTE with this approach audio will loop as reliably as the browser allows
// but we could end up sending the loop event after next loop playback begins
p.handleSoundLoop = function (event) {
this._offset = 0;
this._remainingLoops--;
if(this._remainingLoops == 0) {
this.tag.loop = false;
this.tag.removeEventListener(createjs.HTMLAudioPlugin._AUDIO_SEEKED, this.loopHandler, false);
}
this._sendEvent("loop");
};

p.playFailed = function () {
this.playState = createjs.Sound.PLAY_FAILED;
this._cleanUp();
Expand Down
Loading