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

(audio driver) Refactors

Browse Source
This commit is contained in:
twinaphex 2016-05-08 17:03:51 +02:00
parent 8b714d2932
commit 8125579b7c
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
audio/audio_driver.c
View File

@ -874,7 +874,7 @@ bool audio_driver_set_callback(const void *data)
bool audio_driver_enable_callback(void) bool audio_driver_enable_callback(void)
{ {
if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL)) if (!audio_driver_has_callback())
return false; return false;
if (audio_callback.set_state) if (audio_callback.set_state)
audio_callback.set_state(true); audio_callback.set_state(true);
@ -883,7 +883,7 @@ bool audio_driver_enable_callback(void)
bool audio_driver_disable_callback(void) bool audio_driver_disable_callback(void)
{ {
if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL)) if (!audio_driver_has_callback())
return false; return false;
if (audio_callback.set_state) if (audio_callback.set_state)
@ -902,6 +902,22 @@ void audio_driver_monitor_set_rate(void)
audio_driver_data.audio_rate.source_ratio.current = new_src_ratio; audio_driver_data.audio_rate.source_ratio.current = new_src_ratio;
} }
bool audio_driver_callback(void)
{
if (!audio_driver_has_callback())
return false;
if (audio_callback.callback)
audio_callback.callback();
return true;
}
bool audio_driver_has_callback(void)
{
return audio_callback.callback;
}
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();
@ -916,15 +932,6 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
case RARCH_AUDIO_CTL_DESTROY_DATA: case RARCH_AUDIO_CTL_DESTROY_DATA:
audio_driver_context_audio_data = NULL; audio_driver_context_audio_data = NULL;
break; break;
case RARCH_AUDIO_CTL_HAS_CALLBACK:
return audio_callback.callback;
case RARCH_AUDIO_CTL_CALLBACK:
if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL))
return false;
if (audio_callback.callback)
audio_callback.callback();
break;
case RARCH_AUDIO_CTL_UNSET_CALLBACK: case RARCH_AUDIO_CTL_UNSET_CALLBACK:
audio_callback.callback = NULL; audio_callback.callback = NULL;
audio_callback.set_state = NULL; audio_callback.set_state = NULL;

6
audio/audio_driver.h
View File

@ -48,8 +48,6 @@ enum rarch_audio_ctl_state
RARCH_AUDIO_CTL_MONITOR_ADJUST_SYSTEM_RATES, RARCH_AUDIO_CTL_MONITOR_ADJUST_SYSTEM_RATES,
RARCH_AUDIO_CTL_MUTE_TOGGLE, RARCH_AUDIO_CTL_MUTE_TOGGLE,
RARCH_AUDIO_CTL_UNSET_CALLBACK, RARCH_AUDIO_CTL_UNSET_CALLBACK,
RARCH_AUDIO_CTL_CALLBACK,
RARCH_AUDIO_CTL_HAS_CALLBACK,
RARCH_AUDIO_CTL_ALIVE, RARCH_AUDIO_CTL_ALIVE,
RARCH_AUDIO_CTL_FRAME_IS_REVERSE, RARCH_AUDIO_CTL_FRAME_IS_REVERSE,
RARCH_AUDIO_CTL_SET_OWN_DRIVER, RARCH_AUDIO_CTL_SET_OWN_DRIVER,
@ -179,6 +177,10 @@ void audio_driver_setup_rewind(void);
bool audio_driver_set_callback(const void *data); bool audio_driver_set_callback(const void *data);
bool audio_driver_callback(void);
bool audio_driver_has_callback(void);
/* Sets audio monitor rate to new value. */ /* Sets audio monitor rate to new value. */
void audio_driver_monitor_set_rate(void); void audio_driver_monitor_set_rate(void);

2
audio/audio_thread_wrapper.c
View File

@ -102,7 +102,7 @@ static void audio_thread_loop(void *data)
} }
slock_unlock(thr->lock); slock_unlock(thr->lock);
audio_driver_ctl(RARCH_AUDIO_CTL_CALLBACK, NULL); audio_driver_callback();
} }
RARCH_LOG("[Audio Thread]: Tearing down driver.\n"); RARCH_LOG("[Audio Thread]: Tearing down driver.\n");

2
rewind.c
View File

@ -631,7 +631,7 @@ void init_rewind(void)
if (!settings->rewind_enable || rewind_state.state) if (!settings->rewind_enable || rewind_state.state)
return; return;
if (audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL)) if (audio_driver_has_callback())
{ {
RARCH_ERR("%s.\n", msg_hash_to_str(MSG_REWIND_INIT_FAILED)); RARCH_ERR("%s.\n", msg_hash_to_str(MSG_REWIND_INIT_FAILED));
return; return;