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 two lingering adaptation errors in the Vic-20.

Browse Source
This commit is contained in:
Thomas Harte 2017-12-17 21:43:08 -05:00
parent ac80d10cd8
commit f8a2459c91
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Components/6560/6560.hpp
View File

@ -70,7 +70,11 @@ template <class T> class MOS6560 {
} }
Outputs::CRT::CRT *get_crt() { return crt_.get(); } Outputs::CRT::CRT *get_crt() { return crt_.get(); }
Outputs::Speaker::Speaker *get_speaker() { return nullptr; } // speaker_; Outputs::Speaker::Speaker *get_speaker() { return &speaker_; }
void set_high_frequency_cutoff(float cutoff) {
speaker_.set_high_frequency_cutoff(cutoff);
}
enum OutputMode { enum OutputMode {
PAL, NTSC PAL, NTSC

5
Machines/Commodore/Vic-20/Vic20.cpp
View File

@ -631,7 +631,7 @@ class ConcreteMachine:
void setup_output(float aspect_ratio) override final { void setup_output(float aspect_ratio) override final {
mos6560_.reset(new Vic6560()); mos6560_.reset(new Vic6560());
// mos6560_->get_speaker()->set_high_frequency_cut_off(1600); // There is a 1.6Khz low-pass filter in the Vic-20. mos6560_->set_high_frequency_cutoff(1600); // There is a 1.6Khz low-pass filter in the Vic-20.
// Make a guess: PAL. Without setting a clock rate the 6560 isn't fully set up so contractually something must be set. // Make a guess: PAL. Without setting a clock rate the 6560 isn't fully set up so contractually something must be set.
set_pal_6560(); set_pal_6560();
} }
@ -645,8 +645,7 @@ class ConcreteMachine:
} }
Outputs::Speaker::Speaker *get_speaker() override final { Outputs::Speaker::Speaker *get_speaker() override final {
return nullptr; return mos6560_->get_speaker();
// return mos6560_->get_speaker();
} }
void mos6522_did_change_interrupt_status(void *mos6522) override final { void mos6522_did_change_interrupt_status(void *mos6522) override final {