--- orig/apps/bookmark.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/bookmark.c 2007-10-21 13:28:44.000000000 +0200
@@ -58,7 +58,7 @@
#define MAX_BOOKMARKS 10
#define MAX_BOOKMARK_SIZE 350
-#define RECENT_BOOKMARK_FILE ROCKBOX_DIR "/most-recent.bmark"
+#define RECENT_BOOKMARK_FILE ROCKBOX_USER_DATA "/most-recent.bmark"
/* Used to buffer bookmarks while displaying the bookmark list. */
struct bookmark_list
--- orig/apps/cuesheet.c 2007-09-20 22:31:59.000000000 +0200
+++ dev/apps/cuesheet.c 2007-10-21 13:28:44.000000000 +0200
@@ -41,7 +41,7 @@
#include "playback.h"
#include "cuesheet.h"
-#define CUE_DIR ROCKBOX_DIR "/cue"
+#define CUE_DIR ROCKBOX_USER "/cue"
#if CONFIG_CODEC != SWCODEC
/* special trickery because the hwcodec playback engine is in firmware/ */
--- orig/apps/filetypes.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/filetypes.c 2007-10-21 13:28:44.000000000 +0200
@@ -157,7 +157,13 @@
global_settings.colors_file);
fd = open(buffer, O_RDONLY);
if (fd < 0)
- return;
+ {
+ snprintf(buffer, MAX_PATH, "%s/%s.colours", THEME_DIR_USER,
+ global_settings.colors_file);
+ fd = open(buffer, O_RDONLY);
+ if (fd < 0)
+ return;
+ }
while (read_line(fd, buffer, MAX_PATH) > 0)
{
if (!settings_parseline(buffer, &ext, &color))
@@ -204,7 +210,13 @@
global_settings.viewers_icon_file);
fd = open(buffer, O_RDONLY);
if (fd < 0)
- return;
+ {
+ snprintf(buffer, MAX_PATH, "%s/%s.icons", ICON_DIR_USER,
+ global_settings.viewers_icon_file);
+ fd = open(buffer, O_RDONLY);
+ if (fd < 0)
+ return;
+ }
while (read_line(fd, buffer, MAX_PATH) > 0)
{
if (!settings_parseline(buffer, &ext, &icon))
--- orig/apps/gui/icon.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/gui/icon.c 2007-10-21 13:28:44.000000000 +0200
@@ -225,6 +225,15 @@
{
*loaded_ok = true;
}
+ else
+ {
+ snprintf(path, sizeof(path), "%s/%s.bmp", ICON_DIR_USER, filename);
+ size_read = read_bmp_file(path, bmp, IMG_BUFSIZE, bmpformat);
+ if (size_read > 0)
+ {
+ *loaded_ok = true;
+ }
+ }
}
}
--- orig/apps/lang/english.lang 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/lang/english.lang 2007-10-21 13:28:44.000000000 +0200
@@ -11431,3 +11431,18 @@
*: "Empty list"
+
+ id: LANG_USER
+ desc: in the main menu and settings menu
+ user:
+
+ *: "User"
+
+
+ *: "User"
+
+
+ *: "User"
+
+
+
--- orig/apps/logfdisp.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/logfdisp.c 2007-10-21 13:28:44.000000000 +0200
@@ -109,7 +109,7 @@
/* nothing is logged just yet */
return false;
- fd = open(ROCKBOX_DIR "/logf.txt", O_CREAT|O_WRONLY|O_TRUNC);
+ fd = open(ROCKBOX_USER "/logf.txt", O_CREAT|O_WRONLY|O_TRUNC);
if(-1 != fd) {
unsigned char buffer[MAX_LOGF_ENTRY +1];
int index = logfindex-1;
--- orig/apps/menus/eq_menu.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/menus/eq_menu.c 2007-10-21 13:28:44.000000000 +0200
@@ -610,7 +610,7 @@
char filename[MAX_PATH];
int *setting;
- create_numbered_filename(filename, EQS_DIR, "eq", ".cfg", 2
+ create_numbered_filename(filename, EQS_DIR_USER, "eq", ".cfg", 2
IF_CNFN_NUM_(, NULL));
/* allow user to modify filename */
@@ -648,19 +648,30 @@
}
/* Allows browsing of preset files */
-bool eq_browse_presets(void)
+bool eq_browse_presets_system(void)
{
return rockbox_browse(EQS_DIR, SHOW_CFG);
}
+bool eq_browse_presets_user(void)
+{
+ return rockbox_browse(EQS_DIR_USER, SHOW_CFG);
+}
+
+MENUITEM_FUNCTION(eq_browse_system, 0, ID2P(LANG_SYSTEM),
+ (int(*)(void))eq_browse_presets_system,
+ NULL, NULL, Icon_Folder);
+MENUITEM_FUNCTION(eq_browse_user, 0, ID2P(LANG_USER),
+ (int(*)(void))eq_browse_presets_user,
+ NULL, NULL, Icon_Folder);
+MAKE_MENU(eq_browse, ID2P(LANG_EQUALIZER_BROWSE), NULL, Icon_EQ,
+ &eq_browse_system, &eq_browse_user);
MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL),
(int(*)(void))eq_menu_graphical, NULL, NULL,
Icon_EQ);
MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE),
(int(*)(void))eq_save_preset, NULL, NULL, Icon_NOICON);
-MENUITEM_FUNCTION(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE),
- (int(*)(void))eq_browse_presets, NULL, NULL, Icon_NOICON);
int soundmenu_callback(int action,const struct menu_item_ex *this_item);
MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), soundmenu_callback, Icon_EQ,
--- orig/apps/menus/eq_menu.h 2007-08-27 22:02:38.000000000 +0200
+++ dev/apps/menus/eq_menu.h 2007-10-21 13:28:44.000000000 +0200
@@ -37,7 +37,8 @@
#define EQ_USER_DIVISOR 10
-bool eq_browse_presets(void);
+bool eq_browse_presets_system(void);
+bool eq_browse_presets_user(void);
bool eq_menu_graphical(void);
/* utility functions for settings_list.c */
--- orig/apps/menus/main_menu.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/menus/main_menu.c 2007-10-21 13:28:44.000000000 +0200
@@ -50,7 +50,7 @@
-static struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG};
+static struct browse_folder_info config = {ROCKBOX_USER, SHOW_CFG};
/***********************************/
/* MANAGE SETTINGS MENU */
--- orig/apps/menus/theme_menu.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/menus/theme_menu.c 2007-10-21 13:28:44.000000000 +0200
@@ -162,14 +162,19 @@
/* LCD MENU */
/***********************************/
+
#ifdef HAVE_LCD_BITMAP
-static struct browse_folder_info fonts = {FONT_DIR, SHOW_FONT};
+static struct browse_folder_info fonts_system = {FONT_DIR, SHOW_FONT};
+static struct browse_folder_info fonts_user = {FONT_DIR_USER, SHOW_FONT};
#endif
-static struct browse_folder_info wps = {WPS_DIR, SHOW_WPS};
+static struct browse_folder_info wps_system = {WPS_DIR, SHOW_WPS};
+static struct browse_folder_info wps_user = {WPS_DIR_USER, SHOW_WPS};
#ifdef HAVE_REMOTE_LCD
-static struct browse_folder_info rwps = {WPS_DIR, SHOW_RWPS};
+static struct browse_folder_info rwps_system = {WPS_DIR, SHOW_RWPS};
+static struct browse_folder_info rwps_user = {WPS_DIR_USER, SHOW_RWPS};
#endif
-static struct browse_folder_info themes = {THEME_DIR, SHOW_CFG};
+static struct browse_folder_info theme_system = {THEME_DIR, SHOW_CFG};
+static struct browse_folder_info theme_user = {THEME_DIR_USER, SHOW_CFG};
int browse_folder(void *param)
{
@@ -178,24 +183,43 @@
return rockbox_browse(info->dir, info->show_options);
}
-#ifdef HAVE_LCD_BITMAP
-MENUITEM_FUNCTION(browse_fonts, MENU_FUNC_USEPARAM,
- ID2P(LANG_CUSTOM_FONT),
- browse_folder, (void*)&fonts, NULL, Icon_Font);
-#endif
-MENUITEM_FUNCTION(browse_wps, MENU_FUNC_USEPARAM,
- ID2P(LANG_WHILE_PLAYING),
- browse_folder, (void*)&wps, NULL, Icon_Wps);
+MENUITEM_FUNCTION(browse_themes_system, MENU_FUNC_USEPARAM, ID2P(LANG_SYSTEM),
+ browse_folder, (void*)&theme_system, NULL, Icon_Folder);
+MENUITEM_FUNCTION(browse_themes_user, MENU_FUNC_USEPARAM, ID2P(LANG_USER),
+ browse_folder, (void*)&theme_user, NULL, Icon_Folder);
+MAKE_MENU(browse_themes, ID2P(LANG_CUSTOM_THEME), NULL, Icon_Folder,
+ &browse_themes_system, &browse_themes_user);
+
+MENUITEM_FUNCTION(browse_wps_system, MENU_FUNC_USEPARAM,
+ ID2P(LANG_SYSTEM), browse_folder, (void*)&wps_system, NULL, Icon_Folder);
+MENUITEM_FUNCTION(browse_wps_user, MENU_FUNC_USEPARAM,
+ ID2P(LANG_USER), browse_folder, (void*)&wps_user, NULL, Icon_Folder);
+MAKE_MENU(browse_wps, ID2P(LANG_WHILE_PLAYING), NULL, Icon_Folder,
+ &browse_wps_system, &browse_wps_user);
+
#ifdef HAVE_REMOTE_LCD
-MENUITEM_FUNCTION(browse_rwps, MENU_FUNC_USEPARAM,
- ID2P(LANG_REMOTE_WHILE_PLAYING),
- browse_folder, (void*)&rwps, NULL, Icon_Wps);
+MENUITEM_FUNCTION(browse_rwps_system, MENU_FUNC_USEPARAM,
+ ID2P(LANG_SYSTEM),
+ browse_folder, (void*)&rwps_system, NULL, Icon_Folder);
+MENUITEM_FUNCTION(browse_rwps_user, MENU_FUNC_USEPARAM,
+ ID2P(LANG_USER),
+ browse_folder, (void*)&rwps_user, NULL, Icon_Folder);
+MAKE_MENU(browse_rwps, ID2P(LANG_REMOTE_WHILE_PLAYING), NULL, Icon_Folder,
+ &browse_rwps_system, &browse_rwps_user);
+#endif
+
+#ifdef HAVE_LCD_BITMAP
+MENUITEM_FUNCTION(browse_fonts_system, MENU_FUNC_USEPARAM,
+ ID2P(LANG_SYSTEM),
+ browse_folder, (void*)&fonts_system, NULL, Icon_Folder);
+MENUITEM_FUNCTION(browse_fonts_user, MENU_FUNC_USEPARAM,
+ ID2P(LANG_USER),
+ browse_folder, (void*)&fonts_user, NULL, Icon_Folder);
+MAKE_MENU(browse_fonts, ID2P(LANG_CUSTOM_FONT), NULL, Icon_Folder,
+ &browse_fonts_system, &browse_fonts_user);
#endif
MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL);
-MENUITEM_FUNCTION(browse_themes, MENU_FUNC_USEPARAM,
- ID2P(LANG_CUSTOM_THEME),
- browse_folder, (void*)&themes, NULL, Icon_Config);
#ifdef HAVE_LCD_BITMAP
MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, NULL);
#endif
--- orig/apps/onplay.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/onplay.c 2007-10-21 13:28:44.000000000 +0200
@@ -88,6 +88,21 @@
/* ----------------------------------------------------------------------- */
+/* Displays the browse equalizer menues */
+/* ----------------------------------------------------------------------- */
+#if CONFIG_CODEC == SWCODEC
+MENUITEM_FUNCTION(eq_browse_presets_item_system, MENU_FUNC_USEPARAM,
+ ID2P(LANG_SYSTEM), eq_browse_presets_system,
+ NULL, NULL, Icon_Audio);
+MENUITEM_FUNCTION(eq_browse_presets_item_user, MENU_FUNC_USEPARAM,
+ ID2P(LANG_USER), eq_browse_presets_user,
+ NULL, NULL, Icon_Audio);
+MAKE_MENU(eq_browse_presets_item, ID2P(LANG_EQUALIZER_BROWSE), NULL,
+ Icon_Audio, &eq_browse_presets_item_system,
+ &eq_browse_presets_item_user);
+#endif
+
+/* ----------------------------------------------------------------------- */
/* Displays the bookmark menu options for the user to decide. This is an */
/* interface function. */
/* ----------------------------------------------------------------------- */
@@ -1042,8 +1057,6 @@
#if CONFIG_CODEC == SWCODEC
MENUITEM_FUNCTION(eq_menu_graphical_item, 0, ID2P(LANG_EQUALIZER_GRAPHICAL),
eq_menu_graphical, NULL, NULL, Icon_Audio);
-MENUITEM_FUNCTION(eq_browse_presets_item, 0, ID2P(LANG_EQUALIZER_BROWSE),
- eq_browse_presets, NULL, NULL, Icon_Audio);
#endif
/* CONTEXT_[TREE|ID3DB] items */
--- orig/apps/playlist.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/playlist.c 2007-10-21 13:28:44.000000000 +0200
@@ -1390,7 +1390,7 @@
if (global_settings.next_folder == FOLDER_ADVANCE_RANDOM)
{
- int fd = open(ROCKBOX_DIR "/folder_advance_list.dat",O_RDONLY);
+ int fd = open(ROCKBOX_USER_DATA "/folder_advance_list.dat",O_RDONLY);
char buffer[MAX_PATH];
int folder_count = 0,i;
srand(current_tick);
--- orig/apps/playlist_catalog.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/playlist_catalog.c 2007-10-21 13:28:44.000000000 +0200
@@ -39,8 +39,8 @@
#include "yesno.h"
#include "filetypes.h"
-#define PLAYLIST_CATALOG_CFG ROCKBOX_DIR "/playlist_catalog.config"
-#define PLAYLIST_CATALOG_DEFAULT_DIR "/Playlists"
+#define PLAYLIST_CATALOG_CFG ROCKBOX_USER_DATA "/playlist_catalog.config"
+#define PLAYLIST_CATALOG_DEFAULT_DIR ROCKBOX_USER "/Playlists"
#define MAX_PLAYLISTS 400
#define PLAYLIST_DISPLAY_COUNT 10
--- orig/apps/plugins/blackjack.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/plugins/blackjack.c 2007-10-21 13:28:44.000000000 +0200
@@ -24,8 +24,8 @@
PLUGIN_HEADER
/* save files */
-#define SCORE_FILE PLUGIN_GAMES_DIR "/blackjack.score"
-#define SAVE_FILE PLUGIN_GAMES_DIR "/blackjack.save"
+#define SCORE_FILE ROCKBOX_USER_DATA "/blackjack.score"
+#define SAVE_FILE ROCKBOX_USER_DATA "/blackjack.save"
#define NUM_SCORES LCD_HEIGHT/8-2
--- orig/apps/plugins/bubbles.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/plugins/bubbles.c 2007-10-21 13:28:44.000000000 +0200
@@ -30,8 +30,8 @@
PLUGIN_HEADER
/* files */
-#define SCORE_FILE PLUGIN_GAMES_DIR "/bubbles.score"
-#define SAVE_FILE PLUGIN_GAMES_DIR "/bubbles.save"
+#define SCORE_FILE ROCKBOX_USER_DATA "/bubbles.score"
+#define SAVE_FILE ROCKBOX_USER_DATA "/bubbles.save"
/* final game return status */
#define BB_NONE 5
--- orig/apps/plugins/calendar.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/plugins/calendar.c 2007-10-21 13:28:44.000000000 +0200
@@ -218,7 +218,7 @@
for (k = 0; k < 7; k++)
wday_has_memo[k] = false;
memos_in_memory = 0;
- fp = rb->open(ROCKBOX_DIR "/.memo",O_RDONLY);
+ fp = rb->open(ROCKBOX_USER_DATA "/memo",O_RDONLY);
if (fp > -1)
{
int count = rb->filesize(fp);
@@ -315,8 +315,8 @@
static bool save_memo(int changed, bool new_mod, struct shown *shown)
{
int fp,fq;
- fp = rb->open(ROCKBOX_DIR "/.memo",O_RDONLY | O_CREAT);
- fq = rb->creat(ROCKBOX_DIR "/~temp");
+ fp = rb->open(ROCKBOX_USER_DATA "/memo",O_RDONLY | O_CREAT);
+ fq = rb->creat(ROCKBOX_USER_DATA "/~temp");
if ( (fq != -1) && (fp != -1) )
{
int i;
@@ -345,7 +345,7 @@
rb->write(fq,temp,1);
}
rb->close(fp);
- fp = rb->creat(ROCKBOX_DIR "/.memo");
+ fp = rb->creat(ROCKBOX_USER_DATA "/memo");
rb->lseek(fp, 0, SEEK_SET);
rb->lseek(fq, 0, SEEK_SET);
for (i = 0; i < rb->filesize(fq); i++)
@@ -355,7 +355,7 @@
}
rb->close(fp);
rb->close(fq);
- rb->remove(ROCKBOX_DIR "/~temp");
+ rb->remove(ROCKBOX_USER_DATA "/~temp");
load_memo(shown);
return true;
}
--- orig/apps/plugins/chessbox/chessbox.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/plugins/chessbox/chessbox.c 2007-10-21 13:28:44.000000000 +0200
@@ -225,7 +225,7 @@
#define YOFS ((LCD_HEIGHT-8*TILE_HEIGHT)/2)
/* save files */
-#define SAVE_FILE PLUGIN_GAMES_DIR "/chessbox.save"
+#define SAVE_FILE ROCKBOX_USER_DATA "/chessbox.save"
/* commands enum */
#define COMMAND_NOP 0
--- orig/apps/plugins/chessbox/chessbox_pgn.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/plugins/chessbox/chessbox_pgn.c 2007-10-21 13:28:44.000000000 +0200
@@ -203,8 +203,8 @@
#error CHESSBOX: Unsupported keypad
#endif
-#define PGN_FILE PLUGIN_GAMES_DIR "/chessbox.pgn"
-#define LOG_FILE PLUGIN_GAMES_DIR "/chessbox.log"
+#define PGN_FILE ROCKBOX_USER_DATA "/chessbox.pgn"
+#define LOG_FILE ROCKBOX_USER_DATA "/chessbox.log"
int loghandler;
struct plugin_api* rb;
--- orig/apps/plugins/chopper.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/plugins/chopper.c 2007-10-21 13:28:44.000000000 +0200
@@ -127,7 +127,7 @@
static int highscore;
static int score;
-#define CFG_FILE "chopper.cfg"
+#define CFG_FILE "chopper.save"
#define MAX_POINTS 50000
static struct configdata config[] =
{
--- orig/apps/plugins/clock/clock_settings.h 2007-08-27 22:02:38.000000000 +0200
+++ dev/apps/plugins/clock/clock_settings.h 2007-10-21 13:28:44.000000000 +0200
@@ -78,7 +78,7 @@
extern struct clock_settings clock_settings;
/* settings are saved to this location */
-#define settings_filename PLUGIN_GAMES_DIR "/.clock_settings"
+#define settings_filename ROCKBOX_USER_DATA "/clock.dat"
void clock_settings_skin_next(struct clock_settings* settings);
void clock_settings_skin_previous(struct clock_settings* settings);
--- orig/apps/plugins/dice.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/plugins/dice.c 2007-10-21 13:28:44.000000000 +0200
@@ -29,7 +29,7 @@
#define DICE_ROLL PLA_START
-#define CFG_FILE "dice.cfg"
+#define CFG_FILE "dice.save"
const struct button_mapping* plugin_contexts[]={generic_actions};
--- orig/apps/plugins/dict.c 2007-09-20 22:31:56.000000000 +0200
+++ dev/apps/plugins/dict.c 2007-10-21 13:28:44.000000000 +0200
@@ -124,8 +124,8 @@
#endif
/* data files */
-#define DICT_INDEX ROCKBOX_DIR "/rocks/apps/dict.index"
-#define DICT_DESC ROCKBOX_DIR "/rocks/apps/dict.desc"
+#define DICT_INDEX ROCKBOX_USER_DATA "/dict.index"
+#define DICT_DESC ROCKBOX_USER_DATA "/dict.desc"
/* the main plugin function */
enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
--- orig/apps/plugins/doom/rockdoom.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/plugins/doom/rockdoom.c 2007-10-21 13:28:44.000000000 +0200
@@ -203,7 +203,7 @@
"TNT"
};
-const unsigned char wads_builtin[7][30] =
+const unsigned char wads_builtin[7][40] =
{
GAMEBASE"doom1.wad",
GAMEBASE"doom.wad",
--- orig/apps/plugins/doom/rockmacros.h 2007-10-16 21:28:14.000000000 +0200
+++ dev/apps/plugins/doom/rockmacros.h 2007-10-21 13:28:44.000000000 +0200
@@ -86,7 +86,7 @@
inline void* memcpy(void* dst, const void* src, size_t size);
#define PACKEDATTR __attribute__((packed)) // Needed for a few things
-#define GAMEBASE ROCKBOX_DIR "/doom/"
+#define GAMEBASE ROCKBOX_USER_GAMES "/doom/"
//#define SIMPLECHECKS
#define NO_PREDEFINED_LUMPS
#define TABLES_AS_LUMPS // This frees up alot of space in the plugin buffer
--- orig/apps/plugins/invadrox.c 2007-08-27 22:02:38.000000000 +0200
+++ dev/apps/plugins/invadrox.c 2007-10-21 13:28:44.000000000 +0200
@@ -560,7 +560,7 @@
#define TARGET_BOTTOM 3
#define TARGET_UFO 4
-#define HISCOREFILE PLUGIN_GAMES_DIR "/invadrox.high"
+#define HISCOREFILE ROCKBOX_USER_DATA "/invadrox.score"
/* The time (in ms) for one iteration through the game loop - decrease this
--- orig/apps/plugins/jewels.c 2007-10-16 22:32:10.000000000 +0200
+++ dev/apps/plugins/jewels.c 2007-10-21 13:28:44.000000000 +0200
@@ -186,8 +186,8 @@
#endif
/* save files */
-#define SCORE_FILE PLUGIN_GAMES_DIR "/jewels.score"
-#define SAVE_FILE PLUGIN_GAMES_DIR "/jewels.save"
+#define SCORE_FILE ROCKBOX_USER_DATA "/jewels.score"
+#define SAVE_FILE ROCKBOX_USER_DATA "/jewels.save"
/* final game return status */
#define BJ_QUIT_FROM_GAME 4
--- orig/apps/plugins/lib/configfile.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/plugins/lib/configfile.c 2007-10-21 13:28:44.000000000 +0200
@@ -33,7 +33,7 @@
s = cfg_rb->strrchr(buf, '/');
if (!s) /* should never happen */
{
- cfg_rb->snprintf(buf, buf_len, PLUGIN_DIR "/%s", filename);
+ cfg_rb->snprintf(buf, buf_len, ROCKBOX_USER_DATA "/%s", filename);
}
else
{
--- orig/apps/plugins/midi2wav.c 2007-09-11 18:48:29.000000000 +0200
+++ dev/apps/plugins/midi2wav.c 2007-10-21 13:28:44.000000000 +0200
@@ -107,8 +107,8 @@
struct MIDIfile * mf = loadFile(filename);
rb->splash(HZ/5, "LOADING PATCHES");
- if (initSynth(mf, ROCKBOX_DIR "/patchset/patchset.cfg",
- ROCKBOX_DIR "/patchset/drums.cfg") == -1)
+ if (initSynth(mf, ROCKBOX_USER "/patchset/patchset.cfg",
+ ROCKBOX_USER "/patchset/drums.cfg") == -1)
{
return -1;
}
--- orig/apps/plugins/midi/midiplay.c 2007-10-16 21:28:14.000000000 +0200
+++ dev/apps/plugins/midi/midiplay.c 2007-10-21 13:28:44.000000000 +0200
@@ -209,8 +209,8 @@
return -1;
}
- if (initSynth(mf, ROCKBOX_DIR "/patchset/patchset.cfg",
- ROCKBOX_DIR "/patchset/drums.cfg") == -1)
+ if (initSynth(mf, ROCKBOX_USER "/patchset/patchset.cfg",
+ ROCKBOX_USER "/patchset/drums.cfg") == -1)
return -1;
rb->pcm_play_stop();
--- orig/apps/plugins/midi/synth.c 2007-10-21 13:22:49.000000000 +0200
+++ dev/apps/plugins/midi/synth.c 2007-10-21 13:28:44.000000000 +0200
@@ -140,7 +140,7 @@
while(readChar(file)!=' ' && !eof(file));
readTextBlock(file, name);
- rb->snprintf(fn, 40, ROCKBOX_DIR "/patchset/%s.pat", name);
+ rb->snprintf(fn, 40, ROCKBOX_USER "/patchset/%s.pat", name);
/* printf("\nLOADING: <%s> ", fn); */
if(patchUsed[a]==1)
@@ -171,7 +171,7 @@
{
readTextBlock(file, number);
readTextBlock(file, name);
- rb->snprintf(fn, 40, ROCKBOX_DIR "/patchset/%s.pat", name);
+ rb->snprintf(fn, 40, ROCKBOX_USER "/patchset/%s.pat", name);
idx = rb->atoi(number);
if(idx == 0)
--- orig/apps/plugins/mpegplayer/mpeg_settings.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/plugins/mpegplayer/mpeg_settings.c 2007-10-21 13:28:44.000000000 +0200
@@ -17,7 +17,7 @@
#define SETTINGS_VERSION 2
#define SETTINGS_MIN_VERSION 1
-#define SETTINGS_FILENAME "mpegplayer.cfg"
+#define SETTINGS_FILENAME "mpegplayer.save"
enum slider_state_t {state0, state1, state2,
state3, state4, state5} slider_state;
--- orig/apps/plugins/oscilloscope.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/plugins/oscilloscope.c 2007-10-21 13:28:44.000000000 +0200
@@ -190,7 +190,7 @@
struct osc_config osc_disk = { 2, DRAW_FILLED, ADV_SCROLL, OSC_HORIZ };
struct osc_config osc; /* running config */
-static const char cfg_filename[] = "oscilloscope.cfg";
+static const char cfg_filename[] = "oscilloscope.save";
static char *draw_str[3] = { "filled", "line", "pixel" };
static char *advance_str[2] = { "scroll", "wrap" };
static char *orientation_str[2] = { "horizontal", "vertical" };
--- orig/apps/plugins/pacbox/pacbox.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/plugins/pacbox/pacbox.c 2007-10-21 13:28:44.000000000 +0200
@@ -1,4 +1,4 @@
-/***************************************************************************
+/*****************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
@@ -47,7 +47,7 @@
#define SETTINGS_VERSION 1
#define SETTINGS_MIN_VERSION 1
-#define SETTINGS_FILENAME "pacbox.cfg"
+#define SETTINGS_FILENAME "pacbox.save"
static char* difficulty_options[] = { "Normal", "Hard" };
static char* numlives_options[] = { "1", "2", "3", "5" };
@@ -68,7 +68,7 @@
{
char filename[MAX_PATH];
- rb->snprintf(filename,sizeof(filename), ROCKBOX_DIR "/pacman/%s",name);
+ rb->snprintf(filename,sizeof(filename), ROCKBOX_USER "/pacman/%s",name);
int fd = rb->open( filename, O_RDONLY);
@@ -419,7 +419,7 @@
SETTINGS_VERSION);
}
} else {
- rb->splash(HZ*2, "No ROMs in %s/pacman/", ROCKBOX_DIR);
+ rb->splash(HZ*2, "No ROMs in %s/pacman/", ROCKBOX_USER);
}
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
--- orig/apps/plugins/random_folder_advance_config.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/plugins/random_folder_advance_config.c 2007-10-21 13:28:44.000000000 +0200
@@ -26,8 +26,8 @@
static int fd;
static int dirs_count;
static int lasttick;
-#define RFA_FILE ROCKBOX_DIR "/folder_advance_list.dat"
-#define RFADIR_FILE ROCKBOX_DIR "/folder_advance_dir.txt"
+#define RFA_FILE ROCKBOX_USER_DATA "/folder_advance_list.dat"
+#define RFADIR_FILE ROCKBOX_USER_DATA "/folder_advance_dir.txt"
#define MAX_REMOVED_DIRS 10
char *buffer = NULL;
--- orig/apps/plugins/rockblox.c 2007-09-20 22:31:56.000000000 +0200
+++ dev/apps/plugins/rockblox.c 2007-10-21 13:28:44.000000000 +0200
@@ -503,7 +503,7 @@
};
/* Rockbox File System only supports full filenames inc dir */
-#define HIGH_SCORE PLUGIN_GAMES_DIR "/rockblox.score"
+#define HIGH_SCORE ROCKBOX_USER_DATA "/rockblox.score"
#define MAX_HIGH_SCORES 5
/* Default High Scores... */
struct highscore Highest[MAX_HIGH_SCORES];
--- orig/apps/plugins/rockboy/menu.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/plugins/rockboy/menu.c 2007-10-21 13:28:44.000000000 +0200
@@ -37,7 +37,7 @@
static void munge_name(char *buf, size_t bufsiz);
/* directory ROM save slots belong in */
-#define STATE_DIR ROCKBOX_DIR "/rockboy"
+#define STATE_DIR ROCKBOX_USER_GAMES "/rockboy"
static int getbutton(char *text)
{
--- orig/apps/plugins/rockboy/rockmacros.h 2007-10-16 21:28:15.000000000 +0200
+++ dev/apps/plugins/rockboy/rockmacros.h 2007-10-21 13:28:44.000000000 +0200
@@ -110,6 +110,6 @@
bool plugbuf;
extern struct options options;
-#define savedir ROCKBOX_DIR "/rockboy"
+#define savedir ROCKBOX_USER_GAMES "/rockboy"
#endif
--- orig/apps/plugins/snake2.c 2007-09-20 22:31:56.000000000 +0200
+++ dev/apps/plugins/snake2.c 2007-10-21 13:28:44.000000000 +0200
@@ -323,7 +323,7 @@
#define SOUTH_WEST 4096
#define LEVELS_FILE PLUGIN_GAMES_DIR "/snake2.levels"
-#define HISCORE_FILE PLUGIN_GAMES_DIR "/snake2.hs"
+#define HISCORE_FILE ROCKBOX_USER_DATA "/snake2.score"
int load_all_levels(void)
{
--- orig/apps/plugins/sokoban.c 2007-08-27 22:02:38.000000000 +0200
+++ dev/apps/plugins/sokoban.c 2007-10-21 13:28:44.000000000 +0200
@@ -34,8 +34,8 @@
#define SOKOBAN_TITLE "Sokoban"
#define SOKOBAN_LEVELS_FILE PLUGIN_GAMES_DIR "/sokoban.levels"
-#define SOKOBAN_SAVE_FILE PLUGIN_GAMES_DIR "/sokoban.save"
-#define SOKOBAN_SAVE_FOLDER "/games"
+#define SOKOBAN_SAVE_FILE ROCKBOX_USER_DATA "/sokoban.save"
+#define SOKOBAN_SAVE_FOLDER ROCKBOX_USER_GAMES "/sokoban"
/* Magnify is the number of pixels for each block.
* Set dynamically so all targets can support levels
--- orig/apps/plugins/SOURCES 2007-10-16 21:28:16.000000000 +0200
+++ dev/apps/plugins/SOURCES 2007-10-21 13:28:44.000000000 +0200
@@ -11,6 +11,7 @@
properties.c
random_folder_advance_config.c
rockblox.c
+rockbox_upgrade_files.c
rockbox_flash.c
search.c
snow.c
--- orig/apps/plugins/spacerocks.c 2007-10-21 13:28:44.000000000 +0200
+++ dev/apps/plugins/spacerocks.c 2007-10-21 13:28:44.000000000 +0200
@@ -177,7 +177,7 @@
#define WRAP_GAP 12
#define EXPLOSION_LENGTH 20
#define SHOW_COL 0
-#define HISCORE_FILE PLUGIN_GAMES_DIR "/astrorocks.hs"
+#define HISCORE_FILE ROCKBOX_USER_DATA "/spacerocks.score"
#define POINT_SIZE 2
#define MAX_NUM_ASTEROIDS 25
#define MAX_NUM_MISSILES 6
--- orig/apps/plugins/sudoku/sudoku.h 2007-10-21 13:28:45.000000000 +0200
+++ dev/apps/plugins/sudoku/sudoku.h 2007-10-21 13:28:45.000000000 +0200
@@ -22,7 +22,7 @@
#include "plugin.h"
-#define GAME_FILE PLUGIN_GAMES_DIR "/sudoku.ss"
+#define GAME_FILE ROCKBOX_USER_GAMES "/sudoku/sudoku.ss"
/* variable button definitions */
#if CONFIG_KEYPAD == RECORDER_PAD
--- orig/apps/plugins/viewer.c 2007-10-21 13:28:45.000000000 +0200
+++ dev/apps/plugins/viewer.c 2007-10-21 13:28:45.000000000 +0200
@@ -24,8 +24,8 @@
PLUGIN_HEADER
-#define SETTINGS_FILE VIEWERS_DIR "/viewer.dat" /* binary file, so dont use .cfg */
-#define BOOKMARKS_FILE VIEWERS_DIR "/viewer_bookmarks.dat"
+#define SETTINGS_FILE ROCKBOX_USER_DATA "/viewer.dat" /* binary file, so dont use .cfg */
+#define BOOKMARKS_FILE ROCKBOX_USER_DATA "/viewer.bookmarks.dat"
#define WRAP_TRIM 44 /* Max number of spaces to trim (arbitrary) */
#define MAX_COLUMNS 64 /* Max displayable string len (over-estimate) */
--- orig/apps/plugins/wormlet.c 2007-09-20 22:31:56.000000000 +0200
+++ dev/apps/plugins/wormlet.c 2007-10-21 13:28:44.000000000 +0200
@@ -339,7 +339,7 @@
#define SETTINGS_VERSION 1
#define SETTINGS_MIN_VERSION 1
-#define SETTINGS_FILENAME "wormlet.cfg"
+#define SETTINGS_FILENAME "wormlet.save"
static struct configdata config[] =
{
--- orig/apps/plugins/vu_meter.c 2007-10-21 13:28:45.000000000 +0200
+++ dev/apps/plugins/vu_meter.c 2007-10-21 13:28:45.000000000 +0200
@@ -245,7 +245,7 @@
}
void load_settings(void) {
- int fp = rb->open(PLUGIN_DEMOS_DIR "/.vu_meter", O_RDONLY);
+ int fp = rb->open(ROCKBOX_USER_DATA "/vu_meter.dat", O_RDONLY);
if(fp>=0) {
rb->read(fp, &vumeter_settings, sizeof(struct saved_settings));
rb->close(fp);
@@ -261,7 +261,7 @@
}
void save_settings(void) {
- int fp = rb->creat(PLUGIN_DEMOS_DIR "/.vu_meter");
+ int fp = rb->creat(ROCKBOX_USER_DATA "/vu_meter.dat");
if(fp >= 0) {
rb->write (fp, &vumeter_settings, sizeof(struct saved_settings));
rb->close(fp);
--- orig/apps/plugins/zxbox/snapshot.c 2007-10-21 13:28:46.000000000 +0200
+++ dev/apps/plugins/zxbox/snapshot.c 2007-10-21 13:28:46.000000000 +0200
@@ -37,7 +37,7 @@
#define COMPRESS_SAVE 1
-static char quick_snap_file[]= ROCKBOX_DIR "/zxboxq.z80";
+static char quick_snap_file[]= ROCKBOX_USER_DATA "/zxboxq.z80";
typedef struct {
int isfile;
--- orig/apps/settings.c 2007-10-21 13:28:46.000000000 +0200
+++ dev/apps/settings.c 2007-10-21 13:28:46.000000000 +0200
@@ -567,7 +567,7 @@
switch (options)
{
case SETTINGS_SAVE_THEME:
- folder = THEME_DIR;
+ folder = THEME_DIR_USER;
break;
#ifdef HAVE_RECORDING
case SETTINGS_SAVE_RECPRESETS:
@@ -575,7 +575,7 @@
break;
#endif
default:
- folder = ROCKBOX_DIR;
+ folder = ROCKBOX_USER;
}
create_numbered_filename(filename, folder, "config", ".cfg", 2
IF_CNFN_NUM_(, NULL));
@@ -749,7 +749,12 @@
global_settings.wps_file[0] != 0xff ) {
snprintf(buf, sizeof buf, WPS_DIR "/%s.wps",
global_settings.wps_file);
- wps_data_load(gui_wps[0].data, buf, true);
+ if (!wps_data_load(gui_wps[0].data, buf, true))
+ {
+ snprintf(buf, sizeof buf, WPS_DIR_USER "/%s.wps",
+ global_settings.wps_file);
+ wps_data_load(gui_wps[0].data, buf, true);
+ }
}
else
{
@@ -764,7 +769,12 @@
global_settings.backdrop_file[0] != 0xff ) {
snprintf(buf, sizeof buf, BACKDROP_DIR "/%s.bmp",
global_settings.backdrop_file);
- load_main_backdrop(buf);
+ if (!load_main_backdrop(buf))
+ {
+ snprintf(buf, sizeof buf, BACKDROP_DIR_USER "/%s.bmp",
+ global_settings.backdrop_file);
+ load_main_backdrop(buf);
+ }
} else {
unload_main_backdrop();
}
@@ -786,7 +796,12 @@
if ( global_settings.rwps_file[0]) {
snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps",
global_settings.rwps_file);
- wps_data_load(gui_wps[1].data, buf, true);
+ if (!wps_data_load(gui_wps[1].data, buf, true))
+ {
+ snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps",
+ global_settings.rwps_file);
+ wps_data_load(gui_wps[1].data, buf, true);
+ }
}
else
{
@@ -799,13 +814,18 @@
if ( global_settings.font_file[0]) {
snprintf(buf, sizeof buf, FONT_DIR "/%s.fnt",
global_settings.font_file);
- font_load(buf);
+ if (!font_load(buf))
+ {
+ snprintf(buf, sizeof buf, FONT_DIR_USER "/%s.fnt",
+ global_settings.font_file);
+ font_load(buf);
+ }
}
else
font_reset();
if ( global_settings.kbd_file[0]) {
- snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.kbd",
+ snprintf(buf, sizeof buf, ROCKBOX_USER "/%s.kbd",
global_settings.kbd_file);
load_kbd(buf);
}
--- orig/apps/settings.h 2007-10-21 13:28:46.000000000 +0200
+++ dev/apps/settings.h 2007-10-21 13:28:46.000000000 +0200
@@ -51,16 +51,18 @@
#ifdef __PCTOOL__
#define ROCKBOX_DIR "."
#define ROCKBOX_DIR_LEN 1
+#define ROCKBOX_USER "./.rockbox_user"
#else
#define ROCKBOX_DIR "/.rockbox"
+#define ROCKBOX_USER "/.rockbox_user"
#define ROCKBOX_DIR_LEN 9
#endif
-#define FONT_DIR ROCKBOX_DIR "/fonts"
-#define LANG_DIR ROCKBOX_DIR "/langs"
-#define WPS_DIR ROCKBOX_DIR "/wps"
-#define THEME_DIR ROCKBOX_DIR "/themes"
-#define ICON_DIR ROCKBOX_DIR "/icons"
+#define FONT_DIR ROCKBOX_DIR "/fonts"
+#define LANG_DIR ROCKBOX_DIR "/langs"
+#define WPS_DIR ROCKBOX_DIR "/wps"
+#define THEME_DIR ROCKBOX_DIR "/themes"
+#define ICON_DIR ROCKBOX_DIR "/icons"
#define PLUGIN_DIR ROCKBOX_DIR "/rocks"
#define PLUGIN_GAMES_DIR PLUGIN_DIR "/games"
@@ -72,12 +74,21 @@
#define REC_BASE_DIR "/"
#define EQS_DIR ROCKBOX_DIR "/eqs"
#define CODECS_DIR ROCKBOX_DIR "/codecs"
-#define RECPRESETS_DIR ROCKBOX_DIR "/recpresets"
-#define FMPRESET_PATH ROCKBOX_DIR "/fmpresets"
#define VIEWERS_CONFIG ROCKBOX_DIR "/viewers.config"
-#define CONFIGFILE ROCKBOX_DIR "/config.cfg"
-#define FIXEDSETTINGSFILE ROCKBOX_DIR "/fixed.cfg"
+#define CONFIGFILE ROCKBOX_USER "/config.cfg"
+
+#define ROCKBOX_USER_GAMES ROCKBOX_USER "/games"
+#define ROCKBOX_USER_DATA ROCKBOX_USER "/data"
+#define RECPRESETS_DIR ROCKBOX_USER "/recpresets"
+#define FMPRESET_PATH ROCKBOX_USER "/fmpresets"
+#define FIXEDSETTINGSFILE ROCKBOX_USER "/fixed.cfg"
+#define THEME_DIR_USER ROCKBOX_USER "/themes"
+#define FONT_DIR_USER ROCKBOX_USER "/fonts"
+#define EQS_DIR_USER ROCKBOX_USER "/eqs"
+#define BACKDROP_DIR_USER ROCKBOX_USER "/backdrops"
+#define ICON_DIR_USER ROCKBOX_USER "/icons"
+#define WPS_DIR_USER ROCKBOX_USER "/wps"
#define MAX_FILENAME 32
--- orig/apps/settings_list.c 2007-10-21 13:28:47.000000000 +0200
+++ dev/apps/settings_list.c 2007-10-21 13:28:47.000000000 +0200
@@ -1185,7 +1185,7 @@
"", BACKDROP_DIR "/", ".bmp", MAX_FILENAME+1),
#endif
#ifdef HAVE_LCD_BITMAP
- FILENAME_SETTING(0,kbd_file,"kbd","",ROCKBOX_DIR "/",".kbd",MAX_FILENAME+1),
+ FILENAME_SETTING(0,kbd_file,"kbd","",ROCKBOX_USER "/",".kbd",MAX_FILENAME+1),
#endif
#ifdef HAVE_USB_POWER
#if CONFIG_CHARGING
--- orig/apps/tagcache.h 2007-10-21 13:28:47.000000000 +0200
+++ dev/apps/tagcache.h 2007-10-21 13:28:47.000000000 +0200
@@ -75,8 +75,8 @@
#define TAGCACHE_FILE_TEMP ROCKBOX_DIR "/database_tmp.tcd"
#define TAGCACHE_FILE_MASTER ROCKBOX_DIR "/database_idx.tcd"
#define TAGCACHE_FILE_INDEX ROCKBOX_DIR "/database_%d.tcd"
-#define TAGCACHE_FILE_CHANGELOG ROCKBOX_DIR "/database_changelog.txt"
#define TAGCACHE_STATEFILE ROCKBOX_DIR "/database_state.tcd"
+#define TAGCACHE_FILE_CHANGELOG ROCKBOX_USER_DATA "/database_changelog.txt"
/* Flags */
#define FLAG_DELETED 0x0001 /* Entry has been removed from db */
--- orig/apps/tagnavi.config 2007-10-17 19:06:41.000000000 +0200
+++ dev/apps/tagnavi.config 2007-10-21 13:28:44.000000000 +0200
@@ -17,7 +17,7 @@
%format "fmt_rating" "(%2d) %s-%s" rating title artist %sort = "inverse"
# Include our custom menu
-%include "/.rockbox/tagnavi_custom.config"
+%include "/.rockbox_user/tagnavi_custom.config"
#
# === Begin of "A to Z" sub menus
--- orig/manual/plugins/doom.tex 2007-10-21 13:28:47.000000000 +0200
+++ dev/manual/plugins/doom.tex 2007-10-21 13:28:47.000000000 +0200
@@ -5,7 +5,7 @@
\subsubsection{Getting started}
For the game to run you need \fname{.wad} game files located in
-\fname{/.rockbox/doom/} on your player. Create the directory and save the
+\fname{/rockbox/doom/} on your player. Create the directory and save the
following files there:
\begin{description}
\item[rockdoom.wad.] The Rockbox \fname{.wad}, based on \fname{prboom.wad}
@@ -35,7 +35,7 @@
\emph{Game. } Select which (official) wad to launch\\
\emph{Addon. } Select which unofficial addon wad to launch (From
- \fname{/.rockbox/doom/addons} directory)\\
+ \fname{/rockbox/doom/addons} directory)\\
\emph{Demos. } Select which demo file to play on game start\\
\emph{Options. } Configure low-level Doom options\\
\emph{Play Game. } Launch the wad/addon/Demo chosen%\\
--- orig/manual/plugins/pacbox.tex 2007-10-21 13:28:47.000000000 +0200
+++ dev/manual/plugins/pacbox.tex 2007-10-21 13:28:47.000000000 +0200
@@ -21,7 +21,7 @@
\end{tabular}
\end{center}
-These need to be stored in the \fname{/.rockbox/pacman/} directory on your
+These need to be stored in the \fname{/rockbox/pacman/} directory on your
\dap. In the MAME ROMs collection the necessary files can be found in
\fname{pacman.zip} and \fname{puckman.zip}. The MAME project itself can be
found at \url{http://www.mame.net}.
--- orig/manual/rockbox_interface/tagcache.tex 2007-10-21 13:28:47.000000000 +0200
+++ dev/manual/rockbox_interface/tagcache.tex 2007-10-21 13:28:47.000000000 +0200
@@ -73,13 +73,13 @@
\item[Export modifications.]
This allows for the runtime data to be exported to the file \\
- \fname{/.rockbox/database\_changelog.txt}, which backs up the runtime data in
+ \fname{/rockbox/data/database\_changelog.txt}, which backs up the runtime data in
ASCII format. This is needed when database structures change, because new
code cannot read old database code. But, all modifications
exported to ASCII format should be readable by all database versions.
\item[Import modifications.]
- Allows the \fname{/.rockbox/database\_changelog.txt} backup to be
+ Allows the \fname{/rockbox/data/database\_changelog.txt} backup to be
conveniently loaded into the database. If \setting{Auto Update} is
enabled this is performed automatically when the database is initialized.
--- orig/manual/working_with_playlists/main.tex 2007-10-21 13:28:47.000000000 +0200
+++ dev/manual/working_with_playlists/main.tex 2007-10-21 13:28:47.000000000 +0200
@@ -66,7 +66,7 @@
the selected track or directory.
\note{All playlists in the \setting{Playlist catalog} are stored in the
- \fname{/Playlists} directory in the root of your \daps{} harddisk and
+ \fname{/rockbox/playlists} directory of your \daps{} harddisk and
playlists stored in other locations are not included in the catalog. It is
however possible to move existing playlists there (see
\reference{ref:Filemenu}).}
@@ -169,7 +169,7 @@
\subsubsection{Through the \setting{Playlist catalog}}
The \setting{Playlist catalog} offers a shortcut to all playlists in your
-\daps{} harddisk root folder called \fname{/Playlists}.
+\daps{} harddisk folder called \fname{/rockbox/playlists}.
It can be used like the \setting{File Browser}.
\subsection{Helpful Hints}
--- orig/tools/buildzip.pl 2007-10-21 13:28:47.000000000 +0200
+++ dev/tools/buildzip.pl 2007-10-21 13:28:47.000000000 +0200
@@ -218,10 +218,6 @@
mkdir ".rockbox/rocks/demos", 0777;
mkdir ".rockbox/rocks/viewers", 0777;
- if ($recording) {
- mkdir ".rockbox/recpresets", 0777;
- }
-
if($swcodec) {
mkdir ".rockbox/eqs", 0777;