diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-08-01 16:15:27 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-08-01 16:15:27 +0000 |
commit | 9c0b2479f7025a84444adf08e3be8ced60dad013 (patch) | |
tree | f3d328dd73f46d599f0432cc43ae206798cbe4f6 /apps/menus | |
parent | 2e7d92fef707a2cd30820fd0053c539c3ac8e2b3 (diff) | |
download | rockbox-9c0b2479f7025a84444adf08e3be8ced60dad013.tar.gz rockbox-9c0b2479f7025a84444adf08e3be8ced60dad013.zip |
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
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/main_menu.c | 5 | ||||
-rw-r--r-- | apps/menus/theme_menu.c | 4 |
2 files changed, 7 insertions, 2 deletions
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, | |||
110 | /***********************************/ | 110 | /***********************************/ |
111 | /* INFO MENU */ | 111 | /* INFO MENU */ |
112 | 112 | ||
113 | |||
113 | static bool show_credits(void) | 114 | static bool show_credits(void) |
114 | { | 115 | { |
115 | if (plugin_load(VIEWERS_DIR "/credits.rock",NULL) != PLUGIN_OK) | 116 | char credits[MAX_PATH] = { '\0' }; |
117 | snprintf(credits, MAX_PATH, "%s/credits.rock", VIEWERS_DIR); | ||
118 | if (plugin_load(credits, NULL) != PLUGIN_OK) | ||
116 | { | 119 | { |
117 | /* show the rockbox logo and version untill a button is pressed */ | 120 | /* show the rockbox logo and version untill a button is pressed */ |
118 | show_logo(); | 121 | 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}; | |||
241 | 241 | ||
242 | int browse_folder(void *param) | 242 | int browse_folder(void *param) |
243 | { | 243 | { |
244 | char path[MAX_PATH]; | ||
244 | const struct browse_folder_info *info = | 245 | const struct browse_folder_info *info = |
245 | (const struct browse_folder_info*)param; | 246 | (const struct browse_folder_info*)param; |
246 | return rockbox_browse(info->dir, info->show_options); | 247 | return rockbox_browse(get_user_file_path(info->dir, 0, path, sizeof(path)), |
248 | info->show_options); | ||
247 | } | 249 | } |
248 | 250 | ||
249 | #ifdef HAVE_LCD_BITMAP | 251 | #ifdef HAVE_LCD_BITMAP |