6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-29 12:50:28 +00:00
Code Issues Projects Releases Wiki Activity

Corrects Apple II output audio.

Browse Source
This commit is contained in:
Thomas Harte 2018-04-21 14:56:50 -07:00
parent 0a0d81cd5a
commit 5968c9a391
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Components/AudioToggle/AudioToggle.hpp
View File

@ -29,9 +29,12 @@ class Toggle: public Outputs::Speaker::SampleSource {
bool get_output(); bool get_output();
private: private:
// Accessed on the calling thread.
bool is_enabled_ = false; bool is_enabled_ = false;
int16_t level_ = 0, volume_ = 0;
Concurrency::DeferringAsyncTaskQueue &audio_queue_; Concurrency::DeferringAsyncTaskQueue &audio_queue_;
// Accessed on the audio thread.
int16_t level_ = 0, volume_ = 0;
}; };
} }

5
Machines/AppleII/AppleII.cpp
View File

@ -51,8 +51,9 @@ class ConcreteMachine:
void update_video() { void update_video() {
video_->run_for(cycles_since_video_update_.flush()); video_->run_for(cycles_since_video_update_.flush());
} }
static const int audio_divider = 8;
void update_audio() { void update_audio() {
speaker_.run_for(cycles_since_audio_update_.divide(Cycles(16))); speaker_.run_for(audio_queue_, cycles_since_audio_update_.divide(Cycles(audio_divider)));
} }
uint8_t ram_[48*1024]; uint8_t ram_[48*1024];
@ -82,7 +83,7 @@ class ConcreteMachine:
// The speaker, however, should think it is clocked at half the master clock, per a general // The speaker, however, should think it is clocked at half the master clock, per a general
// decision to sample it at seven times the CPU clock (plus stretches). // decision to sample it at seven times the CPU clock (plus stretches).
speaker_.set_input_rate(static_cast<float>(master_clock / (2.0 * 16.0))); speaker_.set_input_rate(static_cast<float>(master_clock / (2.0 * static_cast<float>(audio_divider))));
// Also, start with randomised memory contents. // Also, start with randomised memory contents.
Memory::Fuzz(ram_, sizeof(ram_)); Memory::Fuzz(ram_, sizeof(ram_));