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

Memcpy the data

Browse Source
This commit is contained in:
twinaphex 2017-05-21 18:04:58 +02:00
parent e49c71b142
commit fd3025ff40
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
audio/audio_driver.c
View File

@ -123,6 +123,8 @@ struct audio_mixer_stream
audio_mixer_stop_cb_t stop_cb; audio_mixer_stop_cb_t stop_cb;
enum audio_mixer_state state; enum audio_mixer_state state;
float volume; float volume;
void *buf;
size_t bufsize;
}; };
static unsigned audio_mixer_current_max_idx = 0; static unsigned audio_mixer_current_max_idx = 0;
@ -897,6 +899,7 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)
audio_mixer_sound_t *handle = NULL; audio_mixer_sound_t *handle = NULL;
audio_mixer_stop_cb_t stop_cb = NULL; audio_mixer_stop_cb_t stop_cb = NULL;
bool looped = false; bool looped = false;
void *buf = malloc(params->bufsize);
if (audio_mixer_current_max_idx >= AUDIO_MIXER_MAX_STREAMS) if (audio_mixer_current_max_idx >= AUDIO_MIXER_MAX_STREAMS)
return false; return false;
@ -904,13 +907,15 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)
if (params->state == AUDIO_STREAM_STATE_NONE) if (params->state == AUDIO_STREAM_STATE_NONE)
return false; return false;
memcpy(buf, params->buf, params->bufsize);
switch (params->type) switch (params->type)
{ {
case AUDIO_MIXER_TYPE_WAV: case AUDIO_MIXER_TYPE_WAV:
handle = audio_mixer_load_wav(params->buf, params->bufsize); handle = audio_mixer_load_wav(buf, params->bufsize);
break; break;
case AUDIO_MIXER_TYPE_OGG: case AUDIO_MIXER_TYPE_OGG:
handle = audio_mixer_load_ogg(params->buf, params->bufsize); handle = audio_mixer_load_ogg(buf, params->bufsize);
break; break;
case AUDIO_MIXER_TYPE_NONE: case AUDIO_MIXER_TYPE_NONE:
return false; return false;
@ -931,6 +936,7 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)
audio_set_bool(AUDIO_ACTION_MIXER, true); audio_set_bool(AUDIO_ACTION_MIXER, true);
} }
audio_mixer_streams[audio_mixer_current_max_idx].buf = buf;
audio_mixer_streams[audio_mixer_current_max_idx].handle = handle; audio_mixer_streams[audio_mixer_current_max_idx].handle = handle;
audio_mixer_streams[audio_mixer_current_max_idx].voice = voice; audio_mixer_streams[audio_mixer_current_max_idx].voice = voice;
audio_mixer_streams[audio_mixer_current_max_idx].state = params->state; audio_mixer_streams[audio_mixer_current_max_idx].state = params->state;
@ -951,7 +957,7 @@ static void audio_driver_mixer_remove_stream(unsigned i)
{ {
case AUDIO_STREAM_STATE_PLAYING: case AUDIO_STREAM_STATE_PLAYING:
audio_mixer_stop(voice); audio_mixer_stop(voice);
#if 0 #if 1
/* TODO - crashes at this part */ /* TODO - crashes at this part */
if (handle) if (handle)
audio_mixer_destroy(handle); audio_mixer_destroy(handle);
@ -959,7 +965,7 @@ static void audio_driver_mixer_remove_stream(unsigned i)
break; break;
case AUDIO_STREAM_STATE_PLAYING_LOOPED: case AUDIO_STREAM_STATE_PLAYING_LOOPED:
audio_mixer_stop(voice); audio_mixer_stop(voice);
#if 0 #if 1
/* TODO - crashes at this part */ /* TODO - crashes at this part */
if (handle) if (handle)
audio_mixer_destroy(handle); audio_mixer_destroy(handle);