6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-09 05:25:01 +00:00
Code Issues Projects Releases Wiki Activity

Removes assumption that all machines produce audio.

Browse Source
This commit is contained in:
Thomas Harte
2021-06-14 21:02:55 -04:00
parent 5f7b3ae313
commit 26b019a4d4
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
OSBindings/SDL/main.cpp
View File

@@ -832,8 +832,11 @@ int main(int argc, char *argv[]) {
} else if(volume < 0.0 || volume > 1.0) { } else if(volume < 0.0 || volume > 1.0) {
std::cerr << "Cannot run with volume " << volume_string << "; volumes must be between 0.0 and 1.0." << std::endl; std::cerr << "Cannot run with volume " << volume_string << "; volumes must be between 0.0 and 1.0." << std::endl;
} else { } else {
const auto speaker = machine->audio_producer()->get_speaker(); const auto audio_producer = machine->audio_producer();
if(speaker) speaker->set_output_volume(volume); if(audio_producer) {
const auto speaker = machine->audio_producer()->get_speaker();
if(speaker) speaker->set_output_volume(volume);
}
} }
} }
} }
@@ -907,26 +910,29 @@ int main(int argc, char *argv[]) {
machine->scan_producer()->set_scan_target(&scan_target); machine->scan_producer()->set_scan_target(&scan_target);
// For now, lie about audio output intentions. // For now, lie about audio output intentions.
auto speaker = machine->audio_producer()->get_speaker(); const auto audio_producer = machine->audio_producer();
if(speaker) { if(audio_producer) {
// Create an audio pipe. auto speaker = audio_producer->get_speaker();
SDL_AudioSpec desired_audio_spec; if(speaker) {
SDL_AudioSpec obtained_audio_spec; // Create an audio pipe.
SDL_AudioSpec desired_audio_spec;
SDL_AudioSpec obtained_audio_spec;
SDL_zero(desired_audio_spec); SDL_zero(desired_audio_spec);
desired_audio_spec.freq = 48000; // TODO: how can I get SDL to reveal the output rate of this machine? desired_audio_spec.freq = 48000; // TODO: how can I get SDL to reveal the output rate of this machine?
desired_audio_spec.format = AUDIO_S16; desired_audio_spec.format = AUDIO_S16;
desired_audio_spec.channels = 1 + int(speaker->get_is_stereo()); desired_audio_spec.channels = 1 + int(speaker->get_is_stereo());
desired_audio_spec.samples = Uint16(SpeakerDelegate::buffered_samples); desired_audio_spec.samples = Uint16(SpeakerDelegate::buffered_samples);
desired_audio_spec.callback = SpeakerDelegate::SDL_audio_callback; desired_audio_spec.callback = SpeakerDelegate::SDL_audio_callback;
desired_audio_spec.userdata = &speaker_delegate; desired_audio_spec.userdata = &speaker_delegate;
speaker_delegate.audio_device = SDL_OpenAudioDevice(nullptr, 0, &desired_audio_spec, &obtained_audio_spec, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE); speaker_delegate.audio_device = SDL_OpenAudioDevice(nullptr, 0, &desired_audio_spec, &obtained_audio_spec, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE);
speaker->set_output_rate(obtained_audio_spec.freq, desired_audio_spec.samples, obtained_audio_spec.channels == 2); speaker->set_output_rate(obtained_audio_spec.freq, desired_audio_spec.samples, obtained_audio_spec.channels == 2);
speaker_delegate.is_stereo = obtained_audio_spec.channels == 2; speaker_delegate.is_stereo = obtained_audio_spec.channels == 2;
speaker->set_delegate(&speaker_delegate); speaker->set_delegate(&speaker_delegate);
SDL_PauseAudioDevice(speaker_delegate.audio_device, 0); SDL_PauseAudioDevice(speaker_delegate.audio_device, 0);
}
} }
/* /*