Fix Ondio FM bootbox build too (see r19579/r19580).

git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_2@20505 a1c6a512-1295-4272-9138-f99709370657

apps/gui/gwps.c

@@ -736,7 +736,6 @@ long gui_wps_show(void)
         }
 
         if (exit) {
-            viewportmanager_set_statusbar(oldbars);
 #ifdef HAVE_LCD_CHARCELLS
             status_set_record(false);
             status_set_audio(false);
@@ -752,6 +751,7 @@ long gui_wps_show(void)
 #ifdef AB_REPEAT_ENABLE
             ab_reset_markers();
 #endif
+            viewportmanager_set_statusbar(oldbars);
 #ifdef HAVE_RECORDING
             if (button == ACTION_WPS_REC)
                 return GO_TO_RECSCREEN;

apps/lang/deutsch.lang

@@ -32,6 +32,7 @@
 # - Sascha Wolf
 # - Kaspar Rothenfußer
 # - Johannes Linke
+# - Kai Posadowsky
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -6493,7 +6494,7 @@
   </source>
   <dest>
     *: none
-    agc: "Sicherheit (Übersteuerung)"
+    agc: "Safety (Übersteuerung)"
   </dest>
   <voice>
     *: none
@@ -6964,7 +6965,7 @@
 </phrase>
 <phrase>
   id: LANG_VERSION
-  desc: in the info menu
+  desc: in the Rockbox Info screen
   user: core
   <source>
     *: "Version"
@@ -12340,9 +12341,26 @@
     *: "Credits"
   </source>
   <dest>
-    *: "Dank"
+    *: "Mitwirkende"
   </dest>
   <voice>
-    *: "Dank an"
+    *: "Mitwirkende"
   </voice>
-</phrase>
+</phrase>
+<phrase>
+  id: LANG_ENABLE_SPEAKER
+  desc: in Settings -> Sound Settings
+  user: core
+  <source>
+    *: none
+    speaker: "Enable Speaker"
+  </source>
+  <dest>
+    *: none
+    speaker: "Lautsprecher einschalten"
+  </dest>
+  <voice>
+    *: none
+    speaker: "Lautsprecher einschalten"
+  </voice>
+</phrase>

apps/lang/finnish.lang

@@ -1156,7 +1156,7 @@
 </phrase>
 <phrase>
   id: LANG_VERSION
-  desc: in the info menu
+  desc: in the Rockbox Info screen
   user: core
   <source>
     *: "Version"
@@ -12180,3 +12180,178 @@
     quickscreen: ""
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE_19200
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "19200"
+  </source>
+  <dest>
+    *: none
+    serial_port: "19200"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "19200"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ENABLE_SPEAKER
+  desc: in Settings -> Sound Settings
+  user: core
+  <source>
+    *: none
+    speaker: "Enable Speaker"
+  </source>
+  <dest>
+    *: none
+    speaker: "Enable Speaker"
+  </dest>
+  <voice>
+    *: none
+    speaker: "Enable Speaker"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SORT_INTERPRET_NUMBERS
+  desc: in Settings -> File view
+  user: core
+  <source>
+    *: "Interpret numbers when sorting"
+  </source>
+  <dest>
+    *: "Tulkitse numerot järjestettäessä"
+  </dest>
+  <voice>
+    *: "Tulkitse numerot järjestettäessä"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "Serial Bitrate"
+  </source>
+  <dest>
+    *: none
+    serial_port: "Serial Bitrate"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "Serial Bitrate"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE_9600
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "9600"
+  </source>
+  <dest>
+    *: none
+    serial_port: "9600"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "9600"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE_38400
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "38400"
+  </source>
+  <dest>
+    *: none
+    serial_port: "38400"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "38400"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE_57600
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "57600"
+  </source>
+  <dest>
+    *: none
+    serial_port: "57600"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "57600"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SORT_INTERPRET_AS_NUMBERS
+  desc: in Settings -> File view
+  user: core
+  <source>
+    *: "As whole numbers"
+  </source>
+  <dest>
+    *: "Kokonaislukuina"
+  </dest>
+  <voice>
+    *: "Kokonaislukuina"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CREDITS
+  desc: in the Main Menu -> System screen
+  user: core
+  <source>
+    *: "Credits"
+  </source>
+  <dest>
+    *: "Kiitokset"
+  </dest>
+  <voice>
+    *: "Kiitokset"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SORT_INTERPRET_AS_DIGIT
+  desc: in Settings -> File view
+  user: core
+  <source>
+    *: "As digits"
+  </source>
+  <dest>
+    *: "Lukuina"
+  </dest>
+  <voice>
+    *: "Lukuina"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE_AUTO
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "Auto"
+  </source>
+  <dest>
+    *: none
+    serial_port: "Auto"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "Automatic"
+  </voice>
+</phrase>

apps/lang/norsk.lang

@@ -136,15 +136,15 @@
 </phrase>
 <phrase>
   id: LANG_RESTARTING_PLAYBACK
-  desc: splash screen displayed when pcm buffer size is changed
+  desc: deprecated
   user: core
   <source>
     *: none
-    swcodec: "Restarting playback..."
+    swcodec: ""
   </source>
   <dest>
     *: none
-    swcodec: "Starter avspilling på nytt..."
+    swcodec: ""
   </dest>
   <voice>
     *: none
@@ -887,7 +887,7 @@
 </phrase>
 <phrase>
   id: LANG_VERSION
-  desc: in the info menu
+  desc: in the Rockbox Info screen
   user: core
   <source>
     *: "Version"
@@ -3747,16 +3747,19 @@
   user: core
   <source>
     *: none
+    multivolume: "HD1"
     e200*,c200: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
+    multivolume: "HD1"
     e200*,c200: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    multivolume: "H D 1"
     e200*,c200: "mikro S D"
     ondio*: "M M C"
   </voice>
@@ -6609,6 +6612,8 @@
     ipod*: "PLAY/PAUSE to abort"
     x5,m5: "Long PLAY to abort"
     h10,h10_5gb,e200*,c200: "PREV to abort"
+    gigabeats: "BACK to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF for å avbryte"
@@ -6616,6 +6621,8 @@
     ipod*: "PLAY/PAUSE for å avbryte"
     x5,m5: "Hold PLAY for å avbryte"
     h10,h10_5gb,e200*,c200: "PREV for å avbryte"
+    gigabeats: "BACK for å avbryte"
+    gigabeatf: "POWER for å avbryte"
   </dest>
   <voice>
     *: "" 
@@ -8451,7 +8458,7 @@
   user: core
   <source>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "Cutoff"
   </source>
   <dest>
     *: none
@@ -8468,7 +8475,7 @@
   user: core
   <source>
     *: none
-    swcodec: "Edit mode: %s"
+    swcodec: "Edit mode: %s %s"
   </source>
   <dest>
     *: none
@@ -11978,3 +11985,376 @@
     agc: "AGC klipptid"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE_19200
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "19200"
+  </source>
+  <dest>
+    *: none
+    serial_port: "19200"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "19200"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ENABLE_SPEAKER
+  desc: in Settings -> Sound Settings
+  user: core
+  <source>
+    *: none
+    speaker: "Enable Speaker"
+  </source>
+  <dest>
+    *: none
+    speaker: "Aktiver høyttaler"
+  </dest>
+  <voice>
+    *: none
+    speaker: "Aktiver høyttaler"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALBUMART
+  desc: Display the expected AA size
+  user: core
+  <source>
+    *: none
+    albumart: "Album Art:"
+  </source>
+  <dest>
+    *: none
+    albumart: "Albumbilde:"
+  </dest>
+  <voice>
+    *: none
+    albumart: "Albumbilde:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANNEL_LEFTRIGHT
+  desc: in sound_settings
+  user: core
+  <source>
+    *: none
+    recording_swcodec: "Mono Left + Right"
+  </source>
+  <dest>
+    *: none
+    recording_swcodec: "Mono venstre + høyre"
+  </dest>
+  <voice>
+    *: none
+    recording_swcodec: "Mono venstre pluss høyre"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SORT_INTERPRET_NUMBERS
+  desc: in Settings -> File view
+  user: core
+  <source>
+    *: "Interpret numbers when sorting"
+  </source>
+  <dest>
+    *: "Sorteringsmetode for tall"
+  </dest>
+  <voice>
+    *: "Sorteringsmetode for tall"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "Serial Bitrate"
+  </source>
+  <dest>
+    *: none
+    serial_port: "Seriell bitrate"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "Seriell bitrate"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE_9600
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "9600"
+  </source>
+  <dest>
+    *: none
+    serial_port: "9600"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "9600"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user: core
+  <source>
+    *: none
+    quickscreen: "Set as Left Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Bruk som venstre hurtiginnstilling"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Bruk som venstre hurtiginnstilling"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESET_SETTING
+  desc: used in the settings context menu
+  user: core
+  <source>
+    *: "Reset Setting"
+  </source>
+  <dest>
+    *: "Nullstill innstilling"
+  </dest>
+  <voice>
+    *: "Nullstill innstilling"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM
+  desc: DEPRECATED
+  user: core
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user: core
+  <source>
+    *: none
+    quickscreen: "Set as Bottom Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Bruk som nedre hurtiginnstilling"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Bruk som nedre hurtiginnstilling"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT
+  desc: DEPRECATED
+  user: core
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_QS_ITEMS
+  desc: DEPRECATED
+  user: core
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user: core
+  <source>
+    *: none
+    quickscreen: "Set as Right Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Bruk som høyre hurtiginnstilling"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Bruk som høyre hurtiginnstilling"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE_38400
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "38400"
+  </source>
+  <dest>
+    *: none
+    serial_port: "38400"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "38400"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE_57600
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "57600"
+  </source>
+  <dest>
+    *: none
+    serial_port: "57600"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "57600"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SORT_INTERPRET_AS_NUMBERS
+  desc: in Settings -> File view
+  user: core
+  <source>
+    *: "As whole numbers"
+  </source>
+  <dest>
+    *: "Som hele tall"
+  </dest>
+  <voice>
+    *: "Som hele tall"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CREDITS
+  desc: in the Main Menu -> System screen
+  user: core
+  <source>
+    *: "Credits"
+  </source>
+  <dest>
+    *: "Bidragsytere"
+  </dest>
+  <voice>
+    *: "Bidragsytere"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SEARCH_RESULTS
+  desc: title for the list of results displayed after searching in a playlist
+  user: core
+  <source>
+    *: "Search Results"
+  </source>
+  <dest>
+    *: "Søkeresultater"
+  </dest>
+  <voice>
+    *: "Søkeresultater"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SORT_INTERPRET_AS_DIGIT
+  desc: in Settings -> File view
+  user: core
+  <source>
+    *: "As digits"
+  </source>
+  <dest>
+    *: "Som sifre"
+  </dest>
+  <voice>
+    *: "Som sifre"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_MONO_MODE
+  desc: in the recording settings
+  user: core
+  <source>
+    *: none
+    recording_swcodec: "Mono mode"
+  </source>
+  <dest>
+    *: none
+    recording_swcodec: "Mono-modus"
+  </dest>
+  <voice>
+    *: none
+    recording_swcodec: "Mono-modus"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT
+  desc: DEPRECATED
+  user: core
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE_AUTO
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "Auto"
+  </source>
+  <dest>
+    *: none
+    serial_port: "Auto"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "Automatisk"
+  </voice>
+</phrase>

apps/menus/settings_menu.c

@@ -97,7 +97,6 @@ static int fileview_callback(int action,const struct menu_item_ex *this_item);
 MENUITEM_SETTING(sort_case, &global_settings.sort_case, NULL);
 MENUITEM_SETTING(sort_dir, &global_settings.sort_dir, fileview_callback);
 MENUITEM_SETTING(sort_file, &global_settings.sort_file, fileview_callback);
-MENUITEM_SETTING(interpret_numbers, &global_settings.interpret_numbers, fileview_callback);
 MENUITEM_SETTING(dirfilter, &global_settings.dirfilter, NULL);
 MENUITEM_SETTING(show_filename_ext, &global_settings.show_filename_ext, NULL);
 MENUITEM_SETTING(browse_current, &global_settings.browse_current, NULL);
@@ -122,7 +121,7 @@ static int fileview_callback(int action,const struct menu_item_ex *this_item)
 }
 
 MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu,
-                &sort_case, &sort_dir, &sort_file, &interpret_numbers,
+                &sort_case, &sort_dir, &sort_file,
                 &dirfilter, &show_filename_ext, &browse_current,
 #ifdef HAVE_LCD_BITMAP
                 &show_path_in_browser

apps/plugins/SOURCES

@@ -32,8 +32,12 @@ rockbox_flash.c
 #ifndef OLYMPUS_MROBE_500
 
 #if (CONFIG_CODEC == SWCODEC) || !defined(SIMULATOR)
+
+/* button maps are broken on the following */
+#if !defined(SANSA_C200) && !defined(ARCHOS_ONDIOSP) && !defined(ARCHOS_ONDIOFM) && !defined(ARCHOS_PLAYER)
 metronome.c
 #endif
+#endif
 
 #if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)) && !defined(SIMULATOR)
 wavplay.c

apps/plugins/rockbox_flash.c

@@ -30,7 +30,7 @@ PLUGIN_HEADER
 /* define DUMMY if you only want to "play" with the UI, does no harm */
 /* #define DUMMY */
 
-#define LATEST_BOOTLOADER_VERSION 2 /* update this with the bootloader */
+#define LATEST_BOOTLOADER_VERSION 3 /* update this with the bootloader */
 
 #ifndef UINT8
 #define UINT8 unsigned char

apps/settings_list.c

@@ -793,7 +793,7 @@ const struct settings_list settings[] = {
                    "sort files", "alpha,oldest,newest,type", NULL, 4,
                    ID2P(LANG_SORT_ALPHA), ID2P(LANG_SORT_DATE),
                    ID2P(LANG_SORT_DATE_REVERSE) , ID2P(LANG_SORT_TYPE)),
-    CHOICE_SETTING(0, interpret_numbers, LANG_SORT_INTERPRET_NUMBERS, 1,
+    CHOICE_SETTING(0, interpret_numbers, LANG_SORT_INTERPRET_NUMBERS, 0,
                     "sort interpret number", "digits,numbers",NULL, 2,
                     ID2P(LANG_SORT_INTERPRET_AS_DIGIT),
                     ID2P(LANG_SORT_INTERPRET_AS_NUMBERS)),

docs/CREDITS

@@ -457,6 +457,7 @@ Sam Bouwer
 Johannes Linke
 Michaël Burtin
 Sasha Khamkov
+Kai Posadowsky
 
 The libmad team
 The wavpack team

firmware/common/strnatcmp.c

@@ -29,8 +29,9 @@
  * negative chars in their default char type.
  *
  *
- * This version is changed to ignore leading zeros, it does not equal to the
- * original software.
+ * Changes for Rockbox:
+ * This version is changed slightly to deal better with the datatypes,
+ * it does not equal to the original software.
  */
 
 #include <ctype.h>
@@ -50,6 +51,7 @@ to_int(char c)
 
 /* These are defined as macros to make it easier to adapt this code to
  * different characters types or comparison functions. */
+
 static inline int
 nat_isdigit(int a)
 {
@@ -60,7 +62,7 @@ nat_isdigit(int a)
 static inline int
 nat_isspace(int a)
 {
-     return a == '0' || isspace(a);
+     return isspace(a);
 }
 
 
@@ -104,16 +106,38 @@ compare_right(char const *a, char const *b)
      return 0;
 }
 
+
+static int
+compare_left(char const *a, char const *b)
+{
+     /* Compare two left-aligned numbers: the first to have a
+        different value wins. */
+     for (;; a++, b++) {
+	  if (!nat_isdigit(*a)  &&  !nat_isdigit(*b))
+	       return 0;
+	  else if (!nat_isdigit(*a))
+	       return -1;
+	  else if (!nat_isdigit(*b))
+	       return +1;
+	  else if (*a < *b)
+	       return -1;
+	  else if (*a > *b)
+	       return +1;
+     }
+	  
+     return 0;
+}
+
 static int strnatcmp0(char const *a, char const *b, int fold_case)
 {
      int ai, bi;
      int ca, cb;
-     int result;
+     int fractional, result;
      
      assert(a && b);
      ai = bi = 0;
      while (1) {
-	  ca = to_int(a[ai]);
+      ca = to_int(a[ai]);
       cb = to_int(b[bi]);
 
 	  /* skip over leading spaces or zeros */
@@ -125,8 +149,15 @@ static int strnatcmp0(char const *a, char const *b, int fold_case)
 
 	  /* process run of digits */
 	  if (nat_isdigit(ca)  &&  nat_isdigit(cb)) {
-		if ((result = compare_right(a+ai, b+bi)) != 0)
-			return result;
+	       fractional = (ca == '0' || cb == '0');
+
+	       if (fractional) {
+		    if ((result = compare_left(a+ai, b+bi)) != 0)
+			 return result;
+	       } else {
+		    if ((result = compare_right(a+ai, b+bi)) != 0)
+			 return result;
+	       }
 	  }
 
 	  if (!ca && !cb) {

firmware/export/config-c200.h

@@ -180,7 +180,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x7450
 

firmware/export/config-e200.h

@@ -174,7 +174,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x7421
 

firmware/export/config-h10.h

@@ -164,7 +164,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0B70
 #define USB_PRODUCT_ID 0x00BA
 

firmware/export/config-h10_5gb.h

@@ -144,7 +144,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0B70
 #define USB_PRODUCT_ID 0x00BA
  

firmware/export/config-hdd1630.h

@@ -178,7 +178,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0471
 #define USB_PRODUCT_ID 0x014C
 

firmware/export/config-ipod4g.h

@@ -174,7 +174,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1203
 

firmware/export/config-ipodcolor.h

@@ -151,7 +151,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1204
 

firmware/export/config-ipodmini.h

@@ -170,7 +170,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1205
 

firmware/export/config-ipodmini2g.h

@@ -177,7 +177,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1205
 

firmware/export/config-ipodnano.h

@@ -161,7 +161,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x120a
 

firmware/export/config-ipodvideo.h

@@ -175,7 +175,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1209
 

firmware/export/config-mrobe100.h

@@ -152,7 +152,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x07B4
 #define USB_PRODUCT_ID 0x0280
 

firmware/export/config-ondiofm.h

@@ -50,9 +50,11 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x8000
 
+#ifndef BOOTLOADER
 /* Define this if you have an FM Radio */
 #define CONFIG_TUNER (S1A0903X01 | TEA5767) /* to be decided at runtime */
 #define CONFIG_TUNER_XTAL 13000000
+#endif
 
 /* Define this if you have a MAS3587F */
 #define CONFIG_CODEC MAS3587F

firmware/export/config-recorderv2.h

@@ -112,8 +112,10 @@
 /* Offset ( in the firmware file's header ) to the real data */
 #define FIRMWARE_OFFSET_FILE_DATA 24
 
+#ifndef BOOTLOADER
 /* Define this if you have an FM Radio */
 #define CONFIG_TUNER S1A0903X01
+#endif
 
 /* The start address index for ROM builds */
 /* #define ROM_START 0x12010 for behind original Archos */

firmware/export/config-sa9200.h

@@ -144,7 +144,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0471
 #define USB_PRODUCT_ID 0x014f
 

manual/advanced_topics/archos-flashing.tex

@@ -59,7 +59,7 @@ The replacement firmware contains a bootloader and two images. The first image
 is the \emph{permanent} rescue software, to be used in case something is wrong
 with the second (main) image. In current firmware files this first image
 contains \emph{Bootbox} (see wiki for details). The second image is what is
-booted by default. The current firmware files contain a copy of Rockbox 3.0.1
+booted by default. The current firmware files contain a copy of Rockbox 3.2
 in the main image. It can easily be updated/replaced later.
 
 The bootloader allows to select which image to run. Pressing
@@ -110,7 +110,7 @@ a safe place.
 \item Download the correct package for your \dap\ from
   \url{http://download.rockbox.org/bootloader/archos/}. It is named
   \fname{flash-{\textless}model{\textgreater}-{\textless}version{\textgreater}.zip}.
-  The current packages are v2.
+  The current packages are v3.
 \item Unzip the flash package to the root of your \dap.
   \nopt{ondio}{This will extract two files to the root,
     \fname{firmware\_{\textless}model{\textgreater}.bin} and

manual/advanced_topics/main.tex

@@ -39,17 +39,82 @@ file find the instructions on the Rockbox website:
 \wikilink{LangFiles}
 
 \opt{lcd_color}{
-  \subsection{Changing Colours}
-  The colours used in the Rockbox interface can be changed to any combination
-  you like. To do this, go to
-  \setting{Settings $\rightarrow$ Theme Settings $\rightarrow$ Colours}.
-  The colours set here are used in all menus, browsers and in the
-  \setting{While Playing Screen}.
-      \subsection{Changing Filetype Colours}
-        Rockbox has the capability to modify the \setting{File Browser}
-        to show different filetypes in different colours depending upon
-        the file extension. See the \wikilink{CustomFiletypeColours} Wiki
-        page for details.
+  \subsection{Changing Filetype Colours}
+  Rockbox has the capability to modify the \setting{File Browser} to show
+  different filetypes in different colours, depending on the file extension. 
+      \subsubsection{Set-up}
+      There are two steps to changing the filetype colours - creating
+      a file with the extension \fname{.colours} and then activating it using
+      a config file.  The \fname{.colours} files \emph{must} be stored in
+      the \fname{/.rockbox/themes/} directory.
+      The \fname{.colours} file is just a text file, and can be edited with
+      your text editor of choice.
+
+      \subsubsection{Creating the .colours file}
+      The \fname{.colours} file consits of the file extension
+      (or \fname{folder}) followed by a colon and then the colour desired
+      as an RGB value in hexadecimal, as in the following example:\\*
+      \\
+      \config{folder:808080}\\
+      \config{mp3:00FF00}\\
+      \config{ogg:00FF00}\\
+      \config{txt:FF0000}\\
+      \config{???:FFFFFF}\\*
+
+      The permissible extensions are as follows:\\*
+      \\ 
+      \config{folder, m3u, m3u8, cfg, wps, lng, rock, bmark, cue, colours, mpa,
+      \firmwareextension{}, %
+      \opt{swcodec}{mp1, }mp2, mp3%
+      \opt{swcodec}{, ogg, oga, wma, wmv, asf, wav, flac, ac3, a52, mpc,
+      wv, m4a, m4b, mp4, mod, shn, aif, aiff, spx, sid, adx, nsf, nsfe,
+      spc, ape, mac, sap}%
+      \opt{lcd_bitmap}{\opt{swcodec}{, mpg, mpeg}}%
+      \opt{HAVE_REMOTE_LCD}{, rwps}%
+      \opt{lcd_non-mono}{, bmp}%
+      \opt{radio}{, fmr}%
+      \opt{lcd_bitmap}{, fnt, kbd}}\\*
+      %It'd be ideal to get these from filetypes.c
+
+      All file extensions that are not either specifically listed in the
+      \fname{.colours} files or are not in the list above will be
+      set to the colour given by \config{???}. Extensions that
+      are in the above list but not in the \fname{.colours}
+      file will be set to the foreground colour as normal.
+
+      \subsubsection{Activating}
+      To activate the filetype colours, the \fname{.colours} file needs to be
+      invoked from a \fname{.cfg} configuration file. The easiest way to do
+      this is to create a new text file containing the following single
+      line:\\*
+      \\
+      \config{filetype colours: /.rockbox/themes/filename.colours}\\*
+
+      where filename is replaced by the filename you used when creating the
+      \fname{.colours} file. Save this file as e.g. \fname{colours.cfg} in the
+      \fname{/.rockbox/themes} directory and then activate the config file
+      from the menu as normal
+      (\setting{Settings} $\rightarrow$ \setting{Theme Settings}%
+      $\rightarrow$ \setting{Browse Themes}).
+
+      \subsubsection{Editing}
+      The built-in \setting{Text Editor} (see \reference{sec:text_editor})
+      automatically understands the
+      \fname{.colours} file format, but an external text editor can
+      also be used. To edit the \fname{.colours} file using Rockbox,
+      select it in the \setting{File Browser}. The file will open in 
+      the \setting{Text Editor}. Upon selecting a line, the following choices
+      will appear:\\*
+      \\
+      \config{Extension}\\
+      \config{Colour}\\*
+
+      If \config{Extension} is selected, the \setting{virtual keyboard}
+      (see \reference{sec:virtual_keyboard}) appears,
+      allowing the file extension to be modified. If \config{Colour}
+      is selected, the colour selector screen appears. Choose the desired
+      colour, then save the \fname{.colours} file using the standard
+      \setting{Text Editor} controls.
 }
 
 \opt{lcd_non-mono}{%

manual/appendix/appendix.tex

@@ -5,14 +5,12 @@
 
 \input{appendix/wps_tags.tex}
 
-\opt{swcodec}{\opt{tagcache}{
+\opt{lcd_bitmap}{\opt{tagcache}{
 \input{appendix/album_art.tex}
 }}
 
 \input{appendix/config_file_options.tex}
 
-\input{appendix/menu_structure.tex}
-
 \chapter{User feedback}\label{sec:feedback}
 \section{Bug reports}
 If you experience inappropriate performance from any supported feature,

manual/appendix/changelog.tex

@@ -1,4 +1,21 @@
 \chapter{\label{ref:changelog}Changelog}
+\section{What is new since v3.1?}
+
+\subsection{New features}
+\begin{changelog}
+\item 2009-03-06: PictureFlow supports all targets except Archos Player, and can function during playback on all non-Archos targets.
+\item 2009-03-01: New alternative sorting algorithm, which is number-aware
+\item 2009-02-11: New game, Goban plugin.
+\item 2009-01-11: Battery charging on Sansa e200v1/c200v1.
+\item 2008-12-27: PictureFlow resizes cover art on load, and supports greyscale targets
+\item 2008-12-25: Preliminary support for Ipod accessories.
+\end{changelog}
+\subsection{Enhancements}
+\begin{changelog}
+\item 2009-03-08: Faster text/graphics rendering on colour targets and in the greyscale library, speeding up list scrolling noticeably on ipod Video.
+\item 2009-02-21: Add LCD sleep/wakeup for iPod Video (5G, 5.5G) which allows significant increase of battery runtime.
+\end{changelog}
+
 \section{What is new since v3.0?}
 
 \subsection{New features}
@@ -24,18 +41,10 @@
 
 \subsection{New features}
 \begin{changelog}
-\item 2008-07-27: SAP codec
-\item 2008-07-14: Initial support for the Onda VX747
 \item 2008-07-07: Added keybox plugin
-\item 2008-06-10: md5sum plugin added
-\item 2008-05-21: MOD codec support added
-\item 2008-05-21: Initial support for the Philips GoGear SA9200.  
 \item 2008-05-04: Added study mode
-\item 2008-05-03: Sound on the Gigabeat S.
-\item 2008-04-24: Initial support for the Creative Zen Vision:M
 \item 2008-04-23: Lamp (originally "flashlight") plugin
 \item 2008-03-23: New bitmap strips feature in the WPS
-\item 2008-03-23: The iAudio M3 is now a supported target
 \item 2008-03-21: Viewport tag added for WPS
 \item 2008-03-18: The Olympus m:robe 100 is now a supported target
 \item 2007-12-09: PictureFlow: A nice animated visualization for album art
@@ -48,12 +57,10 @@
 \item 2007-08-02: Superdom game
 \item 2007-07-27: Sound on iPod 2nd Gen
 \item 2007-07-25: Jackpot support for bitmap targets
-\item 2007-07-03: WMA codec initial support
 \item 2007-06-30: Reversi game
 \item 2007-06-29: Rocklife plugin
 \item 2007-06-28: Maze game
 \item 2007-06-17: Custom filetype colour feature introduced 
-\item 2007-06-05: Monkey's Audio support
 \item 2007-05-23: The 80GB Ipod Video is now supported by Rockbox
 \item 2007-04-09: WAV file viewer
 \item 2007-03-11: Sound on the Sansa e200
@@ -62,11 +69,9 @@
 \item 2007-02-16: Chopper game
 \item 2007-02-14: Cuesheet support
 \item 2007-02-14: Icons in the menus
-\item 2007-02-14: SPC codec
 \item 2007-02-10: Album Artist and Comment Tag Support
 \item 2007-02-09: Speex Codec Support
 \item 2007-01-31: Invadrox, a Space Invaders clone
-\item 2007-01-25: NSF codec
 \item 2007-01-16: BlackJack plugin
 \item 2007-01-02: Mazezam, a puzzle game for all bitmap lcd targets
 \item 2006-12-29: Toshiba Gigabeat X and F series support
@@ -78,13 +83,11 @@
 \item 2006-10-27: Audio dithering option
 \item 2006-10-19: last.fm (audioscrobbler) logging support
 \item 2006-10-05: FM radio region setting
-\item 2006-09-25: ADX codec
 \item 2006-09-15: ZX spectrum emulator plugin - zxbox
 \item 2006-08-28: Encoder Codec Interface for recording with
   additional FM recording support
 \item 2006-08-07: Initial version of mpegplayer plugin
 \item 2006-07-19: Rockpaint plugin
-\item 2006-07-18: SID codec
 \item 2006-07-18: Playlist catalog
 \item 2006-04-19: Rockbox is functional and plays audio on the iPod Mini 1G
 \item 2006-03-30: Rockbox is functional and plays audio on the iPod Mini 2G
@@ -98,7 +101,6 @@
 \item 2006-03-11: Pacbox, a pacman arcade machine emulator
 \item 2006-02-22: "Chessbox" chess game plugin
 \item 2006-02-13: iPod 5G audio playback
-\item 2006-02-01: AIFF codec support added
 \item 2006-01-28: Color bitmap support in the WPS (for color models)
 \item 2006-01-23: Brickmania game plugin
 \item 2005-12-06: Unicode support
@@ -130,4 +132,35 @@
 \item 2005-12-05: New wps' added. Engineeer2, marquee, and DancePuffDuo
 \end{changelog}
 
-\subsection{Bug fixes}
+\subsection{New codecs supported}
+\subsubsection{Lossy codecs}
+\begin{changelog}
+\item Ogg/vorbis
+\item MPC
+\item A/52 (AC3)
+\item AAC (MP4)
+\item WMA
+\item ADX
+\item Speex
+\end{changelog}
+
+\subsubsection{Lossless codecs}
+\begin{changelog}
+\item WAV
+\item AIFF
+\item FLAC
+\item ALAC
+\item Wavpack
+\item Shorten
+\item Monkey's Audio
+\end{changelog}
+
+\subsubsection{Other codecs}
+\begin{changelog}
+\item SID
+\item MOD
+\item NSF, NSFE
+\item SPC
+\item MIDI
+\item SAP
+\end{changelog}

manual/appendix/config_file_options.tex

@@ -60,8 +60,8 @@
                     & on, off, ask      & N/A\\
     scroll speed    & 1 to 25           & Hz\\
     scroll delay    & 0 to 2500         & ms\\
-    scroll step     & \fixme{devise a way to get ranges from config-*.h} & pixels\\
-    screen scroll step & \fixme{devise a way to get ranges from config-*.h} & pixels\\
+    scroll step     & & pixels\\
+    screen scroll step & & pixels\\
     Screen Scrolls Out Of View & on, off & N/A\\
     bidir limit     & 0 to 200          & \% screen\\
     scroll paginated & on, off & N/A\\
@@ -79,9 +79,9 @@
     backlight filters first keypress & on, off & N/A\\
     backlight on button hold & normal, off, on & N/A\\
     caption backlight & on, off & N/A\\
-    brightness      & \fixme{devise a way to get ranges from config-*.h} & N/A\\
+    brightness      & & N/A\\
     disk spindown   & 3 to 254          & seconds\\
-    battery capacity & \fixme{devise a way to get ranges from config-*.h} & mAh\\
+    battery capacity & & mAh\\
     \opt{battery_types}{
       battery type  & alkaline, nimh    & N/A\\
     }

manual/configure_rockbox/file_view.tex

@@ -20,30 +20,6 @@ displays files.
   is a \setting{By type} option which sorts files alphabetically by their type 
   (such as \fname{.mp3}) then alphabetically within each type.
 
-\item[Interpret numbers when sorting:]
-  \setting{As whole numbers} enables a sorting algorithm which is similar to
-  the default sorting of, for example, Windows Explorer, Mac OS X's Finder
-  or Nautilus, with regards to numbers at the beginning or within filenames.
-  It combines consecutive digits to a number used for sorting.
-  \newline\setting{As digits} disables this algorithm, and causes every digit to
-  be compared separately. The following table demonstrates the two sortings.
-  \begin{table}
-    \centering
-    \begin{tabularx}{.8\textwidth}{ll}
-    \toprule
-      \textbf{As whole numbers} & \textbf{As digits}\\
-      \midrule
-      1 Ring Of Fire.mp3 & 03 Jackson.mp3\\
-      2 I Walk The Line.mp3 & 1 Ring Of Fire.mp3\\
-      03 Jackson.mp3 & 10 A Thing Called Love.mp3\\
-      10 A Thing Called Love.mp3 & 2 I Walk The Line.mp3\\
-      Episode 1.ogg & Episode 1.ogg\\
-      Episode 2.ogg & Episode 10.ogg\\
-      Episode 10.ogg & Episode 2.ogg\\
-      \bottomrule
-    \end{tabularx}
-  \end{table}
-
   
 \item[\label{ref:ShowFiles}Show Files:]
   This option controls which files are displayed in the File Browser.

manual/configure_rockbox/recording_settings.tex

@@ -164,10 +164,6 @@
 	not start another recording. \setting{Repeat} will have the trigger start 
 	multiple recordings.
 	
-  \item[Trigtype]
-    \fixme{Add description of Trigtype}
-	Options: \setting{Stop}, \setting{Pause}, \setting{New File}.
-	
   \item[Prerecord Time]
     This specifies the time that is included into the recording before the
 	trigger event occurs. This is very useful if you record a signal that fades

manual/platform/c200.tex

@@ -17,6 +17,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
+\newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{flash storage}
 

manual/platform/clip.tex

@@ -17,6 +17,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity...
 \newcommand{\daps}{player's}
 \newcommand{firmwarefilename}{\fname{rockbox.sansa}}
+\newcommand{\firmwareextension}{\fname{sansa}}
 \newcommand{\screenshotsize}{3cm}
 \newcommand{\disk}{flash storage}
 

manual/platform/e200.tex

@@ -17,6 +17,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
+\newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{flash storage}
 

manual/platform/gigabeatf.tex

@@ -18,6 +18,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.gigabeat}}
+\newcommand{\firmwareextension}{\fname{gigabeat}}
 \newcommand{\screenshotsize}{6cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/gigabeats.tex

@@ -17,6 +17,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.gigabeat}}
+\newcommand{\firmwareextension}{\fname{gigabeat}}
 \newcommand{\screenshotsize}{6cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/h10.tex

@@ -17,6 +17,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
+\newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/h100.tex

@@ -18,6 +18,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iriver}}
+\newcommand{\firmwareextension}{\fname{iriver}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/h10_5gb.tex

@@ -17,6 +17,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
+\newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/h300.tex

@@ -18,6 +18,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iriver}}
+\newcommand{\firmwareextension}{\fname{iriver}}
 \newcommand{\screenshotsize}{6cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/ipod1g2g.tex

@@ -16,6 +16,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
+\newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/ipod3g.tex

@@ -16,6 +16,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
+\newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/ipod4g.tex

@@ -16,6 +16,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
+\newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/ipodcolor.tex

@@ -16,6 +16,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
+\newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{6cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/ipodmini.tex

@@ -16,6 +16,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
+\newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/ipodnano.tex

@@ -15,6 +15,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
+\newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{flash storage}
 

manual/platform/ipodvideo.tex

@@ -17,6 +17,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.ipod}}
+\newcommand{\firmwareextension}{\fname{ipod}}
 \newcommand{\screenshotsize}{8cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/m5.tex

@@ -18,6 +18,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iaudio}}
+\newcommand{\firmwareextension}{\fname{iaudio}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/mrobe100.tex

@@ -17,6 +17,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.mi4}}
+\newcommand{\firmwareextension}{\fname{mi4}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/ondiofm.tex

@@ -17,6 +17,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
+\newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{flash storage}
 

manual/platform/ondiosp.tex

@@ -17,6 +17,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
+\newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{flash storage}
 

manual/platform/player.tex

@@ -18,6 +18,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{archos.mod}}
+\newcommand{\firmwareextension}{\fname{mod}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/recorder.tex

@@ -18,6 +18,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
+\newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/recorderv2fm.tex

@@ -17,6 +17,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
+\newcommand{\firmwareextension}{\fname{ajz}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 

manual/platform/x5.tex

@@ -18,6 +18,7 @@
 %For use when referring to the player. E.g. the \daps\ capacity ...
 \newcommand{\daps}{player's}
 \newcommand{\firmwarefilename}{\fname{rockbox.iaudio}}
+\newcommand{\firmwareextension}{\fname{iaudio}}
 \newcommand{\screenshotsize}{4cm}
 \newcommand{\disk}{hard disk}
 

manual/plugins/batterybenchmark.tex

@@ -1,20 +1,19 @@
 \subsection{Battery Benchmark}
-The Battery Benchmark Plugin enables you to test your battery's performance,
-while making normal use of your \dap. Once loaded it will run in the
-background (TSR plugin), reading various info about your battery while you use
-it. Once you finish your session you can find the benchmark output data in a
-file on your \dap\ \fname{/battery\_bench.txt}.
-Please submit your results to the Rockbox wiki.
-\wikilink{BatteryRuntime}
+The \setting{Battery Benchmark} plugin enables you to test your battery's
+performance whilst using your \dap\ normally. Results can be submitted 
+to the \wikilink{BatteryRuntime} wiki page.
 
 \subsubsection{How it works}
-After you load the plug-in the operation of your \dap\ continues as normal.
-You can do whatever you could do before loading the plugin except loading
-another plugin. If you happen to load a plugin while benchmarking, a splash
-screen will inform you about the termination of the benchmark.
-While you operate it will log various battery related information every time
-the disk is activated by external causes, (buffer refill, open directory,
-USB mode) or an hour passes without updating the log file.\\
+Once loaded, \setting{Battery Benchmark} runs in the
+background recording various information about your battery to memory.
+A new point is written to memory every minute.
+Every time the disk is accessed for any reason
+(such as refilling the audio buffer, opening a directory or entering
+USB mode etc.) then the information in memory is written to disk.
+Once the memory becomes full (after many hours), then the data
+are written to disk anyway. This is done so that the data are not biased by
+excessive additional disk accesses. The file is written to the root
+directory of your \dap\ and is called \fname{battery\_bench.txt}.
 The plugin will continue to log info until:
 
 \begin{itemize}
@@ -22,49 +21,43 @@ The plugin will continue to log info until:
 \item The \dap\ is shut down.
 \item The battery is empty.
 \end{itemize}
-Between disk activity (or an hour), it will log info in memory (every
-measurement is captured when the voltage changes). If there are too many
-measurements older entries will be deleted and the log file will inform the
-user about the interval where entries were lost. Benchmarks can be resumed if
-you accidentally load a plugin, or turn off your \dap, as long as the log
-file \fname{/battery\_bench.txt} is not deleted. 
+
+Benchmarks can be resumed if
+you accidentally load a plugin, or turn off your \dap, so long as the log
+file \fname{battery\_bench.txt} is not deleted. 
 
 \subsubsection{Information explained}
-On the top of the file you will see various info on how to use the plugin.
+At the top of the \fname{battery\_bench.txt} file is various
+information on how to use the plugin, followed by the data themselves.
+
 \begin{description}
 \item[Time] This column reports the total time of operation of the \dap. It is 
-not the time that you started the plug-in. If you have your player on for 5 
+not the time that you started the plug-in. If you have your \dap\ on for 5 
 minutes and then start the plugin, it will start measuring from 5 minutes.
-\item[Seconds] As time, it shows time passed in seconds. Nothing special, it is
-there because it is free and maybe someone might want to make graphs with
-seconds.
-\item[Level] The percent level of the battery estimated by Rockbox. This is an
-estimation and not an accurate result. Using the real percentage (current
-battery voltage / top battery voltage) * 100) we can calculate the difference
-between the estimation. Goal of this column is to make the estimation algorithm
-of Rockbox more accurate.
-\item[Time Left] It shows the estimated (by Rockbox) remaining time until
-shutdown. Again, as with Level(above), this column can be used to see 
-differences between real time left and estimated time left. This could help 
-make time left more accurate.
-\item[Voltage] The battery voltage, the moment the measurement was captured. 
-Measurements are captured when this number changes while benchmarking.
-This column can be used to give quite interesting graphs in a spreadsheet
-program. (Excel, Calc, e.t.c)
-\item[M/DA] (Measurements per Disk Activity) The number of measurements stored
-temporarily in memory, before written on the log file. This can give you an
-idea of how many voltage changes there are between disk activity (or one hour).
-\item[C] Stands for Charger. An "A" in that column shows if there was the power
-adapter attached to the unit, at the time of the measurement.
-\item[S] The "S" column shows the state of the device (Charging, or not). The
-"C" indicated that the unit was charging when the measurement was captured.
+\item[Seconds] The same as \config{Time}, except measured in seconds.
+\item[Level] The percent level of the battery estimated by Rockbox, and not the
+actual battery level. The actual battery level can be seen from the
+\config{Voltage} column
+\item[Time Left] This shows the time remaining until the battery is empty,
+again as estimated by Rockbox.
+\item[Voltage] The battery voltage in mV at the moment the measurement
+was taken.
+\item[C] This stands for Charger. An "A" in that column shows if the power
+adapter was attached to the unit at the time of the measurement.
 \item[U] USB powered. Only for targets that support this. A "U" will indicate
-if the unit was using the USB port for powering. 
+if the unit was using the USB port for power at the time of the measurement. 
 \end{description}
 
-\subsubsection{Making graphs}
-While you can tell how long your battery lasted, with a single look at the last
-line of the battery log (\fname{/battery\_bench.txt}), the most useful purpose of
-Battery Benchmark is to make graphs using a spreadsheet program like Excel or
-Calc. The battery log (\fname{/battery\_bench.txt}) is in CSV format (comma separated)
-so you can quite easily import it to a spreadsheet program.
+\subsubsection{Usage}
+The log file can be used to tell you how long the battery lasted (with some
+limitations, see below), but it is most useful for graphing discharge curves
+in order to improve Rockbox's estimation of battery level and time remaining.
+The battery log (\fname{battery\_bench.txt}) is in CSV format
+(comma separated variables) and thus can be easily imported into a spreadsheet
+or similar program.
+
+\subsubsection{Limitations}
+As \setting{Battery Benchmark} needs to write the data held in memory to
+disk in order to save them, it is possible that should Rockbox shut down
+due to low battery then there will not be enough power remaining to write the
+data to disk. Therefore all measurements since the previous save will be lost.

manual/plugins/doom.tex

@@ -134,4 +134,4 @@ Rockdoom options, you will need to quit your current game and restart the plugin
 \subsubsection{Playing the game}
 After installation of the \fname{wad} files is complete you can start the
 game.
-\fixme{more description is needed}
+

manual/plugins/main.tex

@@ -102,7 +102,7 @@ text files%
 
 \opt{lcd_bitmap}{\input{plugins/oscilloscope.tex}}
 
-\opt{tagcache}{\opt{swcodec}{\input{plugins/pictureflow.tex}}}
+\opt{tagcache}{\opt{lcd_bitmap}{\input{plugins/pictureflow.tex}}}
 
 \opt{lcd_bitmap}{\input{plugins/plasma.tex}}
 
@@ -175,7 +175,8 @@ the associated file. Viewers are stored in the
 
 {\input{plugins/md5sum.tex}}
 
-{\input{plugins/metronome.tex}}
+\nopt{player,ondio,c200}{\input{plugins/metronome.tex}
+}
 
 {\input{plugins/random_folder_advance_config.tex}}
 

manual/plugins/pictureflow.tex

@@ -31,14 +31,16 @@ play music.}
         \nopt{scrollwheel,IRIVER_H10_PAD}{\ButtonLeft{} / \ButtonRight
          & Scroll through albums\\}
 
-        \nopt{scrollwheel,SANSA_C200_PAD,IRIVER_H10_PAD}{\ButtonUp{} / \ButtonDown    
+        \nopt{scrollwheel,SANSA_C200_PAD,ONDIO_PAD,IRIVER_H10_PAD}{\ButtonUp{} / \ButtonDown    
         & Scroll through track list\\}
         
         \opt{SANSA_C200_PAD}{\ButtonUp
         & Scroll up through track list\\}
        
-        \nopt{IRIVER_H10_PAD}{\ButtonSelect}
+        \nopt{IRIVER_H10_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonSelect}
         \opt{IRIVER_H10_PAD}{\ButtonRew}
+        \opt{RECORDER_PAD}{\ButtonPlay}
+        \opt{ONDIO_PAD}{\ButtonUp}
         & Switch between cover view and track list\\
 
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
@@ -47,9 +49,11 @@ play music.}
         \opt{IAUDIO_X5_PAD}{\ButtonRec}
         \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonDown}
         \opt{IRIVER_H10_PAD}{\ButtonFF}
+        \opt{RECORDER_PAD}{\ButtonFOne}
+        \opt{ONDIO_PAD}{\ButtonDown}
         & Enter / exit menu\\
 
-        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
         \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,SANSA_E200_PAD,SANSA_C200_PAD,%
              IRIVER_H10_PAD,MROBE_100_PAD}{\ButtonPower}
         \opt{GIGABEATS_PAD}{\ButtonBack}
@@ -62,7 +66,7 @@ play music.}
 \begin{description}
   \item[Settings.] Enter the settings menu.
   \item[Return.] Exit menu.
-  \item[Exit.] Exit PictureFlow plugin.
+  \item[Quit.] Exit PictureFlow plugin.
 \end{description}
 
 \subsubsection{Settings Menu}

manual/plugins/text_editor.tex

@@ -1,4 +1,4 @@
-\subsection{Text Editor}
+\subsection{\label{sec:text_editor}Text Editor}
 This plugin allows you to view and edit simple text documents on your DAP.
 You can view files by using \setting{Open with} from the
 \setting{Context Menu} (see \reference{ref:Contextmenu}).

manual/preamble.tex

@@ -146,7 +146,6 @@
             {\includegraphics[width=\screenshotsize]{#1}
              \typeout{Warning: deprecated plain image name used}}%
             {\typeout{Missing image: #1 (\genericimg) (\specimg)}%
-             \color{red}{\textbf{WARNING!} Image not found}%
             }
           }
         }

manual/rockbox_interface/main.tex

@@ -631,11 +631,14 @@ that also changes various other settings like file view, LCD settings and
 all other settings that can be modified using \fname{.cfg} files. This topic
 is discussed in more detail in \reference{ref:manage_settings}.
 The Rockbox distribution comes with some themes that should look nice on
-your \dap{}. \note{Some of the themes shipped with Rockbox need additional
+your \dap{}.
+\opt{lcd_bitmap}{
+\note{Some of the themes shipped with Rockbox need additional
 fonts from the fonts package, so make sure you installed them.
 Also, if you downloaded additional themes from the Internet make sure you
 have the needed fonts installed as otherwise the theme may get displayed
 garbled.}
+}
 
 \opt{usb_charging}
 {
@@ -644,21 +647,6 @@ garbled.}
     The \dap{} can be powered over USB without connecting to your
     computer by holding \ActionStdUsbCharge{} while plugging in. This
     allows you to continue using the \dap{} normally.
-
-    \opt{usbstack}
-    {
-        \nopt{gigabeats}
-        {
-            \section{USB disconnect}
-            
-            As soon as the computer marks the \dap{} as unused (e.g.
-	    after you eject or safely remove the device), the \dap{}
-	    can be switched to charging mode by pressing
-	    \ActionStdUsbCharge{}. Pressing \ActionStdUsbCharge{}
-	    while the computer is still actively communicating with
-	    the \dap{} has no effect.
-        }
-    }
 }
 
 \input{rockbox_interface/browsing_and_playing.tex}

manual/working_with_playlists/main.tex

@@ -1,8 +1,5 @@
 % $Id$ %
 \section{\label{ref:working_with_playlists}Working with Playlists}
-\fixme{This section is currently in a half written state, with possible errors
-  and a lot of stuff missing. Please help us fix this chapter by submitting
-  additions/corrections to the tracker}
 
 \subsection{Playlist terminology}
 Some common terms that are used in Rockbox when referring to

tools/release/bins.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-$version="3.0";
+$version="3.2";
 
 my $verbose;
 if($ARGV[0] eq "-v") {

tools/release/manuals.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-$version="3.0";
+$version="3.2";
 
 my $verbose;
 if($ARGV[0] eq "-v") {

tools/release/tarball.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-version="3.0"
+version="3.2"
 
 srcdir=.
 tempdir=rockbox-temp

tools/release/voices.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-$version="3.0";
+$version="3.2";
 
 my $verbose;
 if($ARGV[0] eq "-v") {
@@ -55,7 +55,7 @@ sub buildit {
     `rm -rf * >/dev/null 2>&1`;
 
     # V (voice), F (festival), L (lame), [blank] (English)
-    my $c = sprintf('echo -e "%s\n%sa\nv\n\n\nf\n\n" | ../tools/configure',
+    my $c = sprintf('printf "%s\n%sa\nv\n\n\nf\n2\n\n" | ../tools/configure',
                     $select, $newl?'\n':"");
 
     print "C: $c\n" if($verbose);

tools/version.sh

@@ -19,15 +19,7 @@
 
 svnversion_safe() {
     # LANG=C forces svnversion to not localize "exported".
-    if OUTPUT=`LANG=C svnversion "$@"`; then
-        if [ "$OUTPUT" = "exported" ]; then
-            echo "unknown"
-        else
-            echo "r$OUTPUT"
-        fi
-    else
-        echo "unknown"
-    fi
+    echo "3.2"
 }
 
 # This logic is pulled from the Linux's scripts/setlocalversion (also GPL) and tweaked for