diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2020-09-30 14:53:09 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2020-09-30 18:56:54 +0000 |
| commit | ff408fd7177e8205c89cc17050d039b47d294ac7 (patch) | |
| tree | 2bbc40059fbce157b4a21fcde924097ebf98827d | |
| parent | 1c0648c603998e52203826c6406f183681184838 (diff) | |
| download | rockbox-ff408fd7177e8205c89cc17050d039b47d294ac7.tar.gz rockbox-ff408fd7177e8205c89cc17050d039b47d294ac7.zip | |
Leave HOME_DIR out of default recording and playlist paths
The hosted filesystem code will automatically prepend HOME_DIR.
Change-Id: I36a76e51637ab2bb68353f8eb9ffac25ca75bad1
| -rw-r--r-- | firmware/export/rbpaths.h | 4 | ||||
| -rw-r--r-- | firmware/target/hosted/filesystem-app.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h index de591f0ec1..87a6dd91ff 100644 --- a/firmware/export/rbpaths.h +++ b/firmware/export/rbpaths.h | |||
| @@ -79,8 +79,8 @@ | |||
| 79 | 79 | ||
| 80 | #define HOME_DIR_LEN (sizeof(HOME_DIR)-1) | 80 | #define HOME_DIR_LEN (sizeof(HOME_DIR)-1) |
| 81 | 81 | ||
| 82 | #define REC_BASE_DIR HOME_DIR | 82 | #define REC_BASE_DIR "/Recordings" |
| 83 | #define PLAYLIST_CATALOG_DEFAULT_DIR HOME_DIR "/Playlists" | 83 | #define PLAYLIST_CATALOG_DEFAULT_DIR "/Playlists" |
| 84 | 84 | ||
| 85 | #define LANG_DIR ROCKBOX_DIR "/langs" | 85 | #define LANG_DIR ROCKBOX_DIR "/langs" |
| 86 | 86 | ||
diff --git a/firmware/target/hosted/filesystem-app.c b/firmware/target/hosted/filesystem-app.c index 3cb0dd3653..57f9b47282 100644 --- a/firmware/target/hosted/filesystem-app.c +++ b/firmware/target/hosted/filesystem-app.c | |||
| @@ -46,13 +46,13 @@ static const char rbhome[] = "/sdcard"; | |||
| 46 | && !defined(__PCTOOL__) | 46 | && !defined(__PCTOOL__) |
| 47 | static const char *rbhome; | 47 | static const char *rbhome; |
| 48 | #else | 48 | #else |
| 49 | /* YPR0, YPR1, NWZ */ | 49 | /* YPR0, YPR1, NWZ, etc */ |
| 50 | static const char rbhome[] = HOME_DIR; | 50 | static const char rbhome[] = HOME_DIR; |
| 51 | #endif | 51 | #endif |
| 52 | 52 | ||
| 53 | #if !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || defined(DX50) || \ | 53 | #if !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || defined(DX50) || \ |
| 54 | defined(SONY_NWZ_LINUX) || defined(DX90) || defined(AGPTEK_ROCKER) || \ | 54 | defined(SONY_NWZ_LINUX) || defined(DX90) || defined(AGPTEK_ROCKER) || \ |
| 55 | defined(XDUOO_X3II) || defined(XDUOO_X20)) && \ | 55 | defined(XDUOO_X3II) || defined(XDUOO_X20)) && \ |
| 56 | !defined(__PCTOOL__) | 56 | !defined(__PCTOOL__) |
| 57 | /* Special dirs are user-accessible (and user-writable) dirs which take priority | 57 | /* Special dirs are user-accessible (and user-writable) dirs which take priority |
| 58 | * over the ones where Rockbox is installed to. Classic example would be | 58 | * over the ones where Rockbox is installed to. Classic example would be |