scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Controller::LoadAudioDevice and cleanup audio device OnExit

Browse Source
This commit is contained in:
scawful
2024-04-20 07:47:57 -04:00
parent 7072c18a92
commit a2bda63ae5
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/core/controller.cc
View File

@@ -121,6 +121,7 @@ absl::Status Controller::OnEntry() {
RETURN_IF_ERROR(CreateSDL_Window()) RETURN_IF_ERROR(CreateSDL_Window())
RETURN_IF_ERROR(CreateRenderer()) RETURN_IF_ERROR(CreateRenderer())
RETURN_IF_ERROR(CreateGuiContext()) RETURN_IF_ERROR(CreateGuiContext())
RETURN_IF_ERROR(LoadAudioDevice())
InitializeKeymap(); InitializeKeymap();
master_editor_.SetupScreen(renderer_); master_editor_.SetupScreen(renderer_);
active_ = true; active_ = true;
@@ -187,6 +188,8 @@ void Controller::DoRender() const {
void Controller::OnExit() { void Controller::OnExit() {
master_editor_.Shutdown(); master_editor_.Shutdown();
Mix_CloseAudio(); Mix_CloseAudio();
SDL_PauseAudioDevice(audio_device_, 1);
SDL_CloseAudioDevice(audio_device_);
ImGui_ImplSDLRenderer2_Shutdown(); ImGui_ImplSDLRenderer2_Shutdown();
ImGui_ImplSDL2_Shutdown(); ImGui_ImplSDL2_Shutdown();
ImGui::DestroyContext(); ImGui::DestroyContext();
@@ -325,6 +328,23 @@ absl::Status Controller::LoadFontFamilies() const {
return absl::OkStatus(); return absl::OkStatus();
} }
absl::Status Controller::LoadAudioDevice() {
SDL_AudioSpec want, have;
SDL_memset(&want, 0, sizeof(want));
want.freq = audio_frequency_;
want.format = AUDIO_S16;
want.channels = 2;
want.samples = 2048;
want.callback = NULL; // Uses the queue
audio_device_ = SDL_OpenAudioDevice(NULL, 0, &want, &have, 0);
if (audio_device_ == 0) {
return absl::InternalError(
absl::StrFormat("Failed to open audio: %s\n", SDL_GetError()));
}
SDL_PauseAudioDevice(audio_device_, 0);
return absl::OkStatus();
}
} // namespace core } // namespace core
} // namespace app } // namespace app
} // namespace yaze } // namespace yaze

2
src/app/core/controller.h
View File

@@ -57,12 +57,14 @@ class Controller : public ExperimentFlags {
absl::Status CreateRenderer(); absl::Status CreateRenderer();
absl::Status CreateGuiContext(); absl::Status CreateGuiContext();
absl::Status LoadFontFamilies() const; absl::Status LoadFontFamilies() const;
absl::Status LoadAudioDevice();
void CloseWindow() { active_ = false; } void CloseWindow() { active_ = false; }
friend int ::main(int argc, char **argv); friend int ::main(int argc, char **argv);
bool active_; bool active_;
int wanted_samples_; int wanted_samples_;
int audio_frequency_ = 48000;
int16_t *audio_buffer_; int16_t *audio_buffer_;
editor::MasterEditor master_editor_; editor::MasterEditor master_editor_;
SDL_AudioDeviceID audio_device_; SDL_AudioDeviceID audio_device_;