Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-04-02 10:51:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Cleanups

Browse source
This commit is contained in:
twinaphex 2017-05-14 23:36:30 +02:00
parent 2fc45fb5ac
commit 3410d5c4e4
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tasks/task_audio_mixer.c
View file

@ -61,14 +61,11 @@ static void task_audio_mixer_load_free(retro_task_t *task)
static int cb_nbio_audio_wav_loaded(void *data, size_t len) static int cb_nbio_audio_wav_loaded(void *data, size_t len)
{ {
void *ptr = NULL;
nbio_handle_t *nbio = (nbio_handle_t*)data; nbio_handle_t *nbio = (nbio_handle_t*)data;
struct nbio_audio_mixer_handle *image = nbio ? struct nbio_audio_mixer_handle *image = nbio ?
(struct nbio_audio_mixer_handle*)nbio->data : NULL; (struct nbio_audio_mixer_handle*)nbio->data : NULL;
audio_mixer_sound_t *audmix = NULL; void *ptr = nbio_get_ptr(nbio->handle, &len);
audio_mixer_sound_t *audmix = audio_mixer_load_wav(ptr, len);
ptr = nbio_get_ptr(nbio->handle, &len);
audmix = audio_mixer_load_wav(ptr, len);
if (!audmix || if (!audmix ||
!audio_mixer_play(audmix, true, 0.0f, NULL) !audio_mixer_play(audmix, true, 0.0f, NULL)
@ -88,15 +85,13 @@ static int cb_nbio_audio_wav_loaded(void *data, size_t len)
static int cb_nbio_audio_ogg_loaded(void *data, size_t len) static int cb_nbio_audio_ogg_loaded(void *data, size_t len)
{ {
void *ptr = NULL;
nbio_handle_t *nbio = (nbio_handle_t*)data; nbio_handle_t *nbio = (nbio_handle_t*)data;
struct nbio_audio_mixer_handle struct nbio_audio_mixer_handle
*image = nbio ? *image = nbio ?
(struct nbio_audio_mixer_handle*)nbio->data : NULL; (struct nbio_audio_mixer_handle*)nbio->data : NULL;
audio_mixer_sound_t *audmix = NULL;
ptr = nbio_get_ptr(nbio->handle, &len); void *ptr = nbio_get_ptr(nbio->handle, &len);
audmix = audio_mixer_load_ogg(ptr, len); audio_mixer_sound_t *audmix = audio_mixer_load_ogg(ptr, len);
if (!audmix || if (!audmix ||
!audio_mixer_play(audmix, true, 0.0f, NULL) !audio_mixer_play(audmix, true, 0.0f, NULL)