mirror of
https://github.com/CTCaer/RetroArch.git
synced 2025-01-02 08:08:50 +00:00
Merge branch 'master' of github.com:Themaister/RetroArch
rsound works but sound is FUBAR Conflicts: console/console_ext.c
This commit is contained in:
commit
318d7a85d6
@ -714,21 +714,33 @@ void rarch_exec (void)
|
||||
#ifdef HAVE_RSOUND
|
||||
bool rarch_console_rsound_start(const char *ip)
|
||||
{
|
||||
uninit_audio();
|
||||
strlcpy(g_settings.audio.driver, "rsound", sizeof(g_settings.audio.driver));
|
||||
strlcpy(g_settings.audio.device, ip, sizeof(g_settings.audio.device));
|
||||
driver.audio = &audio_rsound;
|
||||
driver.audio_data = NULL;
|
||||
init_audio();
|
||||
|
||||
// If driver already has started, it must be reinited.
|
||||
if (driver.audio_data)
|
||||
{
|
||||
uninit_audio();
|
||||
driver.audio_data = NULL;
|
||||
init_drivers_pre();
|
||||
init_audio();
|
||||
}
|
||||
return g_extern.audio_active;
|
||||
}
|
||||
|
||||
void rarch_console_rsound_stop(void)
|
||||
{
|
||||
const char *default_audio = config_get_default_audio();
|
||||
uninit_audio();
|
||||
strlcpy(g_settings.audio.driver, default_audio, sizeof(g_settings.audio.driver));
|
||||
init_drivers_pre();
|
||||
init_audio();
|
||||
strlcpy(g_settings.audio.driver, config_get_default_audio(), sizeof(g_settings.audio.driver));
|
||||
|
||||
// If driver already has started, it must be reinited.
|
||||
if (driver.audio_data)
|
||||
{
|
||||
uninit_audio();
|
||||
driver.audio_data = NULL;
|
||||
init_drivers_pre();
|
||||
init_audio();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user