libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

audio_driver_dsp_filter_init - cleanup

Browse Source
This commit is contained in:
twinaphex 2019-06-17 13:06:56 +02:00
parent 127bf556c7
commit 61879bc8e0
3 changed files with 23 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
command.c
View File

@ -2201,7 +2201,12 @@ TODO: Add a setting for these tweaks */
command_event(CMD_EVENT_DSP_FILTER_DEINIT, NULL);
if (string_is_empty(settings->paths.path_audio_dsp_plugin))
break;
audio_driver_dsp_filter_init(settings->paths.path_audio_dsp_plugin);
if (!audio_driver_dsp_filter_init(
settings->paths.path_audio_dsp_plugin))
{
RARCH_ERR("[DSP]: Failed to initialize DSP filter \"%s\".\n",
settings->paths.path_audio_dsp_plugin);
}
}
break;
case CMD_EVENT_GPU_RECORD_DEINIT:

50
retroarch.c
View File

@ -1211,7 +1211,7 @@ void audio_driver_dsp_filter_free(void)
audio_driver_dsp = NULL;
}
void audio_driver_dsp_filter_init(const char *device)
bool audio_driver_dsp_filter_init(const char *device)
{
struct string_list *plugs = NULL;
#if defined(HAVE_DYLIB) && !defined(HAVE_FILTERS_BUILTIN)
@ -1221,31 +1221,24 @@ void audio_driver_dsp_filter_init(const char *device)
fill_pathname_basedir(basedir, device, str_size);
if (!frontend_driver_get_core_extension(ext_name, str_size))
goto error;
{
free(ext_name);
free(basedir);
return false;
}
plugs = dir_list_new(basedir, ext_name, false, true, false, false);
free(ext_name);
free(basedir);
if (!plugs)
goto error;
return false;
#endif
audio_driver_dsp = retro_dsp_filter_new(
device, plugs, audio_driver_input);
if (!audio_driver_dsp)
goto error;
return false;
#if defined(HAVE_DYLIB) && !defined(HAVE_FILTERS_BUILTIN)
free(basedir);
free(ext_name);
#endif
return;
error:
#if defined(HAVE_DYLIB) && !defined(HAVE_FILTERS_BUILTIN)
free(basedir);
free(ext_name);
#endif
if (!audio_driver_dsp)
RARCH_ERR("[DSP]: Failed to initialize DSP filter \"%s\".\n", device);
return true;
}
void audio_driver_set_buffer_size(size_t bufsize)
@ -1971,11 +1964,6 @@ void audio_driver_frame_is_reverse(void)
runloop_slowmotion);
}
static void audio_driver_destroy_data(void)
{
audio_driver_context_audio_data = NULL;
}
void audio_driver_suspend(void)
{
audio_suspended = true;
@ -3400,7 +3388,7 @@ void driver_uninit(int flags)
input_driver_destroy_data();
if ((flags & DRIVER_AUDIO_MASK))
audio_driver_destroy_data();
audio_driver_context_audio_data = NULL;
if (flags & DRIVER_MIDI_MASK)
midi_driver_free();
@ -4499,14 +4487,6 @@ static void retroarch_parse_input_and_config(int argc, char *argv[])
dir_set(RARCH_DIR_SAVESTATE, global->name.savestate);
}
static bool drivers_set_active(void)
{
video_driver_set_active();
audio_driver_set_active();
return true;
}
bool retroarch_validate_game_options(char *s, size_t len, bool mkdir)
{
char *config_directory = NULL;
@ -4631,7 +4611,8 @@ bool retroarch_main_init(int argc, char *argv[])
char log_file_name[128];
#endif
drivers_set_active();
video_driver_set_active();
audio_driver_active = true;
if (setjmp(error_sjlj_context) > 0)
{
@ -4998,7 +4979,8 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
sthread_tls_create(&rarch_tls);
sthread_tls_set(&rarch_tls, MAGIC_POINTER);
#endif
drivers_set_active();
video_driver_set_active();
audio_driver_active = true;
{
uint8_t i;
for (i = 0; i < MAX_USERS; i++)

2
retroarch.h
View File

@ -615,7 +615,7 @@ bool audio_driver_mixer_extension_supported(const char *ext);
void audio_driver_dsp_filter_free(void);
void audio_driver_dsp_filter_init(const char *device);
bool audio_driver_dsp_filter_init(const char *device);
void audio_driver_set_buffer_size(size_t bufsize);