From e030aee324bf0ecff4a8fc95af4b29a8ae7daed3 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 3 Jul 2015 22:26:08 +0200 Subject: [PATCH] (Android) Add default dirs for playlists, wallpapers, remaps --- configuration.c | 6 ++++++ frontend/drivers/platform_android.c | 6 ++++++ general.h | 2 ++ 3 files changed, 14 insertions(+) diff --git a/configuration.c b/configuration.c index 4d9ecd1c00..f75c9a88af 100644 --- a/configuration.c +++ b/configuration.c @@ -722,6 +722,12 @@ static void config_set_defaults(void) global->console.sound.mode = SOUND_MODE_NORMAL; #endif + if (*g_defaults.wallpapers_dir) + strlcpy(settings->dynamic_wallpapers_directory, + g_defaults.wallpapers_dir, sizeof(settings->dynamic_wallpapers_directory)); + if (*g_defaults.remap_dir) + strlcpy(settings->input_remapping_directory, + g_defaults.remap_dir, sizeof(settings->input_remapping_directory)); if (*g_defaults.extraction_dir) strlcpy(settings->extraction_directory, g_defaults.extraction_dir, sizeof(settings->extraction_directory)); diff --git a/frontend/drivers/platform_android.c b/frontend/drivers/platform_android.c index 284a0507dd..d0f0ac821b 100644 --- a/frontend/drivers/platform_android.c +++ b/frontend/drivers/platform_android.c @@ -621,6 +621,12 @@ static void frontend_android_get_environment_settings(int *argc, path, "database/cursors", sizeof(g_defaults.cursor_dir)); fill_pathname_join(g_defaults.cheats_dir, path, "cheats", sizeof(g_defaults.cheats_dir)); + fill_pathname_join(g_defaults.playlist_dir, + path, "playlists", sizeof(g_defaults.playlist_dir)); + fill_pathname_join(g_defaults.remap_dir, + path, "remaps", sizeof(g_defaults.remap_dir)); + fill_pathname_join(g_defaults.wallpapers_dir, + path, "wallpapers", sizeof(g_defaults.wallpapers_dir)); } } } diff --git a/general.h b/general.h index 7466a9e0b4..a803820865 100644 --- a/general.h +++ b/general.h @@ -91,7 +91,9 @@ struct defaults char system_dir[PATH_MAX_LENGTH]; char playlist_dir[PATH_MAX_LENGTH]; char content_history_dir[PATH_MAX_LENGTH]; + char remap_dir[PATH_MAX_LENGTH]; char extraction_dir[PATH_MAX_LENGTH]; + char wallpapers_dir[PATH_MAX_LENGTH]; char database_dir[PATH_MAX_LENGTH]; char cursor_dir[PATH_MAX_LENGTH]; char cheats_dir[PATH_MAX_LENGTH];