mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-25 16:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start converting functions

Browse Source
This commit is contained in:
twinaphex 2016-05-08 15:53:12 +02:00
parent d1eb9a0d3a
commit 41a8496b1c
3 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
audio/audio_driver.c
View File

@ -288,7 +288,7 @@ static bool uninit_audio(void)
return false; return false;
} }
audio_driver_ctl(RARCH_AUDIO_CTL_RESAMPLER_DEINIT, NULL); audio_driver_deinit_resampler();
if (audio_driver_data.data) if (audio_driver_data.data)
free(audio_driver_data.data); free(audio_driver_data.data);
@ -783,33 +783,41 @@ static bool find_audio_driver(void)
return true; return true;
} }
void audio_driver_deinit_resampler(void)
{
rarch_resampler_freep(&audio_driver_resampler,
&audio_driver_resampler_data);
}
bool audio_driver_free_devices_list(void)
{
if (!current_audio || !current_audio->device_list_free
|| !audio_driver_context_audio_data)
return false;
current_audio->device_list_free(audio_driver_context_audio_data,
audio_driver_devices_list);
audio_driver_devices_list = NULL;
return true;
}
bool audio_driver_new_devices_list(void)
{
if (!current_audio || !current_audio->device_list_new
|| !audio_driver_context_audio_data)
return false;
audio_driver_devices_list = (struct string_list*)
current_audio->device_list_new(audio_driver_context_audio_data);
if (!audio_driver_devices_list)
return false;
return true;
}
bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data) bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
switch (state) switch (state)
{ {
case RARCH_AUDIO_CTL_RESAMPLER_DEINIT:
rarch_resampler_freep(&audio_driver_resampler,
&audio_driver_resampler_data);
break;
case RARCH_AUDIO_CTL_DEVICES_LIST_FREE:
if (!current_audio || !current_audio->device_list_free
|| !audio_driver_context_audio_data)
return false;
current_audio->device_list_free(audio_driver_context_audio_data,
audio_driver_devices_list);
audio_driver_devices_list = NULL;
break;
case RARCH_AUDIO_CTL_DEVICES_LIST_NEW:
if (!current_audio || !current_audio->device_list_new
|| !audio_driver_context_audio_data)
return false;
audio_driver_devices_list = (struct string_list*)
current_audio->device_list_new(audio_driver_context_audio_data);
if (!audio_driver_devices_list)
return false;
break;
case RARCH_AUDIO_CTL_DEVICES_LIST_GET: case RARCH_AUDIO_CTL_DEVICES_LIST_GET:
{ {
struct string_list**ptr = (struct string_list**)data; struct string_list**ptr = (struct string_list**)data;
@ -843,7 +851,7 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
audio_driver_context_audio_data = NULL; audio_driver_context_audio_data = NULL;
break; break;
case RARCH_AUDIO_CTL_DEINIT: case RARCH_AUDIO_CTL_DEINIT:
audio_driver_ctl(RARCH_AUDIO_CTL_DEVICES_LIST_FREE, NULL); audio_driver_free_devices_list();
if (!uninit_audio()) if (!uninit_audio())
return false; return false;
break; break;

9
audio/audio_driver.h
View File

@ -63,11 +63,8 @@ enum rarch_audio_ctl_state
RARCH_AUDIO_CTL_SET_ACTIVE, RARCH_AUDIO_CTL_SET_ACTIVE,
RARCH_AUDIO_CTL_UNSET_ACTIVE, RARCH_AUDIO_CTL_UNSET_ACTIVE,
RARCH_AUDIO_CTL_IS_ACTIVE, RARCH_AUDIO_CTL_IS_ACTIVE,
RARCH_AUDIO_CTL_RESAMPLER_DEINIT,
RARCH_AUDIO_CTL_RESAMPLER_INIT, RARCH_AUDIO_CTL_RESAMPLER_INIT,
RARCH_AUDIO_CTL_RESAMPLER_PROCESS, RARCH_AUDIO_CTL_RESAMPLER_PROCESS,
RARCH_AUDIO_CTL_DEVICES_LIST_NEW,
RARCH_AUDIO_CTL_DEVICES_LIST_FREE,
RARCH_AUDIO_CTL_DEVICES_LIST_GET RARCH_AUDIO_CTL_DEVICES_LIST_GET
}; };
@ -125,6 +122,12 @@ typedef struct audio_driver
bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data); bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data);
void audio_driver_deinit_resampler(void);
bool audio_driver_free_devices_list(void);
bool audio_driver_new_devices_list(void);
/** /**
* audio_driver_find_handle: * audio_driver_find_handle:
* @index : index of driver to get handle to. * @index : index of driver to get handle to.

2
driver.c
View File

@ -339,7 +339,7 @@ static void init_drivers(int flags)
if (flags & DRIVER_AUDIO) if (flags & DRIVER_AUDIO)
{ {
audio_driver_ctl(RARCH_AUDIO_CTL_INIT, NULL); audio_driver_ctl(RARCH_AUDIO_CTL_INIT, NULL);
audio_driver_ctl(RARCH_AUDIO_CTL_DEVICES_LIST_NEW, NULL); audio_driver_new_devices_list();
} }
/* Only initialize camera driver if we're ever going to use it. */ /* Only initialize camera driver if we're ever going to use it. */