mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-17 19:14:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create RARCH_AUDIO_CTL_DEINIT/RARCH_AUDIO_CTL_INIT

Browse Source
This commit is contained in:
twinaphex 2015-11-22 14:28:00 +01:00
parent 0972c19f77
commit a88ae583cc
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
audio/audio_driver.c
View File

@ -254,7 +254,7 @@ void find_audio_driver(void)
}
}
void uninit_audio(void)
static bool uninit_audio(void)
{
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
@ -274,7 +274,7 @@ void uninit_audio(void)
if (!settings->audio.enable)
{
driver->audio_active = false;
return;
return false;
}
rarch_resampler_freep(&driver->resampler,
@ -297,9 +297,11 @@ void uninit_audio(void)
event_command(EVENT_CMD_DSP_FILTER_DEINIT);
compute_audio_buffer_statistics();
return true;
}
void init_audio(void)
static bool init_audio(void)
{
size_t outsamples_max, max_bufsamples = AUDIO_CHUNK_SIZE_NONBLOCKING * 2;
driver_t *driver = driver_get_ptr();
@ -309,7 +311,7 @@ void init_audio(void)
/* Resource leaks will follow if audio is initialized twice. */
if (driver->audio_data)
return;
return false;
/* Accomodate rewind since at some point we might have two full buffers. */
outsamples_max = max_bufsamples * AUDIO_MAX_RATIO *
@ -339,7 +341,7 @@ void init_audio(void)
if (!settings->audio.enable)
{
driver->audio_active = false;
return;
return false;
}
find_audio_driver();
@ -441,10 +443,10 @@ void init_audio(void)
audio_data.audio_callback.callback)
audio_driver_ctl(RARCH_AUDIO_CTL_START, NULL);
return;
return true;
error:
uninit_audio();
return audio_driver_ctl(RARCH_AUDIO_CTL_DEINIT, NULL);
}
bool audio_driver_mute_toggle(void)
@ -844,6 +846,10 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
{
case RARCH_AUDIO_CTL_NONE:
break;
case RARCH_AUDIO_CTL_INIT:
return init_audio();
case RARCH_AUDIO_CTL_DEINIT:
return uninit_audio();
case RARCH_AUDIO_CTL_ALIVE:
return audio->alive(driver->audio_data);
case RARCH_AUDIO_CTL_START:

6
audio/audio_driver.h
View File

@ -75,6 +75,8 @@ typedef struct audio_driver
enum rarch_audio_ctl_state
{
RARCH_AUDIO_CTL_NONE = 0,
RARCH_AUDIO_CTL_INIT,
RARCH_AUDIO_CTL_DEINIT,
RARCH_AUDIO_CTL_START,
RARCH_AUDIO_CTL_STOP,
RARCH_AUDIO_CTL_ALIVE
@ -124,10 +126,6 @@ const char* config_get_audio_driver_options(void);
void find_audio_driver(void);
void uninit_audio(void);
void init_audio(void);
bool audio_driver_flush(const int16_t *data, size_t samples);
void audio_driver_sample(int16_t left, int16_t right);

4
driver.c
View File

@ -392,7 +392,7 @@ void init_drivers(int flags)
}
if (flags & DRIVER_AUDIO)
init_audio();
audio_driver_ctl(RARCH_AUDIO_CTL_INIT, NULL);
/* Only initialize camera driver if we're ever going to use it. */
if ((flags & DRIVER_CAMERA) && driver->camera_active)
@ -458,7 +458,7 @@ void uninit_drivers(int flags)
}
if (flags & DRIVER_AUDIO)
uninit_audio();
audio_driver_ctl(RARCH_AUDIO_CTL_DEINIT, NULL);
if (flags & DRIVERS_VIDEO_INPUT)
video_driver_ctl(RARCH_DISPLAY_CTL_DEINIT, NULL);