6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-06 01:28:57 +00:00
Code Issues Projects Releases Wiki Activity

Reduces code duplication slightly.

Browse Source
This commit is contained in:
Thomas Harte 2021-03-21 20:34:58 -04:00
parent 388b136980
commit 6482303063
1 changed files with 54 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Machines/Sinclair/ZXSpectrum/Video.hpp
View File

@ -103,36 +103,14 @@ template <VideoTiming timing> class Video {
if(line < 3) {
// Output sync line.
crt_.output_sync(cycles_this_line);
} else if((line < first_line) || (line >= first_line+192)) {
} else {
if((line < first_line) || (line >= first_line+192)) {
// Output plain border line.
if(offset < sync_position) {
const int border_duration = std::min(sync_position, end_offset) - offset;
output_border(border_duration);
offset += border_duration;
}
if(offset >= sync_position && offset < sync_position + sync_length && end_offset > offset) {
const int sync_duration = std::min(sync_position + sync_length, end_offset) - offset;
crt_.output_sync(sync_duration);
offset += sync_duration;
}
if(offset >= sync_position + sync_length && offset < burst_position && end_offset > offset) {
const int blank_duration = std::min(burst_position, end_offset) - offset;
crt_.output_blank(blank_duration);
offset += blank_duration;
}
if(offset >= burst_position && offset < burst_position+burst_length && end_offset > offset) {
const int burst_duration = std::min(burst_position + burst_length, end_offset) - offset;
crt_.output_colour_burst(burst_duration, line, is_alternate_line_);
offset += burst_duration;
}
if(offset >= burst_position+burst_length && end_offset > offset) {
const int border_duration = end_offset - offset;
output_border(border_duration);
}
} else {
// Output pixel line.
if(offset < 256) {
@ -187,8 +165,11 @@ template <VideoTiming timing> class Video {
output_border(border_duration);
offset += border_duration;
}
}
if(offset >= sync_position && offset < sync_position+sync_length && end_offset > offset) {
// Output the common tail to border and pixel lines: sync, blank, colour burst, border.
if(offset >= sync_position && offset < sync_position + sync_length && end_offset > offset) {
const int sync_duration = std::min(sync_position + sync_length, end_offset) - offset;
crt_.output_sync(sync_duration);
offset += sync_duration;
@ -206,7 +187,7 @@ template <VideoTiming timing> class Video {
offset += burst_duration;
}
if(offset >= burst_position + burst_length && end_offset > offset) {
if(offset >= burst_position+burst_length && end_offset > offset) {
const int border_duration = end_offset - offset;
output_border(border_duration);
}