mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-21 04:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert more functions over

Browse Source
This commit is contained in:
twinaphex 2016-05-08 16:02:46 +02:00
parent 41a8496b1c
commit fc5f1524cc
4 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
audio/audio_driver.c
View File

@ -260,7 +260,6 @@ const char *config_get_audio_driver_options(void)
return char_list_new_special(STRING_LIST_AUDIO_DRIVERS, NULL);
}
static bool uninit_audio(void)
{
settings_t *settings = config_get_ptr();
@ -305,7 +304,7 @@ static bool uninit_audio(void)
return true;
}
static bool init_audio(bool audio_cb_inited)
static bool audio_driver_init_internal(bool audio_cb_inited)
{
size_t outsamples_max, max_bufsamples = AUDIO_CHUNK_SIZE_NONBLOCKING * 2;
settings_t *settings = config_get_ptr();
@ -356,7 +355,7 @@ static bool init_audio(bool audio_cb_inited)
current_audio))
{
RARCH_ERR("Cannot open threaded audio driver ... Exiting ...\n");
retro_fail(1, "init_audio()");
retro_fail(1, "audio_driver_init_internal()");
}
}
else
@ -812,20 +811,26 @@ bool audio_driver_new_devices_list(void)
return true;
}
bool audio_driver_init(void)
{
return audio_driver_init_internal(audio_callback.callback != NULL);
}
bool audio_driver_get_devices_list(void **data)
{
struct string_list**ptr = (struct string_list**)data;
if (!ptr)
return false;
*ptr = audio_driver_devices_list;
return true;
}
bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
{
settings_t *settings = config_get_ptr();
switch (state)
{
case RARCH_AUDIO_CTL_DEVICES_LIST_GET:
{
struct string_list**ptr = (struct string_list**)data;
if (!ptr)
return false;
*ptr = audio_driver_devices_list;
}
break;
case RARCH_AUDIO_CTL_RESAMPLER_INIT:
return rarch_resampler_realloc(
&audio_driver_resampler_data,
@ -840,8 +845,6 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
(struct resampler_data*)data);
retro_perf_stop(&resampler_proc);
break;
case RARCH_AUDIO_CTL_INIT:
return init_audio(audio_callback.callback != NULL);
case RARCH_AUDIO_CTL_DESTROY:
audio_driver_active = false;
audio_driver_data_own = false;

10
audio/audio_driver.h
View File

@ -20,7 +20,9 @@
#include <stdint.h>
#include <stddef.h>
#include <sys/types.h>
#include <boolean.h>
#include "audio_dsp_filter.h"
#ifdef __cplusplus
@ -37,7 +39,6 @@ extern "C" {
enum rarch_audio_ctl_state
{
RARCH_AUDIO_CTL_NONE = 0,
RARCH_AUDIO_CTL_INIT,
RARCH_AUDIO_CTL_DEINIT,
RARCH_AUDIO_CTL_DESTROY,
RARCH_AUDIO_CTL_DESTROY_DATA,
@ -64,8 +65,7 @@ enum rarch_audio_ctl_state
RARCH_AUDIO_CTL_UNSET_ACTIVE,
RARCH_AUDIO_CTL_IS_ACTIVE,
RARCH_AUDIO_CTL_RESAMPLER_INIT,
RARCH_AUDIO_CTL_RESAMPLER_PROCESS,
RARCH_AUDIO_CTL_DEVICES_LIST_GET
RARCH_AUDIO_CTL_RESAMPLER_PROCESS
};
typedef struct audio_driver
@ -173,6 +173,10 @@ void audio_driver_dsp_filter_init(const char *device);
void audio_driver_set_buffer_size(size_t bufsize);
bool audio_driver_get_devices_list(void **ptr);
bool audio_driver_init(void);
extern audio_driver_t audio_rsound;
extern audio_driver_t audio_oss;
extern audio_driver_t audio_alsa;

2
driver.c
View File

@ -338,7 +338,7 @@ static void init_drivers(int flags)
if (flags & DRIVER_AUDIO)
{
audio_driver_ctl(RARCH_AUDIO_CTL_INIT, NULL);
audio_driver_init();
audio_driver_new_devices_list();
}

6
menu/menu_setting.c
View File

@ -759,7 +759,8 @@ static int setting_string_action_left_audio_device(void *data, bool wraparound)
int audio_device_index;
struct string_list *ptr = NULL;
rarch_setting_t *setting = (rarch_setting_t*)data;
if (!audio_driver_ctl(RARCH_AUDIO_CTL_DEVICES_LIST_GET, &ptr))
if (!audio_driver_get_devices_list((void**)&ptr))
return -1;
if (!ptr)
@ -783,7 +784,8 @@ static int setting_string_action_right_audio_device(void *data, bool wraparound)
int audio_device_index;
struct string_list *ptr = NULL;
rarch_setting_t *setting = (rarch_setting_t*)data;
if (!audio_driver_ctl(RARCH_AUDIO_CTL_DEVICES_LIST_GET, &ptr))
if (!audio_driver_get_devices_list((void**)&ptr))
return -1;
if (!ptr)