Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-11-16 07:48:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

bleh, we save_item(bool) all over the place and using ints for bools is ugly and C-ish (nw)

Browse source
This commit is contained in:
Alex W. Jackson 2014-10-14 01:53:33 +00:00
parent a7c0827a2b
commit d4a88b5ed7
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/emu/sound/k053260.c
View file

@ -318,14 +318,14 @@ void k053260_device::KDSC_Voice::voice_reset()
m_position = 0;
m_counter = 0;
m_output = 0;
m_playing = 0;
m_playing = false;
m_start = 0;
m_length = 0;
m_pitch = 0;
m_volume = 0;
m_pan = 0;
m_loop = 0;
m_kadpcm = 0;
m_loop = false;
m_kadpcm = false;
update_pan_volume();
}
@ -389,10 +389,10 @@ void k053260_device::KDSC_Voice::key_on()
else
{
m_position = m_kadpcm; // for kadpcm low bit is nybble offset, so must start at 1 due to preincrement
m_position = m_kadpcm ? 1 : 0; // for kadpcm low bit is nybble offset, so must start at 1 due to preincrement
m_counter = 0x1000 - CLOCKS_PER_SAMPLE; // force update on next sound_stream_update
m_output = 0;
m_playing = 1;
m_playing = true;
if (LOG) logerror("K053260: start = %06x, length = %06x, pitch = %04x, vol = %02x, loop = %s, %s\n",
m_start, m_length, m_pitch, m_volume, m_loop ? "yes" : "no", m_kadpcm ? "KADPCM" : "PCM" );
}
@ -402,7 +402,7 @@ void k053260_device::KDSC_Voice::key_off()
{
m_position = 0;
m_output = 0;
m_playing = 0;
m_playing = false;
}
void k053260_device::KDSC_Voice::play(stream_sample_t *outputs)
@ -413,7 +413,7 @@ void k053260_device::KDSC_Voice::play(stream_sample_t *outputs)
{
m_counter = m_counter - 0x1000 + m_pitch;
UINT32 bytepos = ++m_position >> m_kadpcm;
UINT32 bytepos = ++m_position >> ( m_kadpcm ? 1 : 0 );
/*
Yes, _pre_increment. Playback must start 1 byte position after the
start address written to the register, or else ADPCM sounds will
@ -432,7 +432,7 @@ void k053260_device::KDSC_Voice::play(stream_sample_t *outputs)
}
else
{
m_playing = 0;
m_playing = false;
return;
}
}

6
src/emu/sound/k053260.h
View file

@ -89,7 +89,7 @@ private:
UINT16 m_pan_volume[2];
UINT16 m_counter;
INT8 m_output;
UINT8 m_playing;
bool m_playing;
// per voice registers
UINT32 m_start;
@ -99,8 +99,8 @@ private:
// bit packed registers
UINT8 m_pan;
UINT8 m_loop;
UINT8 m_kadpcm;
bool m_loop;
bool m_kadpcm;
} m_voice[4];
friend class k053260_device::KDSC_Voice;