mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-24 15:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

audio_driver_mixer_add_stream - add fall-through - simplify code

Browse Source
This commit is contained in:
libretroadmin 2022-07-09 13:44:55 +02:00
parent a9b074fa0a
commit 0f24d52407
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
audio/audio_driver.c
View File

@ -1103,7 +1103,6 @@ static void audio_mixer_menu_stop_cb(
} }
break; break;
case AUDIO_MIXER_SOUND_STOPPED: case AUDIO_MIXER_SOUND_STOPPED:
break;
case AUDIO_MIXER_SOUND_REPEATED: case AUDIO_MIXER_SOUND_REPEATED:
break; break;
} }
@ -1153,7 +1152,6 @@ static void audio_mixer_play_stop_sequential_cb(
} }
break; break;
case AUDIO_MIXER_SOUND_STOPPED: case AUDIO_MIXER_SOUND_STOPPED:
break;
case AUDIO_MIXER_SOUND_REPEATED: case AUDIO_MIXER_SOUND_REPEATED:
break; break;
} }
@ -1189,7 +1187,7 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)
audio_mixer_voice_t *voice = NULL; audio_mixer_voice_t *voice = NULL;
audio_mixer_sound_t *handle = NULL; audio_mixer_sound_t *handle = NULL;
audio_mixer_stop_cb_t stop_cb = audio_mixer_play_stop_cb; audio_mixer_stop_cb_t stop_cb = audio_mixer_play_stop_cb;
bool looped = false; bool looped = (params->state == AUDIO_STREAM_STATE_PLAYING_LOOPED);
void *buf = NULL; void *buf = NULL;
if (params->stream_type == AUDIO_STREAM_TYPE_NONE) if (params->stream_type == AUDIO_STREAM_TYPE_NONE)
@ -1209,18 +1207,14 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)
break; break;
case AUDIO_MIXER_SLOT_SELECTION_AUTOMATIC: case AUDIO_MIXER_SLOT_SELECTION_AUTOMATIC:
default: default:
if (!audio_driver_mixer_get_free_stream_slot( return audio_driver_mixer_get_free_stream_slot(
&free_slot, params->stream_type)) &free_slot, params->stream_type);
return false;
break;
} }
if (params->state == AUDIO_STREAM_STATE_NONE) if (params->state == AUDIO_STREAM_STATE_NONE)
return false; return false;
buf = malloc(params->bufsize); if (!(buf = malloc(params->bufsize)))
if (!buf)
return false; return false;
memcpy(buf, params->buf, params->bufsize); memcpy(buf, params->buf, params->bufsize);
@ -1266,19 +1260,11 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)
switch (params->state) switch (params->state)
{ {
case AUDIO_STREAM_STATE_PLAYING_LOOPED:
looped = true;
voice = audio_mixer_play(handle, looped, params->volume,
audio_driver_st.resampler_ident,
audio_driver_st.resampler_quality, stop_cb);
break;
case AUDIO_STREAM_STATE_PLAYING:
voice = audio_mixer_play(handle, looped, params->volume,
audio_driver_st.resampler_ident,
audio_driver_st.resampler_quality, stop_cb);
break;
case AUDIO_STREAM_STATE_PLAYING_SEQUENTIAL: case AUDIO_STREAM_STATE_PLAYING_SEQUENTIAL:
stop_cb = audio_mixer_play_stop_sequential_cb; stop_cb = audio_mixer_play_stop_sequential_cb;
/* fall-through */
case AUDIO_STREAM_STATE_PLAYING_LOOPED:
case AUDIO_STREAM_STATE_PLAYING:
voice = audio_mixer_play(handle, looped, params->volume, voice = audio_mixer_play(handle, looped, params->volume,
audio_driver_st.resampler_ident, audio_driver_st.resampler_ident,
audio_driver_st.resampler_quality, stop_cb); audio_driver_st.resampler_quality, stop_cb);