Retro/ScriptedAmigaEmulator
Watch
1
0
Fork
You've already forked ScriptedAmigaEmulator
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update 0.9.0

Browse source
This commit is contained in:
Rupert Hausberger 2016-08-02 22:03:47 +02:00
commit 470f65cca4
9 changed files with 104 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sae/amiga.js
View file

@ -586,9 +586,15 @@ function ScriptedAmigaEmulator() {
return SAEE_None;
};
this.mute = function(mute) {
this.audio.mute(mute);
return SAEE_None;
};
this.keyPress = function(e, down) {
this.input.keyPress(e, down);
}
return SAEE_None;
};
/*---------------------------------*/

23
sae/audio.js
View file

@ -54,6 +54,7 @@ function SAEO_Audio() {
const SOUND_SYNC_MULTIPLIER = 1.0;
var scaled_sample_evtime_orig = 0.0;
var muted = false;
var paused = false;
var have_sound = false;
var sound_available = false;
@ -213,6 +214,14 @@ function SAEO_Audio() {
const INV32768 = 1.0 / 32768; /* mul is always fasten than div */
function scaleplay(e, buffer, frames) {
if (muted) {
for (var ch = 0; ch < SAEV_config.audio.channels; ch++) {
var data = e.outputBuffer.getChannelData(ch);
for (var i = 0; i < e.outputBuffer.length; i++)
data[i] = 0.0;
}
return;
}
/*if (driver.context.sampleRate != used_freq) {
} else*/ {
var step = frames / e.outputBuffer.length;
@ -372,6 +381,8 @@ function SAEO_Audio() {
}
function reset_sound() { //reset_sound()
muted = paused = false;
cache.readoffset = 0;
cache.writeoffset = 0;
cache.wait = true;
@ -379,6 +390,10 @@ function SAEO_Audio() {
paula.average.clr();
}
function mute_sound(mute) { //OWN
muted = mute;
}
/*-----------------------------------------------------------------------*/
/*-----------------------------------------------------------------------*/
/*-----------------------------------------------------------------------*/
@ -1457,11 +1472,9 @@ function SAEO_Audio() {
}
this.reset = function() {
var i;
reset_sound();
for (i = 0; i < sound_filter_state.length; i++)
for (var i = 0; i < sound_filter_state.length; i++)
sound_filter_state[i].clr();
for (i = 0; i < AUDIO_CHANNELS_MAX; i++) {
@ -1487,6 +1500,10 @@ function SAEO_Audio() {
resume_sound();
}
this.mute = function(mute) {
mute_sound(mute)
}
/*-----------------------------------------------------------------------*/
var prevcon = -1;

36
sae/cpu.js
View file

@ -10229,39 +10229,3 @@ function SAEO_CPU() {
return true;
}
}

2
sae/utils.js
View file

@ -497,7 +497,7 @@ function SAEF_ZFile_fopen_file(file) {
//SAEF_log("SAEF_ZFile_fopen_file() opening '%s', %d/%d bytes, crc32 0x%08x, magic %08x", l.name, l.size, l.data.length, file.crc32 !== false ? file.crc32 : 0, magic);
if (magic == 0x04034B50 || magic == 0x504B0304)
if (magic == 0x504B0304 || magic == 0x04034B50)
SAEF_fatal(SAEE_Config_Compressed, "A ZIP file was detected. Compressed files are not yet supported.");
//if (l.data[0] == 68 && l.data[1] == 77 && l.data[2] == 83 && l.data[3] == 33) { /* DMS! */