6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-15 14:27:29 +00:00
Code Issues Projects Releases Wiki Activity

Advance DMA pointer, treat audio as signed, request data on low -> high transition.

Browse Source 
There's now some audio, sometimes when there should be. But it's not correct.
This commit is contained in:
Thomas Harte
2021-12-01 18:34:54 -05:00
parent d23511860d
commit 06340b1ad7
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Machines/Amiga/Audio.cpp
View File

@@ -30,9 +30,10 @@ Audio::Audio(Chipset &chipset, uint16_t *ram, size_t word_size, float output_rat
bool Audio::advance_dma(int channel) { bool Audio::advance_dma(int channel) {
switch(channels_[channel].state) { switch(channels_[channel].state) {
case Channel::State::WaitingForDMA: default:
if(!channels_[channel].has_data) { if(!channels_[channel].has_data) {
set_data(channel, ram_[pointer_[size_t(channel)]]); set_data(channel, ram_[pointer_[size_t(channel)]]);
++pointer_[size_t(channel)];
return true; return true;
} }
break; break;
@@ -43,8 +44,6 @@ bool Audio::advance_dma(int channel) {
return true; return true;
} }
break; break;
default: break;
} }
return false; return false;
@@ -108,12 +107,16 @@ void Audio::output() {
} }
buffer_[buffer_pointer_][sample_pointer_] = int16_t( buffer_[buffer_pointer_][sample_pointer_] = int16_t(
(channels_[0].output_level * channels_[0].output_enabled + (
channels_[2].output_level * channels_[2].output_enabled) << 7 int8_t(channels_[0].output_level) * channels_[0].output_enabled +
int8_t(channels_[2].output_level) * channels_[2].output_enabled
) << 7
); );
buffer_[buffer_pointer_][sample_pointer_+1] = int16_t( buffer_[buffer_pointer_][sample_pointer_+1] = int16_t(
(channels_[1].output_level * channels_[1].output_enabled + (
channels_[3].output_level * channels_[3].output_enabled) << 7 int8_t(channels_[1].output_level) * channels_[1].output_enabled +
int8_t(channels_[3].output_level) * channels_[3].output_enabled
) << 7
); );
sample_pointer_ += 2; sample_pointer_ += 2;
@@ -464,6 +467,9 @@ template <> bool Audio::Channel::transit<
if(!dma_enabled) { if(!dma_enabled) {
return true; return true;
} else {
data_latch = data; // i.e. pbufld2
has_data = false; // AUDxDR
} }
if(dma_enabled && will_request_interrupt) { if(dma_enabled && will_request_interrupt) {