CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-25 20:25:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/libretro/RetroArch

Browse Source
This commit is contained in:
Twinaphex 2014-07-18 19:41:08 +02:00
commit 6147fb0a2a
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/resampler.c
View File

@ -45,7 +45,7 @@ static const rarch_resampler_t *find_resampler_driver(const char *ident)
if (!ident)
return backends[0];
int i = find_resampler_driver_index(g_settings.audio.resampler);
int i = find_resampler_driver_index(ident);
if (i >= 0)
return backends[i];
else

10
driver.c
View File

@ -1163,8 +1163,14 @@ void init_video_input(void)
// Video driver didn't provide an input driver so we use configured one.
if (driver.input == NULL)
{
RARCH_LOG("Graphics driver did not initialize an input driver. Attempting to pick a suitable driver.\n");
driver.input = tmp;
if (tmp)
driver.input = tmp;
else
find_input_driver();
if (driver.input)
{
driver.input_data = input_init_func();
@ -1177,7 +1183,7 @@ void init_video_input(void)
else
{
// This should never really happen as tmp (driver.input) is always found before this in find_driver_input(),
// or we have aborted in a similar fahsion anyways.
// or we have aborted in a similar fashion anyways.
rarch_fail(1, "init_video_input()");
}
}

2
settings.c
View File

@ -272,7 +272,7 @@ void config_set_defaults(void)
if (def_audio)
strlcpy(g_settings.audio.driver, def_audio, sizeof(g_settings.audio.driver));
if (def_audio_resampler)
strlcpy(g_settings.audio.resampler, def_audio, sizeof(g_settings.audio.resampler));
strlcpy(g_settings.audio.resampler, def_audio_resampler, sizeof(g_settings.audio.resampler));
if (def_input)
strlcpy(g_settings.input.driver, def_input, sizeof(g_settings.input.driver));
#ifdef HAVE_MENU