1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-27 01:31:42 +00:00

Merge pull request #741 from TomHarte/ZX80RateReporting

Corrects ZX80, ZX81 and Amstrad CPC scan status scales.
This commit is contained in:
Thomas Harte 2020-01-26 11:42:54 -05:00 committed by GitHub
commit 7e4c13c43e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions

View File

@ -337,7 +337,7 @@ class CRTCBusHandler {
/// @returns The current scan status.
Outputs::Display::ScanStatus get_scaled_scan_status() const {
return crt_.get_scaled_scan_status() / 64.0f;
return crt_.get_scaled_scan_status() / 4.0f;
}
/// Sets the type of display.

View File

@ -399,7 +399,8 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
via_.flush();
audio_.queue.perform();
// Experimental?
// This avoids deferring IWM costs indefinitely, until
// they become artbitrarily large.
iwm_.flush();
}

View File

@ -111,5 +111,5 @@ void Video::set_scan_target(Outputs::Display::ScanTarget *scan_target) {
}
Outputs::Display::ScanStatus Video::get_scaled_scan_status() const {
return crt_.get_scaled_scan_status() / 0.5f;
return crt_.get_scaled_scan_status() / 2.0f;
}