Skip to content

switch [sdl2]: cleanup SWITCHAUDIO_OpenDevice #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: switch-sdl-2.28
Choose a base branch
from
Open

switch [sdl2]: cleanup SWITCHAUDIO_OpenDevice #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions src/audio/switch/SDL_switchaudio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,14 @@ static int
SWITCHAUDIO_OpenDevice(_THIS, const char *devname)
{
static const u8 sink_channels[] = {0, 1};
SDL_bool supported_format = SDL_FALSE;
SDL_AudioFormat test_format;
Result res;
u32 size;
int mpid;

this->hidden = (struct SDL_PrivateAudioData *) SDL_malloc(sizeof(*this->hidden));
this->hidden = (struct SDL_PrivateAudioData *) SDL_calloc(1, sizeof(*this->hidden));
if (this->hidden == NULL) {
return SDL_OutOfMemory();
}
SDL_zerop(this->hidden);

res = audrenInitialize(&arConfig);
if (R_FAILED(res)) {
Expand All @@ -71,20 +68,7 @@ SWITCHAUDIO_OpenDevice(_THIS, const char *devname)
}
this->hidden->audr_driver = true;

test_format = SDL_FirstAudioFormat(this->spec.format);
while ((!supported_format) && (test_format)) {
if (test_format == AUDIO_S16SYS) {
supported_format = SDL_TRUE;
}
else {
test_format = SDL_NextAudioFormat();
}
}
if (!supported_format) {
return SDL_SetError("Unsupported audio format");
}

this->spec.format = test_format;
this->spec.format = AUDIO_S16SYS;
SDL_CalculateAudioSpec(&this->spec);

size = (u32) ((this->spec.size * 2) + 0xfff) & ~0xfff;
Expand Down