CD-i: Add Audio Mixing #14481
CD-i: Add Audio Mixing #14481
Conversation
-cdicdic: Add audio attenuation (fixes [Vincent Halver]
|
Compiling src/mame/philips/cdislavehle.cpp... Also, this is kind of atrocious code. What are you trying to do exactly? |
| offset += 28 * num_samples; | ||
| } | ||
| int16_t sampleL = 0, sampleR = 0, outL = 0, outR = 0; | ||
| for (uint16_t i = 0; i < 18 * 28 * num_samples; i++) { |
| { | ||
| case 0xc0: case 0xc1: case 0xc2: case 0xc3: case 0xc4: case 0xc5: case 0xc6: case 0xc7: | ||
| case 0xc8: case 0xc9: case 0xca: case 0xcb: case 0xcc: case 0xcd: case 0xce: case 0xcf: | ||
| dynamic_cast<cdi_state*>(m_owner)->m_cdic->atten_w(m_in_buf); |
There was a problem hiding this comment.
This is unportable, you should rather provide this communication thru devcb_write8::array<4>.
| int16_t samples[28]; | ||
|
|
||
| switch (coding & (CODING_BPS_MASK | CODING_CHAN_MASK)) | ||
| uint8_t num_samples = coding&CODING_8BPS ? 4 : 8; |
| void cdicdic_device::play_xa_group(const uint8_t coding, const uint8_t *data) | ||
| void cdicdic_device::play_xa_group(const uint8_t coding, const uint8_t *data, const uint16_t idx) | ||
| { | ||
| static const uint16_t s_4bit_header_offsets[8] = { 4, 5, 6, 7, 12, 13, 14, 15 }; |
There was a problem hiding this comment.
Unsure if I originally added these or someone else did, but the s_ prefix is unnecessary, and SHOUTY_CAPS is prefered for constants; something like HEADER_OFFSETS_4BIT et al would be nicer.
|
|
||
| m_dmadac[0]->transfer(0, 1, 1, SECTOR_SIZE/4, samples[0]); | ||
| m_dmadac[1]->transfer(0, 1, 1, SECTOR_SIZE/4, samples[1]); | ||
| m_dmadac[0]->transfer(0, 1, 1, SECTOR_SIZE/4, &m_samples[0][0]); |
There was a problem hiding this comment.
More missing spaces. If the line is being changed anyway, might as well fix the spacing along the way. The whole file could use a sweep for operator-spacing normalization.
| m_atten[0] = ((args[0] & 0x8) << 7) | args[1]; | ||
| m_atten[1] = ((args[0] & 0x4) << 7) | args[2]; | ||
| m_atten[2] = ((args[0] & 0x2) << 7) | args[3]; | ||
| m_atten[3] = ((args[0] & 0x1) << 7) | args[4]; |
There was a problem hiding this comment.
Following on from Kale's comment, it's pretty unlikely that the real hardware connection between the SLAVE and CDIC devices is 20 individual traces for the 20 bits of state represented by args here.
The correct way to do this would be to have atten_w take a single uint8_t, have a private member that increments on each call from 0 to 4 and wrapping around, in order to determine how to apply the incoming byte to the m_atten array. You would then have a devcb_write8 with a public callback-registration function in cdislavehle_device - there are plenty of examples throughout the codebase on how to do this - and then in the machine configuration function for cdi_state::cdimono1_base, do -
m_slave_hle->atten_callback().set(m_cdic, FUNC(cdicdic_device::atten_w));
rather than grabbing into a protected class member in a way that doesn't compile.
There was a problem hiding this comment.
Added a temporary fix to expose the cdic for dynamic casting just so that it compiles so it can be validated it worked. Thanks for the feedback, I'll look into the callback change.
Exposing this variable for dynamic casting.
4 participants
-cdicdic: Add audio attenuation (fixes #12852) [Vincent Halver]