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

(menu_shader) use config_file_from_string

Browse Source
This commit is contained in:
twinaphex 2019-07-16 19:24:42 +02:00
parent 319e708738
commit 85fdd5fbd1
1 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
menu/menu_shader.c
View File

@ -20,6 +20,7 @@
#include <retro_assert.h> #include <retro_assert.h>
#include <file/file_path.h> #include <file/file_path.h>
#include <string/stdstring.h> #include <string/stdstring.h>
#include <streams/file_stream.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../config.h" #include "../config.h"
@ -101,20 +102,48 @@ bool menu_shader_manager_init(void)
fill_pathname_join(preset_path, shader_dir, fill_pathname_join(preset_path, shader_dir,
"menu.glslp", sizeof(preset_path)); "menu.glslp", sizeof(preset_path));
conf = config_file_new(preset_path);
{
int64_t length = 0;
uint8_t *ret_buf = NULL;
if (filestream_read_file(preset_path, (void**)&ret_buf, &length))
{
if (length >= 0)
conf = config_file_new_from_string((const char*)ret_buf);
free((void*)ret_buf);
}
}
if (!conf) if (!conf)
{ {
fill_pathname_join(preset_path, shader_dir, fill_pathname_join(preset_path, shader_dir,
"menu.cgp", sizeof(preset_path)); "menu.cgp", sizeof(preset_path));
conf = config_file_new(preset_path); {
int64_t length = 0;
uint8_t *ret_buf = NULL;
if (filestream_read_file(preset_path, (void**)&ret_buf, &length))
{
if (length >= 0)
conf = config_file_new_from_string((const char*)ret_buf);
free((void*)ret_buf);
}
}
} }
if (!conf) if (!conf)
{ {
fill_pathname_join(preset_path, shader_dir, fill_pathname_join(preset_path, shader_dir,
"menu.slangp", sizeof(preset_path)); "menu.slangp", sizeof(preset_path));
conf = config_file_new(preset_path); {
int64_t length = 0;
uint8_t *ret_buf = NULL;
if (filestream_read_file(preset_path, (void**)&ret_buf, &length))
{
if (length >= 0)
conf = config_file_new_from_string((const char*)ret_buf);
free((void*)ret_buf);
}
}
} }
new_path = strdup(preset_path); new_path = strdup(preset_path);
@ -149,6 +178,8 @@ bool menu_shader_manager_init(void)
bool menu_shader_manager_set_preset(void *data, bool menu_shader_manager_set_preset(void *data,
enum rarch_shader_type type, const char *preset_path) enum rarch_shader_type type, const char *preset_path)
{ {
int64_t length = 0;
uint8_t *ret_buf = NULL;
struct video_shader *shader = (struct video_shader*)data; struct video_shader *shader = (struct video_shader*)data;
config_file_t *conf = NULL; config_file_t *conf = NULL;
bool refresh = false; bool refresh = false;
@ -174,11 +205,17 @@ bool menu_shader_manager_set_preset(void *data,
* Used when a preset is directly loaded. * Used when a preset is directly loaded.
* No point in updating when the Preset was * No point in updating when the Preset was
* created from the menu itself. */ * created from the menu itself. */
conf = config_file_new(preset_path); if (filestream_read_file(preset_path, (void**)&ret_buf, &length))
{
if (length >= 0)
conf = config_file_new_from_string((const char*)ret_buf);
free((void*)ret_buf);
}
if (!conf) if (!conf)
return false; return false;
conf->path = strdup(preset_path);
RARCH_LOG("Setting Menu shader: %s.\n", preset_path); RARCH_LOG("Setting Menu shader: %s.\n", preset_path);
if (video_shader_read_conf_preset(conf, shader)) if (video_shader_read_conf_preset(conf, shader))