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/filetypes.c | |
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/filetypes.c')
-rw-r--r-- | apps/filetypes.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/filetypes.c b/apps/filetypes.c index 4be2437a29..67a4c176fb 100644 --- a/apps/filetypes.c +++ b/apps/filetypes.c | |||
@@ -175,7 +175,7 @@ static char *filetypes_strdup(char* string) | |||
175 | return buffer; | 175 | return buffer; |
176 | } | 176 | } |
177 | static void read_builtin_types(void); | 177 | static void read_builtin_types(void); |
178 | static void read_config(char* config_file); | 178 | static void read_config(const char* config_file); |
179 | #ifdef HAVE_LCD_COLOR | 179 | #ifdef HAVE_LCD_COLOR |
180 | /* Colors file format is similar to icons: | 180 | /* Colors file format is similar to icons: |
181 | * ext:hex_color | 181 | * ext:hex_color |
@@ -272,6 +272,7 @@ void read_viewer_theme_file(void) | |||
272 | 272 | ||
273 | void filetype_init(void) | 273 | void filetype_init(void) |
274 | { | 274 | { |
275 | char path[MAX_PATH]; | ||
275 | /* set the directory item first */ | 276 | /* set the directory item first */ |
276 | filetypes[0].extension = NULL; | 277 | filetypes[0].extension = NULL; |
277 | filetypes[0].plugin = NULL; | 278 | filetypes[0].plugin = NULL; |
@@ -280,7 +281,7 @@ void filetype_init(void) | |||
280 | 281 | ||
281 | filetype_count = 1; | 282 | filetype_count = 1; |
282 | read_builtin_types(); | 283 | read_builtin_types(); |
283 | read_config(VIEWERS_CONFIG); | 284 | read_config(get_user_file_path(VIEWERS_CONFIG, IS_FILE, path, sizeof(path))); |
284 | #ifdef HAVE_LCD_BITMAP | 285 | #ifdef HAVE_LCD_BITMAP |
285 | read_viewer_theme_file(); | 286 | read_viewer_theme_file(); |
286 | #endif | 287 | #endif |
@@ -320,7 +321,7 @@ static void read_builtin_types(void) | |||
320 | } | 321 | } |
321 | } | 322 | } |
322 | 323 | ||
323 | static void read_config(char* config_file) | 324 | static void read_config(const char* config_file) |
324 | { | 325 | { |
325 | char line[64], *s, *e; | 326 | char line[64], *s, *e; |
326 | char extension[8], plugin[32]; | 327 | char extension[8], plugin[32]; |