6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-11-30 08:17:35 +00:00
Code Issues Projects Releases Wiki Activity

Reduce repetition.

Browse Source
This commit is contained in:
Thomas Harte
2025-10-06 14:27:57 -04:00
parent dde31e8687
commit a3fed788d8
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Outputs/CRT/CRT.cpp
View File

@@ -203,6 +203,9 @@ void CRT::advance_cycles(
const bool is_output_run = ((type == Scan::Type::Level) || (type == Scan::Type::Data));
const auto total_cycles = number_of_cycles;
bool did_output = false;
const auto end_point = [&] {
return this->end_point(uint16_t((total_cycles - number_of_cycles) * number_of_samples / total_cycles));
};
while(number_of_cycles) {
// Get time until next horizontal and vertical sync generator events.
@@ -233,9 +236,7 @@ void CRT::advance_cycles(
// If outputting, store the start location and scan constants.
if(next_scan) {
next_scan->end_points[0] = end_point(
uint16_t((total_cycles - number_of_cycles) * number_of_samples / total_cycles)
);
next_scan->end_points[0] = end_point();
next_scan->composite_amplitude = colour_burst_amplitude_;
}
@@ -256,9 +257,7 @@ void CRT::advance_cycles(
// End the scan if necessary.
if(next_scan) {
next_scan->end_points[1] = end_point(
uint16_t((total_cycles - number_of_cycles) * number_of_samples / total_cycles)
);
next_scan->end_points[1] = end_point();
scan_target_->end_scan();
}
@@ -286,7 +285,7 @@ void CRT::advance_cycles(
scan_target_->announce(
event,
!(horizontal_flywheel_.is_in_retrace() || vertical_flywheel_.is_in_retrace()),
end_point(uint16_t((total_cycles - number_of_cycles) * number_of_samples / total_cycles)),
end_point(),
colour_burst_amplitude_);
// If retrace is starting, update phase if required and mark no colour burst spotted yet.
@@ -307,7 +306,7 @@ void CRT::advance_cycles(
scan_target_->announce(
event,
!(horizontal_flywheel_.is_in_retrace() || vertical_flywheel_.is_in_retrace()),
end_point(uint16_t((total_cycles - number_of_cycles) * number_of_samples / total_cycles)),
end_point(),
colour_burst_amplitude_);
}