Skip to content
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

firefox Audio() is deprecated #1

Open
wants to merge 1 commit into
base: sidengine
Choose a base branch
from
Open

firefox Audio() is deprecated #1

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
30 changes: 1 addition & 29 deletions audioplayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,6 @@ function AudioPlayer(opts) {
AudioPlayer.mode = Object.freeze({ firefox:{}, webkit:{}, flash:{} });

AudioPlayer.prototype.detectMode = function() {
var audioElement = new Audio();
if (audioElement.mozSetup) {
this.mode = AudioPlayer.mode.firefox;
this.audioElement = audioElement;
audioElement.mozSetup(2, this.sampleRate); /* channels, sample rate */
// other vars related to this backend
this.buffer = []; /* data generated but not yet written */
this.minBufferLength = this.latency * 2 * this.sampleRate; /* refill buffer when there are only this many elements remaining */
this.bufferFillLength = Math.floor(this.latency * this.sampleRate);
return this.mode;
}
var webkitAudio = window.AudioContext || window.webkitAudioContext;
if (webkitAudio) {
this.mode = AudioPlayer.mode.webkit;
Expand Down Expand Up @@ -62,11 +51,8 @@ AudioPlayer.prototype.stop = function() {

AudioPlayer.prototype.start = function() {
switch (this.mode) {
case AudioPlayer.mode.firefox:
this.firefoxCheckBuffer();
break;
case AudioPlayer.mode.webkit:
this.node = this.webkitAudioContext.createJavaScriptNode(this.bufferSize, 0, this.channelCount);
this.node = this.webkitAudioContext.createScriptProcessor(this.bufferSize, 0, this.channelCount);
var that = this;
this.node.onaudioprocess = function(e) { that.webkitProcess(e) };
// start
Expand All @@ -79,20 +65,6 @@ AudioPlayer.prototype.start = function() {
}
}

AudioPlayer.prototype.firefoxCheckBuffer = function() {
if (this.buffer.length) {
var written = this.audioElement.mozWriteAudio(this.buffer);
this.buffer = this.buffer.slice(written);
}
if (this.buffer.length < this.minBufferLength && !this.generator.finished) {
this.buffer = this.buffer.concat(this.generator.generate(this.bufferFillLength));
}
if (!this.requestStop && (!this.generator.finished || this.buffer.length)) {
var that = this;
setTimeout(function() { that.firefoxCheckBuffer() }, this.checkInterval);
}
}

AudioPlayer.prototype.webkitProcess = function(e) {
if (this.generator.finished) {
this.node.disconnect();
Expand Down