From 9c0b2479f7025a84444adf08e3be8ced60dad013 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 1 Aug 2010 16:15:27 +0000 Subject: Rockbox as an application: add get_user_file_path(). For RaaA it evaluates user paths at runtime. For everything but codecs/plugins it will give the path under $HOME/.config/rockbox.org if write access is needed or if the file/folder in question exists there (otherwise it gives /usr/local/share/rockbox). This allows for installing themes under $HOME as well as having config.cfg and other important files there while installing the application (and default themes) under /usr/local. On the DAPs it's a no-op, returing /.rockbox directly. Not converted to use get_user_file_path() are plugins themselves, because RaaA doesn't build plugins yet. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27656 a1c6a512-1295-4272-9138-f99709370657 --- apps/menus/main_menu.c | 5 ++++- apps/menus/theme_menu.c | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'apps/menus') diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index a64b1f8e47..1d22dba7ea 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -110,9 +110,12 @@ MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config, /***********************************/ /* INFO MENU */ + static bool show_credits(void) { - if (plugin_load(VIEWERS_DIR "/credits.rock",NULL) != PLUGIN_OK) + char credits[MAX_PATH] = { '\0' }; + snprintf(credits, MAX_PATH, "%s/credits.rock", VIEWERS_DIR); + if (plugin_load(credits, NULL) != PLUGIN_OK) { /* show the rockbox logo and version untill a button is pressed */ show_logo(); diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index f8fb06b22f..c6553728a1 100644 --- a/apps/menus/theme_menu.c +++ b/apps/menus/theme_menu.c @@ -241,9 +241,11 @@ static struct browse_folder_info themes = {THEME_DIR, SHOW_CFG}; int browse_folder(void *param) { + char path[MAX_PATH]; const struct browse_folder_info *info = (const struct browse_folder_info*)param; - return rockbox_browse(info->dir, info->show_options); + return rockbox_browse(get_user_file_path(info->dir, 0, path, sizeof(path)), + info->show_options); } #ifdef HAVE_LCD_BITMAP -- cgit v1.2.3