? PATH
? build
? build-ui
Index: apps/settings.c
===================================================================
RCS file: /cvsroot/rockbox/apps/settings.c,v
retrieving revision 1.257
diff -u -r1.257 settings.c
--- apps/settings.c	4 Feb 2005 10:37:21 -0000	1.257
+++ apps/settings.c	10 Feb 2005 19:19:56 -0000
@@ -71,6 +71,11 @@
 
 
 
+/* start oscar */
+const char* dirconfig_load_name = "_dirconfig.cfg";
+/* end oscar */
+
+
 #define CONFIG_BLOCK_VERSION 19
 #define CONFIG_BLOCK_SIZE 512
 #define RTC_BLOCK_SIZE 44
@@ -1018,6 +1023,10 @@
     int fd;
     char line[128];
 
+/* start oscar */
+DEBUGF("settings_load_config from file: %s\n", file);
+/* end oscar */
+
     fd = open(file, O_RDONLY);
     if (fd < 0)
         return false;
Index: apps/settings.h
===================================================================
RCS file: /cvsroot/rockbox/apps/settings.h,v
retrieving revision 1.132
diff -u -r1.132 settings.h
--- apps/settings.h	4 Feb 2005 10:37:21 -0000	1.132
+++ apps/settings.h	10 Feb 2005 19:19:57 -0000
@@ -33,6 +33,14 @@
 
 #define MAX_FILENAME 20
 
+
+
+/* start oscar */
+extern const char* dirconfig_load_name;
+/* end oscar */
+
+
+
 /* button definitions */
 #if CONFIG_KEYPAD == IRIVER_H100_PAD
 #define SETTINGS_INC     BUTTON_UP
Index: apps/tree.c
===================================================================
RCS file: /cvsroot/rockbox/apps/tree.c,v
retrieving revision 1.298
diff -u -r1.298 tree.c
--- apps/tree.c	5 Feb 2005 20:14:57 -0000	1.298
+++ apps/tree.c	10 Feb 2005 19:20:02 -0000
@@ -244,6 +244,31 @@
 }
 #endif
 
+
+/* start patch oscar */
+static int dirconfig_load_settings(char *dir)
+{
+    int fd;
+    char dirconfig_filename[MAX_PATH+1];
+
+    snprintf(dirconfig_filename, sizeof(dirconfig_filename), "%s/%s",
+                 dir, dirconfig_load_name);
+
+    DEBUGF("Checking for %s\n", dirconfig_filename);
+
+    fd = open(dirconfig_filename, O_RDONLY);
+    if (fd < 0) {
+      DEBUGF("...no such file\n");
+      return -1;
+    }
+    close(fd);
+
+    DEBUGF("...found\n");
+    return (settings_load_config(dirconfig_filename));
+}
+/* end patch oscar */
+
+
 static int showdir(void)
 {
     struct entry *dircache = tc.dircache;
@@ -281,6 +306,16 @@
     }
     else {
         if (strncmp(tc.currdir, lastdir, sizeof(lastdir)) || reload_dir) {
+
+/* start patch oscar */
+DEBUGF("We enter a new directory: %s\n", tc.currdir);
+dirconfig_load_settings(tc.currdir);
+#ifdef HAVE_LCD_BITMAP
+    tree_max_on_screen = recalc_screen_height();
+#endif
+/* end patch oscar */
+
+
             if (ft_load(&tc, NULL) < 0)
                 return -1;
             strcpy(lastdir, tc.currdir);
Index: firmware/export/config-recorderv2.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/export/config-recorderv2.h,v
retrieving revision 1.14
diff -u -r1.14 config-recorderv2.h
--- firmware/export/config-recorderv2.h	10 Jan 2005 22:03:05 -0000	1.14
+++ firmware/export/config-recorderv2.h	10 Feb 2005 19:20:04 -0000
@@ -56,13 +56,18 @@
 #define HAVE_ALARM_MOD 1
 
 /* Define this if you have an FM Radio */
-#define CONFIG_TUNER S1A0903X01
+/* start oscar */
+/* #define CONFIG_TUNER S1A0903X01 */
+/* end oscar */
 
 /* How to detect USB */
 #define USB_FMRECORDERSTYLE 1
 
 /* Define this if the platform can charge batteries */
-#define HAVE_CHARGING 1
+/* start oscar */
+/* #define HAVE_CHARGING 1 */
+#define HAVE_CHARGING 0
+/* end oscar */
 
 /* The start address index for ROM builds */
 #define ROM_START 0x12010