mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 18:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create more RARCH_AUDIO_CTL commands

Browse Source
This commit is contained in:
twinaphex 2015-11-22 15:22:08 +01:00
parent 82e8cee97b
commit f60c3395f0
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
audio/audio_driver.c
View File

@ -729,8 +729,6 @@ void audio_driver_frame_is_reverse(void)
audio_data.rewind_size - audio_data.rewind_ptr); audio_data.rewind_size - audio_data.rewind_ptr);
} }
void audio_driver_set_buffer_size(size_t bufsize) void audio_driver_set_buffer_size(size_t bufsize)
{ {
audio_data.driver_buffer_size = bufsize; audio_data.driver_buffer_size = bufsize;
@ -745,15 +743,6 @@ void audio_driver_set_callback(const void *data)
audio_data.audio_callback = *cb; audio_data.audio_callback = *cb;
} }
void audio_driver_callback(void)
{
if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL))
return;
if (audio_data.audio_callback.callback)
audio_data.audio_callback.callback();
}
void audio_driver_callback_set_state(bool state) void audio_driver_callback_set_state(bool state)
{ {
if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL)) if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL))
@ -803,6 +792,13 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
return uninit_audio(); return uninit_audio();
case RARCH_AUDIO_CTL_HAS_CALLBACK: case RARCH_AUDIO_CTL_HAS_CALLBACK:
return audio_data.audio_callback.callback; return audio_data.audio_callback.callback;
case RARCH_AUDIO_CTL_CALLBACK:
if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL))
return false;
if (audio_data.audio_callback.callback)
audio_data.audio_callback.callback();
return true;
case RARCH_AUDIO_CTL_MONITOR_ADJUST_SYSTEM_RATES: case RARCH_AUDIO_CTL_MONITOR_ADJUST_SYSTEM_RATES:
audio_monitor_adjust_system_rates(); audio_monitor_adjust_system_rates();
return true; return true;

3
audio/audio_driver.h
View File

@ -83,6 +83,7 @@ enum rarch_audio_ctl_state
RARCH_AUDIO_CTL_MONITOR_SET_REFRESH_RATE, RARCH_AUDIO_CTL_MONITOR_SET_REFRESH_RATE,
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_CALLBACK,
RARCH_AUDIO_CTL_HAS_CALLBACK, RARCH_AUDIO_CTL_HAS_CALLBACK,
RARCH_AUDIO_CTL_ALIVE RARCH_AUDIO_CTL_ALIVE
}; };
@ -144,8 +145,6 @@ void audio_driver_set_buffer_size(size_t bufsize);
void audio_driver_set_callback(const void *info); void audio_driver_set_callback(const void *info);
void audio_driver_callback(void);
void audio_driver_callback_set_state(bool state); void audio_driver_callback_set_state(bool state);

2
audio/audio_thread_wrapper.c
View File

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