diff options
-rw-r--r-- | apps/gui/icon.c | 1 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_engine.c | 1 | ||||
-rw-r--r-- | apps/menus/eq_menu.c | 1 | ||||
-rw-r--r-- | apps/menus/playlist_menu.c | 1 | ||||
-rw-r--r-- | apps/menus/recording_menu.c | 1 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 1 | ||||
-rw-r--r-- | apps/menus/theme_menu.c | 1 | ||||
-rw-r--r-- | apps/playlist_catalog.c | 1 | ||||
-rw-r--r-- | apps/radio/presets.c | 2 | ||||
-rw-r--r-- | apps/radio/radioart.c | 2 | ||||
-rw-r--r-- | apps/scrobbler.c | 4 | ||||
-rw-r--r-- | apps/settings.h | 1 | ||||
-rw-r--r-- | apps/settings_list.c | 1 | ||||
-rw-r--r-- | apps/shortcuts.c | 1 | ||||
-rw-r--r-- | firmware/drivers/audio/erosqlinux_codec.c | 3 | ||||
-rw-r--r-- | firmware/export/rbpaths.h | 2 | ||||
-rw-r--r-- | firmware/font.c | 1 |
17 files changed, 15 insertions, 10 deletions
diff --git a/apps/gui/icon.c b/apps/gui/icon.c index 5190c54ea5..25c0b372fa 100644 --- a/apps/gui/icon.c +++ b/apps/gui/icon.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include "screen_access.h" | 28 | #include "screen_access.h" |
29 | #include "icons.h" | 29 | #include "icons.h" |
30 | #include "settings.h" | 30 | #include "settings.h" |
31 | #include "rbpaths.h" | ||
31 | #include "bmp.h" | 32 | #include "bmp.h" |
32 | #include "filetypes.h" | 33 | #include "filetypes.h" |
33 | #include "language.h" | 34 | #include "language.h" |
diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c index 1515e6f025..ce3401f41c 100644 --- a/apps/gui/skin_engine/skin_engine.c +++ b/apps/gui/skin_engine/skin_engine.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include "action.h" | 27 | #include "action.h" |
28 | #include "crc32.h" | 28 | #include "crc32.h" |
29 | #include "settings.h" | 29 | #include "settings.h" |
30 | #include "rbpaths.h" | ||
30 | #include "wps.h" | 31 | #include "wps.h" |
31 | #include "file.h" | 32 | #include "file.h" |
32 | #include "misc.h" | 33 | #include "misc.h" |
diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c index 683025629b..49d35c133b 100644 --- a/apps/menus/eq_menu.c +++ b/apps/menus/eq_menu.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "menu.h" | 31 | #include "menu.h" |
32 | #include "action.h" | 32 | #include "action.h" |
33 | #include "settings.h" | 33 | #include "settings.h" |
34 | #include "rbpaths.h" | ||
34 | #include "screens.h" | 35 | #include "screens.h" |
35 | #include "icons.h" | 36 | #include "icons.h" |
36 | #include "font.h" | 37 | #include "font.h" |
diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c index dfb9d73d62..3122a4090f 100644 --- a/apps/menus/playlist_menu.c +++ b/apps/menus/playlist_menu.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include "lang.h" | 26 | #include "lang.h" |
27 | #include "action.h" | 27 | #include "action.h" |
28 | #include "settings.h" | 28 | #include "settings.h" |
29 | #include "string-extra.h" | ||
29 | #include "menu.h" | 30 | #include "menu.h" |
30 | #include "playlist_menu.h" | 31 | #include "playlist_menu.h" |
31 | 32 | ||
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index c3187afbef..a870a5ee9b 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include "menu.h" | 30 | #include "menu.h" |
31 | #include "button.h" | 31 | #include "button.h" |
32 | #include "settings.h" | 32 | #include "settings.h" |
33 | #include "rbpaths.h" | ||
33 | #include "screens.h" | 34 | #include "screens.h" |
34 | #include "icons.h" | 35 | #include "icons.h" |
35 | #include "font.h" | 36 | #include "font.h" |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 0b7516f749..4202298fa3 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include "lang.h" | 27 | #include "lang.h" |
28 | #include "action.h" | 28 | #include "action.h" |
29 | #include "settings.h" | 29 | #include "settings.h" |
30 | #include "rbpaths.h" | ||
30 | #include "menu.h" | 31 | #include "menu.h" |
31 | #include "open_plugin.h" | 32 | #include "open_plugin.h" |
32 | #include "keyboard.h" | 33 | #include "keyboard.h" |
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index 4a81c5cadf..2a50ed44b5 100644 --- a/apps/menus/theme_menu.c +++ b/apps/menus/theme_menu.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include "lang.h" | 27 | #include "lang.h" |
28 | #include "action.h" | 28 | #include "action.h" |
29 | #include "settings.h" | 29 | #include "settings.h" |
30 | #include "rbpaths.h" | ||
30 | #include "menu.h" | 31 | #include "menu.h" |
31 | #include "tree.h" | 32 | #include "tree.h" |
32 | #include "list.h" | 33 | #include "list.h" |
diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c index 9d31ac333c..d100023b1b 100644 --- a/apps/playlist_catalog.c +++ b/apps/playlist_catalog.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include "onplay.h" | 36 | #include "onplay.h" |
37 | #include "playlist.h" | 37 | #include "playlist.h" |
38 | #include "settings.h" | 38 | #include "settings.h" |
39 | #include "rbpaths.h" | ||
39 | #include "splash.h" | 40 | #include "splash.h" |
40 | #include "tree.h" | 41 | #include "tree.h" |
41 | #include "yesno.h" | 42 | #include "yesno.h" |
diff --git a/apps/radio/presets.c b/apps/radio/presets.c index 6db6e4686b..f7531d8754 100644 --- a/apps/radio/presets.c +++ b/apps/radio/presets.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <stdio.h> | 23 | #include <stdio.h> |
24 | #include <stdbool.h> | 24 | #include <stdbool.h> |
25 | #include <stdlib.h> | 25 | #include <stdlib.h> |
26 | #include "settings.h" | 26 | #include "rbpaths.h" |
27 | #include "general.h" | 27 | #include "general.h" |
28 | #include "radio.h" | 28 | #include "radio.h" |
29 | #include "tuner.h" | 29 | #include "tuner.h" |
diff --git a/apps/radio/radioart.c b/apps/radio/radioart.c index 1fd82dae68..34efdea0da 100644 --- a/apps/radio/radioart.c +++ b/apps/radio/radioart.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <stdbool.h> | 24 | #include <stdbool.h> |
25 | #include <stdlib.h> | 25 | #include <stdlib.h> |
26 | #include "system.h" | 26 | #include "system.h" |
27 | #include "settings.h" | 27 | #include "rbpaths.h" |
28 | #include "radio.h" | 28 | #include "radio.h" |
29 | #include "buffering.h" | 29 | #include "buffering.h" |
30 | #include "playback.h" /* bufopen_user_data */ | 30 | #include "playback.h" /* bufopen_user_data */ |
diff --git a/apps/scrobbler.c b/apps/scrobbler.c index 657ce2e7ab..f5ccf4a61c 100644 --- a/apps/scrobbler.c +++ b/apps/scrobbler.c | |||
@@ -31,11 +31,11 @@ http://www.audioscrobbler.net/wiki/Portable_Player_Logging | |||
31 | #include "kernel.h" | 31 | #include "kernel.h" |
32 | #include "audio.h" | 32 | #include "audio.h" |
33 | #include "core_alloc.h" | 33 | #include "core_alloc.h" |
34 | #include "settings.h" | 34 | #include "rbpaths.h" |
35 | #include "ata_idle_notify.h" | 35 | #include "ata_idle_notify.h" |
36 | #include "pathfuncs.h" | 36 | #include "pathfuncs.h" |
37 | #include "appevents.h" | 37 | #include "appevents.h" |
38 | 38 | #include "string-extra.h" | |
39 | #if CONFIG_RTC | 39 | #if CONFIG_RTC |
40 | #include "time.h" | 40 | #include "time.h" |
41 | #include "timefuncs.h" | 41 | #include "timefuncs.h" |
diff --git a/apps/settings.h b/apps/settings.h index e8241c5f9a..5d6d4cb717 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -32,7 +32,6 @@ | |||
32 | #include "button.h" | 32 | #include "button.h" |
33 | #include "audio.h" | 33 | #include "audio.h" |
34 | #include "dsp_proc_settings.h" | 34 | #include "dsp_proc_settings.h" |
35 | #include "rbpaths.h" | ||
36 | 35 | ||
37 | struct opt_items { | 36 | struct opt_items { |
38 | unsigned const char* string; | 37 | unsigned const char* string; |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 1b06bfe11c..4a0bf96864 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include "backlight.h" | 32 | #include "backlight.h" |
33 | #include "sound.h" | 33 | #include "sound.h" |
34 | #include "settings.h" | 34 | #include "settings.h" |
35 | #include "rbpaths.h" | ||
35 | #include "settings_list.h" | 36 | #include "settings_list.h" |
36 | #include "usb.h" | 37 | #include "usb.h" |
37 | #include "audio.h" | 38 | #include "audio.h" |
diff --git a/apps/shortcuts.c b/apps/shortcuts.c index 78d8fc6cb5..9955b7f19d 100644 --- a/apps/shortcuts.c +++ b/apps/shortcuts.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include "list.h" | 33 | #include "list.h" |
34 | #include "settings.h" | 34 | #include "settings.h" |
35 | #include "settings_list.h" | 35 | #include "settings_list.h" |
36 | #include "string-extra.h" | ||
36 | #include "lang.h" | 37 | #include "lang.h" |
37 | #include "menu.h" | 38 | #include "menu.h" |
38 | #include "misc.h" | 39 | #include "misc.h" |
diff --git a/firmware/drivers/audio/erosqlinux_codec.c b/firmware/drivers/audio/erosqlinux_codec.c index 58104a61e6..abb4fea01f 100644 --- a/firmware/drivers/audio/erosqlinux_codec.c +++ b/firmware/drivers/audio/erosqlinux_codec.c | |||
@@ -20,9 +20,6 @@ | |||
20 | * KIND, either express or implied. | 20 | * KIND, either express or implied. |
21 | * | 21 | * |
22 | ****************************************************************************/ | 22 | ****************************************************************************/ |
23 | #define RB_FILESYSTEM_OS // VERY important this is before settings.h | ||
24 | // because that pulls in rbpaths.h which breaks open() | ||
25 | |||
26 | //#define LOGF_ENABLE | 23 | //#define LOGF_ENABLE |
27 | 24 | ||
28 | #include "config.h" | 25 | #include "config.h" |
diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h index f53d0eb480..a3042d80bc 100644 --- a/firmware/export/rbpaths.h +++ b/firmware/export/rbpaths.h | |||
@@ -24,8 +24,6 @@ | |||
24 | 24 | ||
25 | #include <stdbool.h> | 25 | #include <stdbool.h> |
26 | #include "autoconf.h" | 26 | #include "autoconf.h" |
27 | #include "string-extra.h" | ||
28 | |||
29 | 27 | ||
30 | /* name of directory where configuration, fonts and other data | 28 | /* name of directory where configuration, fonts and other data |
31 | * files are stored */ | 29 | * files are stored */ |
diff --git a/firmware/font.c b/firmware/font.c index 595410fed2..b8fa1c537f 100644 --- a/firmware/font.c +++ b/firmware/font.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include "system.h" | 34 | #include "system.h" |
35 | #include "kernel.h" | 35 | #include "kernel.h" |
36 | #include "lcd.h" | 36 | #include "lcd.h" |
37 | #include "string-extra.h" | ||
37 | #include "font.h" | 38 | #include "font.h" |
38 | #include "file.h" | 39 | #include "file.h" |
39 | #include "core_alloc.h" | 40 | #include "core_alloc.h" |