6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-25 18:30:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #754 from TomHarte/AYVolume

Browse Source 
Introduces more correct AY volume levels.
This commit is contained in:
Thomas Harte 2020-02-14 23:38:17 -05:00 committed by GitHub
commit fd786412aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Components/AY38910/AY38910.cpp
View File

@ -71,13 +71,19 @@ AY38910::AY38910(Personality personality, Concurrency::DeferringAsyncTaskQueue &
}
void AY38910::set_sample_volume_range(std::int16_t range) {
// set up volume lookup table
// Set up volume lookup table; the function below is based on a combination of the graph
// from the YM's datasheet, showing a clear power curve, and fitting that to observed
// values reported elsewhere.
const float max_volume = float(range) / 3.0f; // As there are three channels.
constexpr float root_two = 1.414213562373095f;
for(int v = 0; v < 32; v++) {
volumes_[v] = int(max_volume / powf(root_two, float(v ^ 0x1f) / 2.0f));
volumes_[v] = int(max_volume / powf(root_two, float(v ^ 0x1f) / 3.18f));
}
// Tie level 0 to silence.
for(int v = 31; v >= 0; --v) {
volumes_[v] -= volumes_[0];
}
volumes_[0] = 0; // Tie level 0 to silence.
evaluate_output_volume();
}
@ -185,7 +191,7 @@ void AY38910::evaluate_output_volume() {
#undef channel_volume
// Mix additively.
output_volume_ = static_cast<int16_t>(
output_volume_ = int16_t(
volumes_[volumes[0]] * channel_levels[0] +
volumes_[volumes[1]] * channel_levels[1] +
volumes_[volumes[2]] * channel_levels[2]
@ -220,7 +226,7 @@ void AY38910::set_register_value(uint8_t value) {
int channel = selected_register >> 1;
if(selected_register & 1)
tone_periods_[channel] = (tone_periods_[channel] & 0xff) | static_cast<uint16_t>((value&0xf) << 8);
tone_periods_[channel] = (tone_periods_[channel] & 0xff) | uint16_t((value&0xf) << 8);
else
tone_periods_[channel] = (tone_periods_[channel] & ~0xff) | value;
}
@ -235,7 +241,7 @@ void AY38910::set_register_value(uint8_t value) {
break;
case 12:
envelope_period_ = (envelope_period_ & 0xff) | static_cast<int>(value << 8);
envelope_period_ = (envelope_period_ & 0xff) | int(value << 8);
break;
case 13:
@ -331,15 +337,15 @@ uint8_t AY38910::get_data_output() {
}
void AY38910::set_control_lines(ControlLines control_lines) {
switch(static_cast<int>(control_lines)) {
switch(int(control_lines)) {
default: control_state_ = Inactive; break;
case static_cast<int>(BDIR | BC2 | BC1):
case int(BDIR | BC2 | BC1):
case BDIR:
case BC1: control_state_ = LatchAddress; break;
case static_cast<int>(BC2 | BC1): control_state_ = Read; break;
case static_cast<int>(BDIR | BC2): control_state_ = Write; break;
case int(BC2 | BC1): control_state_ = Read; break;
case int(BDIR | BC2): control_state_ = Write; break;
}
update_bus();

2
OSBindings/Mac/Clock Signal/Documents/MachineDocument.swift
View File

@ -84,7 +84,7 @@ class MachineDocument:
}
override func close() {
machine.stop()
machine?.stop()
activityPanel?.setIsVisible(false)
activityPanel = nil

6
OSBindings/Mac/Clock Signal/Machine/CSMachine.mm
View File

@ -770,11 +770,7 @@ struct ActivityObserver: public Activity::Observer {
// Grab the time now and, therefore, the amount of time since the timer last fired
// (capped at half a second).
const auto timeNow = Time::nanos_now();
const auto duration = timeNow - lastTime;
if(duration > Time::Nanos(500'000'000)) {
lastTime = timeNow;
return;
}
const auto duration = std::min(timeNow - lastTime, Time::Nanos(10'000'000'000 / TICKS));
CGSize pixelSize;
BOOL splitAndSync = NO;

3
OSBindings/SDL/main.cpp
View File

@ -131,8 +131,7 @@ struct MachineRunner {
// now, as there's obviously been some sort of substantial time glitch.
const auto time_now = Time::nanos_now();
if(time_now - last_time_ > Time::Nanos(500'000'000)) {
last_time_ = time_now;
return;
last_time_ = time_now - Time::Nanos(500'000'000);
}
const auto vsync_time = vsync_time_.load();