accidentally let a few typos split

This commit is contained in:
mixxmaster 2015-07-01 16:25:28 -04:00
parent d8c5cb2b5e
commit b3268bf0d2

View File

@ -59,7 +59,7 @@
0x18 | x--- ---- | Envelope generator 0 control enable (0 = off, 1 = on)
0x19 | --xx xxxx | Envelope generator 1 parameters
0x19 | x--- ---- | Envelope generator 1 control enable (0 = off, 1 = on)
| |
| |s
0x1c | ---- ---x | All channels enable (0 = off, 1 = on)
0x1c | ---- --x- | Synch & Reset generators
@ -263,24 +263,24 @@ void saa1099_device::sound_stream_update(sound_stream &stream, stream_sample_t *
}
// if the noise is enabled
if (saa->channels[ch].noise_enable)
if (m->channels[ch].noise_enable)
{
// if the noise level is high (noise 0: chan 0-2, noise 1: chan 3-5)
if (saa->noise[ch/3].level & 1)
if (m->noise[ch/3].level & 1)
{
// subtract to avoid overflows, also use only half amplitude
output_l -= saa->channels[ch].amplitude[ LEFT] * saa->channels[ch].envelope[ LEFT] / 16 / 2;
output_r -= saa->channels[ch].amplitude[RIGHT] * saa->channels[ch].envelope[RIGHT] / 16 / 2;
output_l -= m->channels[ch].amplitude[ LEFT] * m->channels[ch].envelope[ LEFT] / 16 / 2;
output_r -= m->channels[ch].amplitude[RIGHT] * m->channels[ch].envelope[RIGHT] / 16 / 2;
}
}
// if the square wave is enabled
if (saa->channels[ch].freq_enable)
if (m->channels[ch].freq_enable)
{
// if the channel level is high
if (saa->channels[ch].level & 1)
if (m->channels[ch].level & 1)
{
output_l += saa->channels[ch].amplitude[ LEFT] * saa->channels[ch].envelope[ LEFT] / 16;
output_r += saa->channels[ch].amplitude[RIGHT] * saa->channels[ch].envelope[RIGHT] / 16;
output_l += m->channels[ch].amplitude[ LEFT] * m->channels[ch].envelope[ LEFT] / 16;
output_r += m->channels[ch].amplitude[RIGHT] * m->channels[ch].envelope[RIGHT] / 16;
}
}
}