mirror of
https://github.com/TomHarte/CLK.git
synced 2026-04-26 03:29:40 +00:00
Settled definitively on flush as more communicative than synchronise (and slightly more locale neutral); culled some more duplication from the Z80.
This commit is contained in:
@@ -161,7 +161,7 @@ template<class T> class Cartridge:
|
||||
return cycles_run_for / 3;
|
||||
}
|
||||
|
||||
void synchronise() {
|
||||
void flush() {
|
||||
update_audio();
|
||||
update_video();
|
||||
speaker_->flush();
|
||||
|
||||
@@ -169,7 +169,7 @@ class Machine:
|
||||
|
||||
// to satisfy CPU::MOS6502::Processor
|
||||
unsigned int perform_bus_operation(CPU::MOS6502::BusOperation operation, uint16_t address, uint8_t *value);
|
||||
void synchronise() { mos6560_->synchronise(); }
|
||||
void flush() { mos6560_->flush(); }
|
||||
|
||||
// to satisfy CRTMachine::Machine
|
||||
virtual void setup_output(float aspect_ratio);
|
||||
|
||||
@@ -343,7 +343,7 @@ unsigned int Machine::perform_bus_operation(CPU::MOS6502::BusOperation operation
|
||||
return cycles;
|
||||
}
|
||||
|
||||
void Machine::synchronise() {
|
||||
void Machine::flush() {
|
||||
update_display();
|
||||
update_audio();
|
||||
speaker_->flush();
|
||||
|
||||
@@ -89,7 +89,7 @@ class Machine:
|
||||
|
||||
// to satisfy CPU::MOS6502::Processor
|
||||
unsigned int perform_bus_operation(CPU::MOS6502::BusOperation operation, uint16_t address, uint8_t *value);
|
||||
void synchronise();
|
||||
void flush();
|
||||
|
||||
// to satisfy CRTMachine::Machine
|
||||
virtual void setup_output(float aspect_ratio);
|
||||
|
||||
@@ -136,9 +136,9 @@ unsigned int Machine::perform_bus_operation(CPU::MOS6502::BusOperation operation
|
||||
return 1;
|
||||
}
|
||||
|
||||
void Machine::synchronise() {
|
||||
void Machine::flush() {
|
||||
update_video();
|
||||
via_.synchronise();
|
||||
via_.flush();
|
||||
}
|
||||
|
||||
void Machine::update_video() {
|
||||
@@ -234,7 +234,7 @@ uint8_t Machine::VIA::get_port_input(Port port) {
|
||||
}
|
||||
}
|
||||
|
||||
void Machine::VIA::synchronise() {
|
||||
void Machine::VIA::flush() {
|
||||
ay8910->run_for_cycles(cycles_since_ay_update_);
|
||||
ay8910->flush();
|
||||
cycles_since_ay_update_ = 0;
|
||||
|
||||
@@ -80,7 +80,7 @@ class Machine:
|
||||
|
||||
// to satisfy CPU::MOS6502::Processor
|
||||
unsigned int perform_bus_operation(CPU::MOS6502::BusOperation operation, uint16_t address, uint8_t *value);
|
||||
void synchronise();
|
||||
void flush();
|
||||
|
||||
// to satisfy CRTMachine::Machine
|
||||
virtual void setup_output(float aspect_ratio);
|
||||
@@ -151,7 +151,7 @@ class Machine:
|
||||
std::unique_ptr<TapePlayer> tape;
|
||||
std::shared_ptr<Keyboard> keyboard;
|
||||
|
||||
void synchronise();
|
||||
void flush();
|
||||
|
||||
private:
|
||||
void update_ay();
|
||||
|
||||
Reference in New Issue
Block a user