Michel2/emularity
1
0
Fork 0
mirror of https://github.com/db48x/emularity.git synced 2026-07-27 19:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix up muting and unmuting, and wire it up to mute/unmute SAE correctly

Browse Source
This commit is contained in:
Daniel Brooks
2016-08-07 18:15:59 -07:00
parent f1d99848e5
commit 9a3ec6fe64
2 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.be/2363771f-d1db-495b-a6b7-259458ee6316/bugs/4fb5dd86-10cd-4bb9-96d3-a884c494d705/values
+1 -1
View File
@@ -26,7 +26,7 @@
"status": "open",
"status": "fixed",
loader.js
+56 -10
View File
@@ -633,6 +633,28 @@ var Module = null;
this._sae.stop();
}
SAERunner.prototype.mute = function () {
var err = this._sae.mute(true);
if (err) {
console.warn("unable to mute; SAE error number", err)
}
}
SAERunner.prototype.unmute = function () {
var err = this._sae.mute(false);
if (err) {
console.warn("unable to unmute; SAE error number", err)
}
}
SAERunner.prototype.onStarted = function (func) {
this._cfg.hook.event.started = func;
};
SAERunner.prototype.onReset = function (func) {
this._cfg.hook.event.reseted = func;
};
/**
* Emulator
*/
@@ -657,14 +679,31 @@ var Module = null;
table: null,
splashimg: new Image() };
var runner;
var muted = false;
var SDL_PauseAudio;
this.mute = function (state) {
try {
if (!SDL_PauseAudio)
SDL_PauseAudio = Module.cwrap('SDL_PauseAudio', '', ['number']);
SDL_PauseAudio(state);
} catch (x) {
console.log("Unable to change audio state:", x);
this.isMuted = function () { return muted; }
this.mute = function () { return this.setMute(true); }
this.unmute = function () { return this.setMute(false); }
this.toggleMute = function () { return this.setMute(!muted); }
this.setMute = function (state) {
muted = state;
if (runner) {
if (state) {
runner.mute();
} else {
runner.unmute();
}
}
else {
try {
if (!SDL_PauseAudio)
SDL_PauseAudio = Module.cwrap('SDL_PauseAudio', '', ['number']);
SDL_PauseAudio(state);
} catch (x) {
console.log("Unable to change audio state:", x);
}
}
return this;
};
@@ -921,11 +960,18 @@ var Module = null;
return null;
}
if ("runner" in game_data) {
var runner = new game_data.runner(canvas, game_data);
runner = new game_data.runner(canvas, game_data);
resizeCanvas(canvas, 1, game_data.nativeResolution, game_data.aspectRatio);
runner.onStarted(function () {
splash.finished_loading = true;
splash.hide();
});
runner.onReset(function () {
if (muted) {
runner.mute();
}
});
runner.start();
splash.finished_loading = true;
splash.hide();
}
});
return this;