plugin lrcplayer: Added manual scrolling feature

lrcplayer currently automatically scrolls the lyrics for you, as it assumes that there is sync information in the lyrics. In the case where there aren't (like for ID3V2 USLT tags), the plugin will automatically assume timestamps and will scroll automatically.
This commit adds an option in the Display Menu to allow automatic scrolling to be disabled. When disabled, you can scroll the lyrics using the volume keys (like you would on the iPod's OS).

Change-Id: I87ef27fd2b84c97374bdfd0e47f4c00ddb4bc85e

apps/SOURCES

@@ -215,14 +215,6 @@ keymaps/keymap-mr500.c
 keymaps/keymap-mr100.c
 #elif CONFIG_KEYPAD == COWON_D2_PAD
 keymaps/keymap-cowond2.c
-#elif CONFIG_KEYPAD == MEIZU_M6SL_PAD
-keymaps/keymap-meizu-m6sl.c
-#elif CONFIG_KEYPAD == MEIZU_M6SP_PAD
-keymaps/keymap-meizu-m6sp.c
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-keymaps/keymap-creativezvm.c
-#elif CONFIG_KEYPAD == CREATIVEZV_PAD
-keymaps/keymap-creativezv.c
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
 keymaps/keymap-zenxfi2.c
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
@@ -244,8 +236,6 @@ keymaps/keymap-ondavx767.c
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \
     || (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 keymaps/keymap-yh8xx_yh9xx.c
-#elif CONFIG_KEYPAD == MINI2440_PAD
-keymaps/keymap-mini2440.c
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 keymaps/keymap-vibe500.c
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD

apps/debug_menu.c

@@ -143,6 +143,10 @@
 #include "iap.h"
 #endif
 
+#ifdef HIBY_LINUX
+#include <sys/sysinfo.h>
+#endif
+
 #define SCREEN_MAX_CHARS (LCD_WIDTH / SYSFONT_WIDTH)
 
 static const char* threads_getname(int selected_item, void *data,
@@ -2597,31 +2601,6 @@ static bool dbg_isp1583(void)
 }
 #endif
 
-#if defined(CREATIVE_ZVx) && !defined(SIMULATOR)
-extern int pic_dbg_num_items(void);
-extern const char* pic_dbg_item(int selected_item, void *data,
-                                char *buffer, size_t buffer_len);
-
-static int pic_action_callback(int action, struct gui_synclist *lists)
-{
-    (void)lists;
-    if (action == ACTION_NONE)
-        action = ACTION_REDRAW;
-    return action;
-}
-
-static bool dbg_pic(void)
-{
-    struct simplelist_info pic;
-    pic.scroll_all = true;
-    simplelist_info_init(&pic, "PIC", pic_dbg_num_items(), NULL);
-    pic.timeout = HZ/100;
-    pic.get_name = pic_dbg_item;
-    pic.action_callback = pic_action_callback;
-    return simplelist_show_list(&pic);
-}
-#endif
-
 #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR)
 static bool dbg_boot_data(void)
 {
@@ -2800,6 +2779,55 @@ static bool dbg_bootflash_dump(void) {
 }
 #endif
 
+#ifdef HIBY_LINUX
+static bool view_ram_info(void)
+{
+    struct simplelist_info info;
+    simplelist_info_init(&info, "RAM Info", 0, NULL);
+
+    simplelist_reset_lines();
+    simplelist_addline("Rockbox: %d MB", MEMORYSIZE);
+
+    struct sysinfo sys_info;
+    if (sysinfo(&sys_info) == 0) {
+        long total_ram = sys_info.totalram * sys_info.mem_unit / 1024 / 1024;
+        long free_ram = sys_info.freeram * sys_info.mem_unit / 1024 / 1024;
+        long buffer_ram = sys_info.bufferram * sys_info.mem_unit / 1024 / 1024;
+        simplelist_addline("Total RAM: %ld MB", total_ram);
+        simplelist_addline("Free RAM: %ld MB", free_ram);
+        simplelist_addline("Buffer RAM: %ld MB", buffer_ram);
+
+        /* Try to read MemAvailable from /proc/meminfo for a better "free" estimate */
+        FILE *fp = fopen("/proc/meminfo", "r");
+        if (fp) {
+            char line[128];
+            long mem_avail = -1;
+            long cached = -1;
+            while (fgets(line, sizeof(line), fp)) {
+                if (sscanf(line, "MemAvailable: %ld kB", &mem_avail) == 1) {
+                        mem_avail /= 1024;
+                }
+                else if (sscanf(line, "Cached: %ld kB", &cached) == 1) {
+                        cached /= 1024;
+                }
+            }
+            fclose(fp);
+
+            if (mem_avail != -1) {
+                /* Estimate of how much memory is available for starting new applications */
+                simplelist_addline("Available: %ld MB", mem_avail);
+            }
+            if (cached != -1) {
+                /* Memory used by the page cache. */
+                simplelist_addline("Cached: %ld MB", cached);
+            }
+        }
+    }
+
+    return simplelist_show_list(&info);
+}
+#endif
+
 /****** The menu *********/
 static const struct {
     unsigned char *desc; /* string or ID */
@@ -2839,6 +2867,9 @@ static const struct {
 #ifdef __linux__
         { "View CPU stats", dbg_cpuinfo },
 #endif
+#ifdef HIBY_LINUX
+        { "View RAM info", view_ram_info },
+#endif
 #if (CONFIG_BATTERY_MEASURE != 0) && !defined(SIMULATOR)
         { "View battery", view_battery },
 #endif
@@ -2886,9 +2917,6 @@ static const struct {
 #if CONFIG_USBOTG == USBOTG_ISP1583
         { "View ISP1583 info", dbg_isp1583 },
 #endif
-#if defined(CREATIVE_ZVx) && !defined(SIMULATOR)
-        { "View PIC info", dbg_pic },
-#endif
 #ifdef ROCKBOX_HAS_LOGF
         {"Show Log File", logfdisplay },
         {"Dump Log File", logfdump },

apps/fileop.c

@@ -97,19 +97,23 @@ static bool poll_cancel_action(int operation, struct file_op_params *param)
         {
             int total_shft = (int) (param->total_size >> 15);
             int current_shft = (int) (param->processed_size >> 15);
+            const char *unit_str = str(LANG_MEBIBYTE);
             splash_progress(current_shft, total_shft,
-                            "%s %s (%d MiB)\n%d MiB",
+                            "%s %s (%d %s)\n%d %s",
                             op_str, param->toplevel_name,
-                            total_shft >> 5, current_shft >> 5);
+                            total_shft >> 5, unit_str,
+                            current_shft >> 5, unit_str);
         }
         else if (param->total_size >= 1024)
         {
             int total_kib = (int) (param->total_size >> 10);
             int current_kib = (int) (param->processed_size >> 10);
+            const char *unit_str = str(LANG_KIBIBYTE);
             splash_progress(current_kib, total_kib,
-                            "%s %s (%d KiB)\n%d KiB",
+                            "%s %s (%d %s)\n%d %s",
                             op_str, param->toplevel_name,
-                            total_kib, current_kib);
+                            total_kib, unit_str,
+                            current_kib, unit_str);
         }
     }
     return ACTION_STD_CANCEL == get_action(CONTEXT_STD, TIMEOUT_NOBLOCK);

apps/keymaps/keymap-creativezv.c

@@ -1,256 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2008 by Maurus Cuelenaere
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-/* Button Code Definitions for the Creative Zen Vision target */
-/* Copied from ZVM target for now... */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "config.h"
-#include "action.h"
-#include "button.h"
-#include "settings.h"
-
-/*
- * The format of the list is as follows
- * { Action Code,   Button code,    Prereq button code }
- * if there's no need to check the previous button's value, use BUTTON_NONE
- * Insert LAST_ITEM_IN_LIST at the end of each mapping
- */
-
-/* CONTEXT_CUSTOM's used in this file...
-
-CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
-CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens
-                                  i.e where up/down is inc/dec
-               CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec
-
-*/
-
-static const struct button_mapping button_context_standard[]  = {
-    { ACTION_STD_PREV,          BUTTON_UP|BUTTON_REL,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_STD_NEXT,          BUTTON_DOWN|BUTTON_REL,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,             BUTTON_NONE },
-
-    { ACTION_STD_CANCEL,        BUTTON_LEFT,                           BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_POWER,                          BUTTON_NONE },
-
-    { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,           BUTTON_SELECT },
-
-    { ACTION_STD_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,             BUTTON_MENU },
-    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,                BUTTON_MENU },
-
-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,              BUTTON_SELECT },
-    { ACTION_STD_OK,            BUTTON_RIGHT,                          BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST
-}; /* button_context_standard */
-
-
-static const struct button_mapping button_context_wps[]  = {
-    { ACTION_WPS_PLAY,          BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
-    { ACTION_WPS_STOP,          BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_NONE },
-
-    { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
-    { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
-
-    { ACTION_WPS_SEEKBACK,      BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_WPS_STOPSEEK,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
-    { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
-
-    //{ ACTION_WPS_ABSETB_NEXTDIR,BUTTON_RIGHT,                   BUTTON_CUSTOM },
-    //{ ACTION_WPS_ABSETA_PREVDIR,BUTTON_LEFT,                    BUTTON_CUSTOM },
-    //{ ACTION_WPS_ABRESET,       BUTTON_CUSTOM|BUTTON_REPEAT,    BUTTON_NONE   },
-
-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_UP,                      BUTTON_NONE },
-
-    { ACTION_WPS_PITCHSCREEN,   BUTTON_BACK|BUTTON_REPEAT,      BUTTON_BACK },
-
-    { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
-    { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
-    { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER,                   BUTTON_NONE },
-    { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
-
-    { ACTION_WPS_HOTKEY,        BUTTON_BACK|BUTTON_REL,         BUTTON_NONE },
-    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_BACK },
-    LAST_ITEM_IN_LIST
-}; /* button_context_wps */
-
-static const struct button_mapping button_context_list[]  = {
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_list */
-
-static const struct button_mapping button_context_tree[]  = {
-    { ACTION_TREE_WPS,    BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
-    { ACTION_TREE_STOP,   BUTTON_POWER,                   BUTTON_NONE },
-    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
-    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_TREE_HOTKEY, BUTTON_BACK|BUTTON_REL,         BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
-}; /* button_context_tree */
-
-static const struct button_mapping button_context_listtree_scroll_without_combo[]  = {
-    { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
-    { ACTION_TREE_ROOT_INIT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
-    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_NONE,              BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_STD_OK,            BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
-};
-
-static const struct button_mapping button_context_settings[]  = {
-    { ACTION_SETTINGS_INC,          BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP },
-    { ACTION_SETTINGS_DEC,          BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN },
-    { ACTION_STD_PREV,              BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },
-    { ACTION_STD_NEXT,              BUTTON_RIGHT,                   BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_settings */
-
-static const struct button_mapping button_context_settings_right_is_inc[]  = {
-    { ACTION_SETTINGS_INC,          BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_SETTINGS_DEC,          BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_STD_PREV,              BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_STD_NEXT,              BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_settingsgraphical */
-
-static const struct button_mapping button_context_yesno[]  = {
-    { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,                  BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_settings_yesno */
-
-static const struct button_mapping button_context_colorchooser[]  = {
-    { ACTION_STD_OK,            BUTTON_BACK|BUTTON_REL,   BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_colorchooser */
-
-static const struct button_mapping button_context_eq[]  = {
-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_eq */
-
-/** Bookmark Screen **/
-static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_BACK, BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-}; /* button_context_bmark */
-
-static const struct button_mapping button_context_time[]  = {
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
-}; /* button_context_time */
-
-static const struct button_mapping button_context_quickscreen[]  = {
-    { ACTION_QS_TOP,        BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_QS_TOP,        BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_QS_DOWN,       BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_QS_LEFT,       BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },
-    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_STD_CANCEL,    BUTTON_MENU,                    BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_quickscreen */
-
-static const struct button_mapping button_context_pitchscreen[]  = {
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_pitchcreen */
-
-static const struct button_mapping button_context_keyboard[]  = {
-    { ACTION_KBD_LEFT,         BUTTON_LEFT,                             BUTTON_NONE },
-    { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                            BUTTON_NONE },
-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,              BUTTON_NONE },
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_CUSTOM,                           BUTTON_NONE },
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_CUSTOM|BUTTON_REPEAT,             BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY,                             BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_SELECT,       BUTTON_SELECT,                           BUTTON_NONE },
-    { ACTION_KBD_PAGE_FLIP,    BUTTON_BACK|BUTTON_MENU,                 BUTTON_NONE },
-    { ACTION_KBD_DONE,         BUTTON_PLAY|BUTTON_REL,                  BUTTON_PLAY },
-    { ACTION_KBD_ABORT,        BUTTON_BACK|BUTTON_REL,                  BUTTON_BACK },
-    { ACTION_KBD_BACKSPACE,    BUTTON_MENU,                             BUTTON_NONE },
-    { ACTION_KBD_BACKSPACE,    BUTTON_MENU|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_UP,                               BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_UP|BUTTON_REPEAT,                 BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_DOWN,                             BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_DOWN|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL,                BUTTON_NONE },
-    LAST_ITEM_IN_LIST
-}; /* button_context_keyboard */
-
-const struct button_mapping* get_context_mapping(int context)
-{
-    switch (context&~CONTEXT_REMOTE)
-    {
-        case CONTEXT_STD:
-            return button_context_standard;
-        case CONTEXT_WPS:
-            return button_context_wps;
-        case CONTEXT_LIST:
-            return button_context_list;
-        case CONTEXT_MAINMENU:
-        case CONTEXT_TREE:
-            return button_context_listtree_scroll_without_combo;
-        case CONTEXT_CUSTOM|CONTEXT_TREE:
-            return button_context_tree;
-        case CONTEXT_SETTINGS:
-            return button_context_settings;
-        case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
-            return button_context_settings_right_is_inc;
-        case CONTEXT_SETTINGS_COLOURCHOOSER:
-            return button_context_colorchooser;
-        case CONTEXT_SETTINGS_EQ:
-            return button_context_eq;
-        case CONTEXT_SETTINGS_TIME:
-            return button_context_time;
-        case CONTEXT_YESNOSCREEN:
-            return button_context_yesno;
-        case CONTEXT_BOOKMARKSCREEN:
-            return button_context_bmark;
-        case CONTEXT_QUICKSCREEN:
-            return button_context_quickscreen;
-        case CONTEXT_PITCHSCREEN:
-            return button_context_pitchscreen;
-        case CONTEXT_KEYBOARD:
-        case CONTEXT_MORSE_INPUT:
-            return button_context_keyboard;
-    }
-    return button_context_standard;
-}

apps/keymaps/keymap-creativezvm.c

@@ -1,255 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2008 by Maurus Cuelenaere
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-/* Button Code Definitions for the Creative Zen Vision:M target */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "config.h"
-#include "action.h"
-#include "button.h"
-#include "settings.h"
-
-/*
- * The format of the list is as follows
- * { Action Code,   Button code,    Prereq button code }
- * if there's no need to check the previous button's value, use BUTTON_NONE
- * Insert LAST_ITEM_IN_LIST at the end of each mapping
- */
-
-/* CONTEXT_CUSTOM's used in this file...
-
-CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
-CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens
-                                  i.e where up/down is inc/dec
-               CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec
-
-*/
-
-static const struct button_mapping button_context_standard[]  = {
-    { ACTION_STD_PREV,          BUTTON_UP|BUTTON_REL,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_STD_NEXT,          BUTTON_DOWN|BUTTON_REL,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,             BUTTON_NONE },
-
-    { ACTION_STD_CANCEL,        BUTTON_LEFT,                           BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_POWER,                          BUTTON_NONE },
-
-    { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,           BUTTON_SELECT },
-
-    { ACTION_STD_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,             BUTTON_MENU },
-    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,                BUTTON_MENU },
-
-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,              BUTTON_SELECT },
-    { ACTION_STD_OK,            BUTTON_RIGHT,                          BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST
-}; /* button_context_standard */
-
-
-static const struct button_mapping button_context_wps[]  = {
-    { ACTION_WPS_PLAY,          BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
-    { ACTION_WPS_STOP,          BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_NONE },
-
-    { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
-    { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
-
-    { ACTION_WPS_SEEKBACK,      BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_WPS_STOPSEEK,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
-    { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
-
-    //{ ACTION_WPS_ABSETB_NEXTDIR,BUTTON_RIGHT,                   BUTTON_CUSTOM },
-    //{ ACTION_WPS_ABSETA_PREVDIR,BUTTON_LEFT,                    BUTTON_CUSTOM },
-    //{ ACTION_WPS_ABRESET,       BUTTON_CUSTOM|BUTTON_REPEAT,    BUTTON_NONE   },
-
-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_UP,                      BUTTON_NONE },
-
-    { ACTION_WPS_PITCHSCREEN,   BUTTON_BACK|BUTTON_REPEAT,      BUTTON_BACK },
-
-    { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
-    { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
-    { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER,                   BUTTON_NONE },
-    { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
-
-    { ACTION_WPS_HOTKEY,        BUTTON_BACK|BUTTON_REL,         BUTTON_NONE },
-    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_BACK },
-    LAST_ITEM_IN_LIST
-}; /* button_context_wps */
-
-static const struct button_mapping button_context_list[]  = {
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_list */
-
-static const struct button_mapping button_context_tree[]  = {
-    { ACTION_TREE_WPS,    BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
-    { ACTION_TREE_STOP,   BUTTON_POWER,                   BUTTON_NONE },
-    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
-    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_TREE_HOTKEY, BUTTON_BACK|BUTTON_REL,         BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
-}; /* button_context_tree */
-
-static const struct button_mapping button_context_listtree_scroll_without_combo[]  = {
-    { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
-    { ACTION_TREE_ROOT_INIT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
-    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_NONE,              BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_STD_OK,            BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
-};
-
-static const struct button_mapping button_context_settings[]  = {
-    { ACTION_SETTINGS_INC,          BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP },
-    { ACTION_SETTINGS_DEC,          BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN },
-    { ACTION_STD_PREV,              BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },
-    { ACTION_STD_NEXT,              BUTTON_RIGHT,                   BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_settings */
-
-static const struct button_mapping button_context_settings_right_is_inc[]  = {
-    { ACTION_SETTINGS_INC,          BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_SETTINGS_DEC,          BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_STD_PREV,              BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_STD_NEXT,              BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_settingsgraphical */
-
-static const struct button_mapping button_context_yesno[]  = {
-    { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,                  BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_settings_yesno */
-
-static const struct button_mapping button_context_colorchooser[]  = {
-    { ACTION_STD_OK,            BUTTON_BACK|BUTTON_REL,   BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_colorchooser */
-
-static const struct button_mapping button_context_eq[]  = {
-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_eq */
-
-/** Bookmark Screen **/
-static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_BACK, BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-}; /* button_context_bmark */
-
-static const struct button_mapping button_context_time[]  = {
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
-}; /* button_context_time */
-
-static const struct button_mapping button_context_quickscreen[]  = {
-    { ACTION_QS_TOP,        BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_QS_TOP,        BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_QS_DOWN,       BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_QS_LEFT,       BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },
-    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_STD_CANCEL,    BUTTON_MENU,                    BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_quickscreen */
-
-static const struct button_mapping button_context_pitchscreen[]  = {
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_pitchcreen */
-
-static const struct button_mapping button_context_keyboard[]  = {
-    { ACTION_KBD_LEFT,         BUTTON_LEFT,                             BUTTON_NONE },
-    { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                            BUTTON_NONE },
-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,              BUTTON_NONE },
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_CUSTOM,                           BUTTON_NONE },
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_CUSTOM|BUTTON_REPEAT,             BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY,                             BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_SELECT,       BUTTON_SELECT,                           BUTTON_NONE },
-    { ACTION_KBD_PAGE_FLIP,    BUTTON_BACK|BUTTON_MENU,                 BUTTON_NONE },
-    { ACTION_KBD_DONE,         BUTTON_PLAY|BUTTON_REL,                  BUTTON_PLAY },
-    { ACTION_KBD_ABORT,        BUTTON_BACK|BUTTON_REL,                  BUTTON_BACK },
-    { ACTION_KBD_BACKSPACE,    BUTTON_MENU,                             BUTTON_NONE },
-    { ACTION_KBD_BACKSPACE,    BUTTON_MENU|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_UP,                               BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_UP|BUTTON_REPEAT,                 BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_DOWN,                             BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_DOWN|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL,                BUTTON_NONE },
-    LAST_ITEM_IN_LIST
-}; /* button_context_keyboard */
-
-const struct button_mapping* get_context_mapping(int context)
-{
-    switch (context&~CONTEXT_REMOTE)
-    {
-        case CONTEXT_STD:
-            return button_context_standard;
-        case CONTEXT_WPS:
-            return button_context_wps;
-        case CONTEXT_LIST:
-            return button_context_list;
-        case CONTEXT_MAINMENU:
-        case CONTEXT_TREE:
-            return button_context_listtree_scroll_without_combo;
-        case CONTEXT_CUSTOM|CONTEXT_TREE:
-            return button_context_tree;
-        case CONTEXT_SETTINGS:
-            return button_context_settings;
-        case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
-            return button_context_settings_right_is_inc;
-        case CONTEXT_SETTINGS_COLOURCHOOSER:
-            return button_context_colorchooser;
-        case CONTEXT_SETTINGS_EQ:
-            return button_context_eq;
-        case CONTEXT_SETTINGS_TIME:
-            return button_context_time;
-        case CONTEXT_YESNOSCREEN:
-            return button_context_yesno;
-        case CONTEXT_BOOKMARKSCREEN:
-            return button_context_bmark;
-        case CONTEXT_QUICKSCREEN:
-            return button_context_quickscreen;
-        case CONTEXT_PITCHSCREEN:
-            return button_context_pitchscreen;
-        case CONTEXT_KEYBOARD:
-        case CONTEXT_MORSE_INPUT:
-            return button_context_keyboard;
-    }
-    return button_context_standard;
-}

apps/keymaps/keymap-echor1.c

@@ -57,6 +57,7 @@ static const struct button_mapping button_context_wps[] = {
     {ACTION_WPS_SEEKBACK,       BUTTON_LEFT|BUTTON_REPEAT,          BUTTON_NONE},
     {ACTION_WPS_STOPSEEK,       BUTTON_LEFT|BUTTON_REL,             BUTTON_LEFT|BUTTON_REPEAT},
     {ACTION_WPS_QUICKSCREEN,    BUTTON_B,                           BUTTON_NONE},
+    {ACTION_WPS_MENU,           BUTTON_Y,                           BUTTON_NONE},
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
 

apps/keymaps/keymap-meizu-m6sl.c

@@ -1,299 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2006 Jonathan Gordon
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-/* Button Code Definitions for the toshiba gigabeat target */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "config.h"
-#include "action.h"
-#include "button.h"
-#include "settings.h"
-
-/*
- * The format of the list is as follows
- * { Action Code,   Button code,    Prereq button code }
- * if there's no need to check the previous button's value, use BUTTON_NONE
- * Insert LAST_ITEM_IN_LIST at the end of each mapping
- */
-
-/* CONTEXT_CUSTOM's used in this file...
-
-CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
-CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens
-                                  i.e where up/down is inc/dec
-               CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec
-
-*/
-
-
-static const struct button_mapping button_context_standard[]  = {
-    { ACTION_STD_PREV,          BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_STD_NEXT,          BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-
-    { ACTION_STD_CANCEL,        BUTTON_LEFT,                BUTTON_NONE },
-
-    { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT },
-
-    { ACTION_STD_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU },
-    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,     BUTTON_MENU },
-
-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_SELECT },
-    { ACTION_STD_OK,            BUTTON_RIGHT,               BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST
-}; /* button_context_standard */
-
-
-static const struct button_mapping button_context_wps[]  = {
-    { ACTION_WPS_PLAY,          BUTTON_PLAY|BUTTON_REL,           BUTTON_PLAY },
-    { ACTION_WPS_STOP,          BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_NONE },
-
-    { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
-    { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
-
-    { ACTION_WPS_SEEKBACK,      BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_WPS_STOPSEEK,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
-    { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
-
-    { ACTION_WPS_ABSETB_NEXTDIR,       BUTTON_PLAY|BUTTON_RIGHT,         BUTTON_NONE },
-    { ACTION_WPS_ABSETA_PREVDIR,       BUTTON_PLAY|BUTTON_LEFT,          BUTTON_NONE },
-    { ACTION_WPS_ABRESET,       BUTTON_PLAY|BUTTON_SELECT,        BUTTON_NONE },
-
-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_UP,                      BUTTON_NONE },
-
-    { ACTION_WPS_PITCHSCREEN,   BUTTON_PLAY|BUTTON_UP,          BUTTON_PLAY },
-    { ACTION_WPS_VIEW_PLAYLIST, BUTTON_PLAY|BUTTON_DOWN,        BUTTON_PLAY },
-
-    { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
-    { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
-    { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
-
-    { ACTION_WPS_HOTKEY,        BUTTON_PLAY|BUTTON_MENU,        BUTTON_NONE },
-    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
-
-    LAST_ITEM_IN_LIST
-}; /* button_context_wps */
-
-static const struct button_mapping button_context_list[]  = {
-    { ACTION_LISTTREE_PGUP,     BUTTON_PLAY|BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_LISTTREE_PGUP,     BUTTON_PLAY|BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_LISTTREE_PGDOWN,   BUTTON_PLAY|BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_LISTTREE_PGDOWN,   BUTTON_PLAY|BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-    
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_list */
-
-static const struct button_mapping button_context_tree[]  = {
-    { ACTION_TREE_WPS,    BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
-    { ACTION_TREE_STOP,   BUTTON_PLAY|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_TREE_HOTKEY, BUTTON_PLAY|BUTTON_MENU,        BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
-}; /* button_context_tree */
-
-static const struct button_mapping button_context_listtree_scroll_with_combo[]  = {
-    { ACTION_NONE,              BUTTON_PLAY,                              BUTTON_NONE },
-    { ACTION_TREE_PGLEFT,       BUTTON_PLAY|BUTTON_LEFT,                  BUTTON_NONE },
-    { ACTION_TREE_ROOT_INIT,    BUTTON_PLAY|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_PLAY|BUTTON_LEFT },
-    { ACTION_TREE_PGLEFT,       BUTTON_PLAY|BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_TREE_PGRIGHT,      BUTTON_PLAY|BUTTON_RIGHT,                 BUTTON_NONE },
-    { ACTION_TREE_PGRIGHT,      BUTTON_PLAY|BUTTON_RIGHT|BUTTON_REPEAT,   BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
-};
-
-static const struct button_mapping button_context_listtree_scroll_without_combo[]  = {
-    { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
-    { ACTION_TREE_ROOT_INIT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
-    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_NONE,              BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_STD_OK,            BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
-};
-
-static const struct button_mapping button_context_settings[]  = {
-    { ACTION_SETTINGS_INC,          BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_SETTINGS_DEC,          BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_STD_PREV,              BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_STD_NEXT,              BUTTON_RIGHT,                   BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_settings */
-
-static const struct button_mapping button_context_settings_right_is_inc[]  = {
-    { ACTION_SETTINGS_INC,          BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_SETTINGS_DEC,          BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_STD_PREV,              BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_STD_NEXT,              BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_settingsgraphical */
-
-static const struct button_mapping button_context_yesno[]  = {
-    { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,                  BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_settings_yesno */
-
-static const struct button_mapping button_context_colorchooser[]  = {
-    { ACTION_STD_OK,            BUTTON_PLAY|BUTTON_REL,   BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_colorchooser */
-
-static const struct button_mapping button_context_eq[]  = {
-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_eq */
-
-/** Bookmark Screen **/
-static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_PLAY, BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-}; /* button_context_bmark */
-
-static const struct button_mapping button_context_time[]  = {
-    { ACTION_STD_CANCEL,       BUTTON_LEFT,  BUTTON_NONE },
-    { ACTION_STD_OK,           BUTTON_PLAY,   BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
-}; /* button_context_time */
-
-static const struct button_mapping button_context_quickscreen[]  = {
-    { ACTION_QS_TOP,        BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_QS_TOP,        BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_QS_DOWN,       BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_QS_LEFT,       BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },
-    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_STD_CANCEL,    BUTTON_MENU,                    BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_quickscreen */
-
-static const struct button_mapping button_context_pitchscreen[]  = {
-    { ACTION_PS_INC_SMALL,      BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_PS_INC_BIG,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_PS_DEC_SMALL,      BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_PS_DEC_BIG,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_PS_NUDGE_LEFT,     BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,     BUTTON_NONE },
-    { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,    BUTTON_NONE },
-    { ACTION_PS_TOGGLE_MODE,    BUTTON_MENU,                BUTTON_NONE },
-    { ACTION_PS_RESET,          BUTTON_PLAY,               BUTTON_NONE },
-    { ACTION_PS_EXIT,           BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_PS_SLOWER,         BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_PS_FASTER,         BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_pitchcreen */
-
-static const struct button_mapping button_context_keyboard[]  = {
-    { ACTION_KBD_LEFT,         BUTTON_LEFT,                             BUTTON_NONE },
-    { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                            BUTTON_NONE },
-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,              BUTTON_NONE },
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_PLAY|BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_PLAY|BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY|BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_KBD_SELECT,       BUTTON_SELECT,                           BUTTON_NONE },
-    { ACTION_KBD_PAGE_FLIP,    BUTTON_PLAY|BUTTON_MENU,                BUTTON_NONE },
-    { ACTION_KBD_DONE,         BUTTON_PLAY|BUTTON_REL,                 BUTTON_PLAY },
-    { ACTION_KBD_ABORT,        BUTTON_PLAY|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_BACKSPACE,    BUTTON_MENU,                             BUTTON_NONE },
-    { ACTION_KBD_BACKSPACE,    BUTTON_MENU|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_UP,                               BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_UP|BUTTON_REPEAT,                 BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_DOWN,                             BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_DOWN|BUTTON_REPEAT,               BUTTON_NONE },
-//    { ACTION_KBD_MORSE_INPUT,  BUTTON_PLAY|BUTTON_POWER,                   BUTTON_NONE },
-    { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL,                BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST
-}; /* button_context_keyboard */
-
-
-const struct button_mapping* get_context_mapping(int context)
-{
-    switch (context)
-    {
-        case CONTEXT_STD:
-            return button_context_standard;
-        case CONTEXT_WPS:
-            return button_context_wps;
-
-        case CONTEXT_LIST:
-            return button_context_list;
-        case CONTEXT_MAINMENU:
-        case CONTEXT_TREE:
-            if (global_settings.hold_lr_for_scroll_in_list)
-                return button_context_listtree_scroll_without_combo;
-            else
-                return button_context_listtree_scroll_with_combo;
-        case CONTEXT_CUSTOM|CONTEXT_TREE:
-            return button_context_tree;
-
-        case CONTEXT_SETTINGS:
-            return button_context_settings;
-        case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
-            return button_context_settings_right_is_inc;
-
-        case CONTEXT_SETTINGS_COLOURCHOOSER:
-            return button_context_colorchooser;
-        case CONTEXT_SETTINGS_EQ:
-            return button_context_eq;
-
-        case CONTEXT_SETTINGS_TIME:
-            return button_context_time;
-
-        case CONTEXT_YESNOSCREEN:
-            return button_context_yesno;
-        case CONTEXT_BOOKMARKSCREEN:
-            return button_context_bmark;
-        case CONTEXT_QUICKSCREEN:
-            return button_context_quickscreen;
-        case CONTEXT_PITCHSCREEN:
-            return button_context_pitchscreen;
-        case CONTEXT_KEYBOARD:
-        case CONTEXT_MORSE_INPUT:
-            return button_context_keyboard;
-    }
-    return button_context_standard;
-}

apps/keymaps/keymap-meizu-m6sp.c

@@ -1,76 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2006 Jonathan Gordon
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-/* Button Code Definitions for the toshiba gigabeat target */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "config.h"
-#include "action.h"
-#include "button.h"
-#include "settings.h"
-
-/*
- * The format of the list is as follows
- * { Action Code,   Button code,    Prereq button code }
- * if there's no need to check the previous button's value, use BUTTON_NONE
- * Insert LAST_ITEM_IN_LIST at the end of each mapping
- */
-
-/* CONTEXT_CUSTOM's used in this file...
-
-CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
-CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens
-                                  i.e where up/down is inc/dec
-               CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec
-
-*/
-
-/* copied from Meizu M6SP keymap */
-static const struct button_mapping button_context_standard[]  = {
-#if 0 /* disabled for now, there is no BUTTON_UP/DOWN yet */
-    { ACTION_STD_PREV,          BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_STD_NEXT,          BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-#endif 
-    { ACTION_STD_CANCEL,        BUTTON_LEFT,                BUTTON_NONE },
-
-    { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT },
-
-    { ACTION_STD_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU },
-    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,     BUTTON_MENU },
-
-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_SELECT },
-    { ACTION_STD_OK,            BUTTON_RIGHT,               BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST
-}; /* button_context_standard */
-
-
-const struct button_mapping* get_context_mapping(int context)
-{
-    (void)context;
-
-    /* TODO add more button contexts */
-    return button_context_standard;
-}

apps/keymaps/keymap-mini2440.c

@@ -1,380 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2009 Bob Cousins
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-/* Button Code Definitions for the Mini2440 target
- * based on Toshiba Gigabeat F keymap 
- */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "config.h"
-#include "action.h"
-#include "button.h"
-#include "settings.h"
-
-/*
- * The format of the list is as follows
- * { Action Code,   Button code,    Prereq button code }
- * if there's no need to check the previous button's value, use BUTTON_NONE
- * Insert LAST_ITEM_IN_LIST at the end of each mapping
- */
-
-/* CONTEXT_CUSTOM's used in this file...
-
-CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
-CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens
-                                  i.e where up/down is inc/dec
-               CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec
-
-*/
-
-
-static const struct button_mapping button_context_standard[]  = {
-    { ACTION_STD_PREV,          BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_STD_NEXT,          BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-
-    { ACTION_STD_CANCEL,        BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_POWER,               BUTTON_NONE },
-
-    { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT },
-
-    { ACTION_STD_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU },
-    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,     BUTTON_MENU },
-
-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_SELECT },
-    { ACTION_STD_OK,            BUTTON_RIGHT,               BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST
-}; /* button_context_standard */
-
-
-static const struct button_mapping button_context_wps[]  = {
-    { ACTION_WPS_PLAY,          BUTTON_A|BUTTON_REL,            BUTTON_A },
-    { ACTION_WPS_STOP,          BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
-
-    { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
-    { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
-
-    { ACTION_WPS_SEEKBACK,      BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_WPS_STOPSEEK,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
-    { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
-
-    { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_A|BUTTON_RIGHT,          BUTTON_NONE },
-    { ACTION_WPS_ABSETA_PREVDIR,BUTTON_A|BUTTON_LEFT,           BUTTON_NONE },
-    { ACTION_WPS_ABRESET,       BUTTON_A|BUTTON_SELECT,         BUTTON_NONE },
-
-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,       BUTTON_VOL_DOWN,                BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,       BUTTON_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_VOL_UP,                  BUTTON_NONE },
-
-    { ACTION_WPS_PITCHSCREEN,   BUTTON_A|BUTTON_UP,             BUTTON_A },
-    { ACTION_WPS_VIEW_PLAYLIST, BUTTON_A|BUTTON_DOWN,           BUTTON_NONE },
-
-    { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
-    { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
-    { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
-
-    { ACTION_WPS_HOTKEY,        BUTTON_A|BUTTON_MENU,           BUTTON_NONE },
-    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
-
-    LAST_ITEM_IN_LIST
-}; /* button_context_wps */
-
-static const struct button_mapping button_context_list[]  = {
-    { ACTION_LISTTREE_PGUP,      BUTTON_A|BUTTON_UP,                 BUTTON_NONE },
-    { ACTION_LISTTREE_PGUP,      BUTTON_A|BUTTON_UP|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_LISTTREE_PGDOWN,    BUTTON_A|BUTTON_DOWN,               BUTTON_NONE },
-    { ACTION_LISTTREE_PGDOWN,    BUTTON_A|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
-#ifdef HAVE_VOLUME_IN_LIST
-    { ACTION_LIST_VOLUP,         BUTTON_VOL_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_LIST_VOLUP,         BUTTON_VOL_UP,                      BUTTON_NONE },
-    { ACTION_LIST_VOLDOWN,       BUTTON_VOL_DOWN,                    BUTTON_NONE },
-    { ACTION_LIST_VOLDOWN,       BUTTON_VOL_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-#endif
-    
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_list */
-
-static const struct button_mapping button_context_tree[]  = {
-    { ACTION_TREE_WPS,    BUTTON_A|BUTTON_REL,            BUTTON_A },
-    { ACTION_TREE_STOP,   BUTTON_POWER,                   BUTTON_NONE },
-    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
-    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_TREE_HOTKEY, BUTTON_A|BUTTON_MENU,           BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
-}; /* button_context_tree */
-
-static const struct button_mapping button_context_listtree_scroll_with_combo[]  = {
-    { ACTION_NONE,              BUTTON_A,                              BUTTON_NONE },
-    { ACTION_TREE_PGLEFT,       BUTTON_A|BUTTON_LEFT,                  BUTTON_NONE },
-    { ACTION_TREE_ROOT_INIT,    BUTTON_A|BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_A|BUTTON_LEFT },
-    { ACTION_TREE_PGLEFT,       BUTTON_A|BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_TREE_PGRIGHT,      BUTTON_A|BUTTON_RIGHT,                 BUTTON_NONE },
-    { ACTION_TREE_PGRIGHT,      BUTTON_A|BUTTON_RIGHT|BUTTON_REPEAT,   BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
-};
-
-static const struct button_mapping button_context_listtree_scroll_without_combo[]  = {
-    { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
-    { ACTION_TREE_ROOT_INIT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
-    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_NONE,              BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_STD_OK,            BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
-};
-
-static const struct button_mapping button_context_settings[]  = {
-    { ACTION_SETTINGS_INC,          BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_SETTINGS_DEC,          BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_STD_PREV,              BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_STD_NEXT,              BUTTON_RIGHT,                   BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_settings */
-
-static const struct button_mapping button_context_settings_right_is_inc[]  = {
-    { ACTION_SETTINGS_INC,          BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_SETTINGS_DEC,          BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_STD_PREV,              BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_STD_NEXT,              BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_settingsgraphical */
-
-static const struct button_mapping button_context_yesno[]  = {
-    { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,              BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_settings_yesno */
-
-static const struct button_mapping button_context_colorchooser[]  = {
-    { ACTION_STD_OK,                BUTTON_A|BUTTON_REL,        BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_colorchooser */
-
-static const struct button_mapping button_context_eq[]  = {
-    { ACTION_STD_OK,                BUTTON_SELECT|BUTTON_REL,   BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_eq */
-
-/** Bookmark Screen **/
-static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,        BUTTON_A,       BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-}; /* button_context_bmark */
-
-static const struct button_mapping button_context_time[]  = {
-    { ACTION_STD_CANCEL,        BUTTON_POWER,   BUTTON_NONE },
-    { ACTION_STD_OK,            BUTTON_A,       BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
-}; /* button_context_time */
-
-static const struct button_mapping button_context_quickscreen[]  = {
-    { ACTION_QS_TOP,        BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_QS_TOP,        BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_QS_DOWN,       BUTTON_DOWN,                    BUTTON_NONE },
-    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_QS_LEFT,       BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },
-    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_STD_CANCEL,    BUTTON_MENU,                    BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_quickscreen */
-
-static const struct button_mapping button_context_pitchscreen[]  = {
-    { ACTION_PS_INC_SMALL,      BUTTON_UP,                  BUTTON_NONE },
-    { ACTION_PS_INC_BIG,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_PS_DEC_SMALL,      BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_PS_DEC_BIG,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_PS_NUDGE_LEFT,     BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,     BUTTON_NONE },
-    { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,    BUTTON_NONE },
-    { ACTION_PS_TOGGLE_MODE,    BUTTON_MENU,                BUTTON_NONE },
-    { ACTION_PS_RESET,          BUTTON_A,                   BUTTON_NONE },
-    { ACTION_PS_EXIT,           BUTTON_POWER,               BUTTON_NONE },
-    { ACTION_PS_SLOWER,         BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_PS_FASTER,         BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_pitchcreen */
-
-static const struct button_mapping button_context_keyboard[]  = {
-    { ACTION_KBD_LEFT,         BUTTON_LEFT,                             BUTTON_NONE },
-    { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                            BUTTON_NONE },
-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,              BUTTON_NONE },
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_A|BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_A|BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_A|BUTTON_RIGHT,                   BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_A|BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_KBD_SELECT,       BUTTON_SELECT,                           BUTTON_NONE },
-    { ACTION_KBD_PAGE_FLIP,    BUTTON_A|BUTTON_MENU,                    BUTTON_NONE },
-    { ACTION_KBD_DONE,         BUTTON_A|BUTTON_REL,                     BUTTON_A },
-    { ACTION_KBD_ABORT,        BUTTON_POWER|BUTTON_REL,                 BUTTON_POWER },
-    { ACTION_KBD_BACKSPACE,    BUTTON_MENU,                             BUTTON_NONE },
-    { ACTION_KBD_BACKSPACE,    BUTTON_MENU|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_UP,                               BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_UP|BUTTON_REPEAT,                 BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_DOWN,                             BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_DOWN|BUTTON_REPEAT,               BUTTON_NONE },
-    { ACTION_KBD_MORSE_INPUT,  BUTTON_A|BUTTON_POWER,                   BUTTON_NONE },
-    { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL,                BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST
-}; /* button_context_keyboard */
-
-#ifdef HAVE_MINI2440_REMOTE
-/*****************************************************************************
- *    Remote control mappings
- *****************************************************************************/
-
-static const struct button_mapping remote_button_context_standard[]  = {
-    { ACTION_STD_PREV,        BUTTON_RC_VOL_UP,                 BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,  BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_STD_NEXT,        BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,  BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_STD_CANCEL,      BUTTON_RC_REW,                    BUTTON_NONE },
-    { ACTION_STD_OK,          BUTTON_RC_FF|BUTTON_REL,          BUTTON_RC_FF },
-    { ACTION_STD_CONTEXT,     BUTTON_RC_FF|BUTTON_REPEAT,       BUTTON_RC_FF },
-    { ACTION_STD_MENU,        BUTTON_RC_DSP,                    BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST
-};
-
-static const struct button_mapping remote_button_context_wps[]  = {
-    { ACTION_WPS_PLAY,      BUTTON_RC_PLAY,                    BUTTON_NONE },
-
-    { ACTION_WPS_SKIPNEXT,  BUTTON_RC_FF|BUTTON_REL,           BUTTON_RC_FF },
-    { ACTION_WPS_SKIPPREV,  BUTTON_RC_REW|BUTTON_REL,          BUTTON_RC_REW },
-
-    { ACTION_WPS_SEEKBACK,  BUTTON_RC_REW|BUTTON_REPEAT,       BUTTON_NONE },
-    { ACTION_WPS_SEEKFWD,   BUTTON_RC_FF|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_WPS_STOPSEEK,  BUTTON_RC_REW|BUTTON_REL,          BUTTON_RC_REW|BUTTON_REPEAT },
-    { ACTION_WPS_STOPSEEK,  BUTTON_RC_FF|BUTTON_REL,           BUTTON_RC_FF|BUTTON_REPEAT },
-
-    { ACTION_WPS_STOP,      BUTTON_RC_PLAY|BUTTON_REPEAT,      BUTTON_RC_PLAY },
-    { ACTION_WPS_MENU,      BUTTON_RC_DSP,                     BUTTON_NONE },
-
-    { ACTION_WPS_VOLDOWN,   BUTTON_RC_VOL_DOWN,                BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,   BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_WPS_VOLUP,     BUTTON_RC_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_WPS_VOLUP,     BUTTON_RC_VOL_UP,                  BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-};
-
-static const struct button_mapping remote_button_context_tree[]  = {
-    { ACTION_TREE_WPS,    BUTTON_RC_PLAY|BUTTON_REL,           BUTTON_RC_PLAY },
-    { ACTION_TREE_STOP,   BUTTON_RC_PLAY|BUTTON_REPEAT,        BUTTON_RC_PLAY },
-    { ACTION_STD_CANCEL,  BUTTON_RC_REW|BUTTON_REPEAT,         BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-};
-
-static const struct button_mapping* get_context_mapping_remote( int context )
-{
-    context ^= CONTEXT_REMOTE;
-
-    switch (context)
-    {
-        case CONTEXT_WPS:
-            return remote_button_context_wps;
-        case CONTEXT_MAINMENU:
-        case CONTEXT_TREE:
-            return remote_button_context_tree;
-    }
-    return remote_button_context_standard;
-}
-#endif
-
-const struct button_mapping* target_get_context_mapping(int context)
-{
-#ifdef HAVE_MINI2440_REMOTE
-    if (context&CONTEXT_REMOTE)
-        return get_context_mapping_remote(context);
-#endif
-    switch (context)
-    {
-        case CONTEXT_STD:
-            return button_context_standard;
-        case CONTEXT_WPS:
-            return button_context_wps;
-
-        case CONTEXT_LIST:
-            return button_context_list;
-        case CONTEXT_MAINMENU:
-        case CONTEXT_TREE:
-            if (global_settings.hold_lr_for_scroll_in_list)
-                return button_context_listtree_scroll_without_combo;
-            else
-                return button_context_listtree_scroll_with_combo;
-        case CONTEXT_CUSTOM|CONTEXT_TREE:
-            return button_context_tree;
-
-        case CONTEXT_SETTINGS:
-            return button_context_settings;
-        case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
-            return button_context_settings_right_is_inc;
-
-        case CONTEXT_SETTINGS_COLOURCHOOSER:
-            return button_context_colorchooser;
-        case CONTEXT_SETTINGS_EQ:
-            return button_context_eq;
-
-        case CONTEXT_SETTINGS_TIME:
-            return button_context_time;
-
-        case CONTEXT_YESNOSCREEN:
-            return button_context_yesno;
-        case CONTEXT_BOOKMARKSCREEN:
-            return button_context_bmark;
-        case CONTEXT_QUICKSCREEN:
-            return button_context_quickscreen;
-        case CONTEXT_PITCHSCREEN:
-            return button_context_pitchscreen;
-        case CONTEXT_KEYBOARD:
-            return button_context_keyboard;
-    }
-    return button_context_standard;
-}

apps/lang/basque.lang

@@ -10142,15 +10142,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Baxuen Mozketa"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Baxuen Mozketa"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Baxuen Mozketa"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Baxuen Mozketa"
   </voice>
 </phrase>
 <phrase>
@@ -10159,15 +10159,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Altuen Mozketa"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Altuen Mozketa"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Altuen Mozketa"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Altuen Mozketa"
   </voice>
 </phrase>
 <phrase>

apps/lang/bulgarian.lang

@@ -9105,15 +9105,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отрязване на баса"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отрязване на баса"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отрязване на баса"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отрязване на баса"
   </voice>
 </phrase>
 <phrase>
@@ -9122,15 +9122,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отрязване на високите"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отрязване на високите"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отрязване на високите"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отрязване на високите"
   </voice>
 </phrase>
 <phrase>

apps/lang/catala.lang

@@ -10136,15 +10136,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Freq. de tall de baixos"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Freq. de tall de baixos"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frequència de tall de baix"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frequència de tall de baix"
   </voice>
 </phrase>
 <phrase>
@@ -10153,15 +10153,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Freq. de tall d'aguts"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Freq. de tall d'aguts"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frequència de tall d'aguts"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frequència de tall d'aguts"
   </voice>
 </phrase>
 <phrase>

apps/lang/chinese-simp.lang

@@ -8889,15 +8889,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低频截止频率"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低频截止频率"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低频截止频率"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低频截止频率"
   </voice>
 </phrase>
 <phrase>
@@ -9095,15 +9095,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高频截止频率"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高频截止频率"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高频截止频率"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高频截止频率"
   </voice>
 </phrase>
 <phrase>

apps/lang/chinese-trad.lang

@@ -9160,15 +9160,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低音截斷"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低音截斷"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低音截斷"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低音截斷"
   </voice>
 </phrase>
 <phrase>
@@ -9366,15 +9366,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高音截斷"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高音截斷"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高音截斷"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高音截斷"
   </voice>
 </phrase>
 <phrase>

apps/lang/czech.lang

@@ -10159,15 +10159,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Oříznutí basů"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Oříznutí basů"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Oříznutí basů"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Oříznutí basů"
   </voice>
 </phrase>
 <phrase>
@@ -10176,15 +10176,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Oříznutí výšek"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Oříznutí výšek"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Oříznutí výšek"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Oříznutí výšek"
   </voice>
 </phrase>
 <phrase>

apps/lang/dansk.lang

@@ -9936,15 +9936,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basgrænse"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basgrænse"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basgrænse"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basgrænse"
   </voice>
 </phrase>
 <phrase>
@@ -10142,15 +10142,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgrænse"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgrænse"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgrænse"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgrænse"
   </voice>
 </phrase>
 <phrase>

apps/lang/deutsch.lang

@@ -9092,15 +9092,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tiefengrenzfrequenz"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tiefengrenzfrequenz"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tiefengrenzfrequenz"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tiefengrenzfrequenz"
   </voice>
 </phrase>
 <phrase>
@@ -9109,15 +9109,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Höhengrenzfrequenz"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Höhengrenzfrequenz"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Höhengrenzfrequenz"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Höhengrenzfrequenz"
   </voice>
 </phrase>
 <phrase>

apps/lang/english-us.lang

@@ -9113,15 +9113,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -9130,15 +9130,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </voice>
 </phrase>
 <phrase>

apps/lang/english.lang

@@ -9284,15 +9284,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -9301,15 +9301,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -14919,7 +14919,7 @@
   user: core
   <source>
     *: "Press LEFT to cancel."
-    android,hifietma*,zenvision: "Press BACK to cancel."
+    android,hifietma*: "Press BACK to cancel."
     cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
     ihifi760,ihifi960: "Double tap RETURN to cancel."
     ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
@@ -14934,7 +14934,7 @@
   </source>
   <dest>
     *: "Press LEFT to cancel."
-    android,hifietma*,zenvision: "Press BACK to cancel."
+    android,hifietma*: "Press BACK to cancel."
     cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
     ihifi760,ihifi960: "Double tap RETURN to cancel."
     ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
@@ -14949,7 +14949,7 @@
   </dest>
   <voice>
     *: "Press LEFT to cancel."
-    android,hifietma*,zenvision: "Press BACK to cancel."
+    android,hifietma*: "Press BACK to cancel."
     cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
     ihifi760,ihifi960: "Double tap RETURN to cancel."
     ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."

apps/lang/espanol.lang

@@ -7392,15 +7392,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frecuencia de corte de bajos"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frecuencia de corte de bajos"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frecuencia de corte de bajos"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frecuencia de corte de bajos"
   </voice>
 </phrase>
 <phrase>
@@ -8934,15 +8934,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frec. de corte de agudos"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frec. de corte de agudos"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frecuencia de corte de agudos"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frecuencia de corte de agudos"
   </voice>
 </phrase>
 <phrase>

apps/lang/finnish.lang

@@ -10127,15 +10127,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basson katkaisu"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basson katkaisu"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basson katkaisu"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basson katkaisu"
   </voice>
 </phrase>
 <phrase>
@@ -10144,15 +10144,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantin katkaisu"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantin katkaisu"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantin katkaisu"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantin katkaisu"
   </voice>
 </phrase>
 <phrase>

apps/lang/francais.lang

@@ -9201,15 +9201,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Fréquence de coupure pour basses"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Fréquence de coupure pour basses"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Fréquence de coupure pour les basses"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Fréquence de coupure pour les basses"
   </voice>
 </phrase>
 <phrase>
@@ -9218,15 +9218,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Fréquence de coupure pour aigus"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Fréquence de coupure pour aigus"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Fréquence de coupure pour les aigus"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Fréquence de coupure pour les aigus"
   </voice>
 </phrase>
 <phrase>

apps/lang/galego.lang

@@ -5985,15 +5985,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de baixos"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de baixos"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de baixos"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de baixos"
   </voice>
 </phrase>
 <phrase>
@@ -11323,15 +11323,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de agudos"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de agudos"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de agudos"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de agudos"
   </voice>
 </phrase>
 <phrase>

apps/lang/greek.lang

@@ -10054,15 +10054,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Αποκοπή μπάσων"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Αποκοπή μπάσων"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Αποκοπή μπάσων"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Αποκοπή μπάσων"
   </voice>
 </phrase>
 <phrase>
@@ -10071,15 +10071,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Αποκοπή πρίμων"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Αποκοπή πρίμων"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Αποκοπή πρίμων"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Αποκοπή πρίμων"
   </voice>
 </phrase>
 <phrase>

apps/lang/hebrew.lang

@@ -10175,15 +10175,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "חיתוך בס"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "חיתוך בס"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "חיתוך בס"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "חיתוך בס"
   </voice>
 </phrase>
 <phrase>
@@ -10192,15 +10192,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "חיתוך טרבל"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "חיתוך טרבל"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "חיתוך טרבל"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "חיתוך טרבל"
   </voice>
 </phrase>
 <phrase>

apps/lang/hrvatski.lang

@@ -10139,15 +10139,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Odsijecanje basa"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Odsijecanje basa"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Odsijecanje basa"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Odsijecanje basa"
   </voice>
 </phrase>
 <phrase>
@@ -10156,15 +10156,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Odsijecanje treblea"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Odsijecanje treblea"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Odsijecanje treblea"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Odsijecanje treblea"
   </voice>
 </phrase>
 <phrase>

apps/lang/italiano.lang

@@ -9089,15 +9089,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Taglio Bassi"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Taglio Bassi"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Taglio Bassi"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Taglio Bassi"
   </voice>
 </phrase>
 <phrase>
@@ -9106,15 +9106,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Taglio Alti"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Taglio Alti"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Taglio Alti"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Taglio Alti"
   </voice>
 </phrase>
 <phrase>

apps/lang/japanese.lang

@@ -9176,15 +9176,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低音域カットオフ"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低音域カットオフ"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低音域カットオフ"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低音域カットオフ"
   </voice>
 </phrase>
 <phrase>
@@ -9193,15 +9193,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高音域カットオフ"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高音域カットオフ"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高音域カットオフ"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高音域カットオフ"
   </voice>
 </phrase>
 <phrase>

apps/lang/korean.lang

@@ -9131,15 +9131,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "저음 컷오프"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "저음 컷오프"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "저음 컷오프"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "저음 컷오프"
   </voice>
 </phrase>
 <phrase>
@@ -9148,15 +9148,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "고음 컷오프"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "고음 컷오프"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "고음 컷오프"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "고음 컷오프"
   </voice>
 </phrase>
 <phrase>

apps/lang/latviesu.lang

@@ -9102,15 +9102,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basu robežfrekvence"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basu robežfrekvence"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basu robežfrekvence"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basu robežfrekvence"
   </voice>
 </phrase>
 <phrase>
@@ -9119,15 +9119,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Augšu robežfrekvence"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Augšu robežfrekvence"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Augšu robežfrekvence"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Augšu robežfrekvence"
   </voice>
 </phrase>
 <phrase>
@@ -16945,3 +16945,17 @@
     general_purpose_led: "Izmantot LED indikatorus"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_ANNOUNCE_STATUS
+  desc: announnnce_status plugin
+  user: core
+  <source>
+    *: "Announce Status"
+  </source>
+  <dest>
+    *: "Paziņot statusu"
+  </dest>
+  <voice>
+    *: "Paziņot statusu"
+  </voice>
+</phrase>

apps/lang/lietuviu.lang

@@ -10217,15 +10217,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bosų nukirpimas"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bosų nukirpimas"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bosų nukirpimas"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bosų nukirpimas"
   </voice>
 </phrase>
 <phrase>
@@ -10234,15 +10234,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Aukštų daž. Nukirpimas"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Aukštų daž. Nukirpimas"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Aukštų daž. Nukirpimas"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Aukštų daž. Nukirpimas"
   </voice>
 </phrase>
 <phrase>

apps/lang/magyar.lang

@@ -8922,15 +8922,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Alsó határfrekvencia"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Alsó határfrekvencia"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Alsó határfrekvencia"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Alsó határfrekvencia"
   </voice>
 </phrase>
 <phrase>
@@ -9599,15 +9599,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Magas határfrekvencia"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Magas határfrekvencia"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Magas határfrekvencia"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Magas határfrekvencia"
   </voice>
 </phrase>
 <phrase>
@@ -14784,7 +14784,7 @@
   user: core
   <source>
     *: "Press LEFT to cancel."
-    android,hifietma*,zenvision: "Press BACK to cancel."
+    android,hifietma*: "Press BACK to cancel."
     cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
     ihifi760,ihifi960: "Double tap RETURN to cancel."
     ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
@@ -14799,7 +14799,7 @@
   </source>
   <dest>
     *: "Nyomja meg a LEFT gombot a megszakításhoz."
-    android,hifietma*,zenvision: "Nyomja meg a BACK gombot a megszakításhoz."
+    android,hifietma*: "Nyomja meg a BACK gombot a megszakításhoz."
     cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Nyomja meg a POWER gombot a megszakításhoz."
     ihifi760,ihifi960: "Duplán koppintson a RETURN-re megszakításhoz."
     ihifi770,ihifi770c,ihifi800: "Nyomja meg a HOME gombot a megszakításhoz."
@@ -14814,7 +14814,7 @@
   </dest>
   <voice>
     *: "Nyomja meg a LEFT gombot a megszakításhoz."
-    android,hifietma*,zenvision: "Nyomja meg a BACK gombot a megszakításhoz."
+    android,hifietma*: "Nyomja meg a BACK gombot a megszakításhoz."
     cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Nyomja meg a POWER gombot a megszakításhoz."
     ihifi760,ihifi960: "Duplán koppintson a RETURN-re megszakításhoz."
     ihifi770,ihifi770c,ihifi800: "Nyomja meg a HOME gombot a megszakításhoz."
@@ -16948,3 +16948,17 @@
     general_purpose_led: "LED jelzőfények használata"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_ANNOUNCE_STATUS
+  desc: announnnce_status plugin
+  user: core
+  <source>
+    *: "Announce Status"
+  </source>
+  <dest>
+    *: "Állapot bejelentése"
+  </dest>
+  <voice>
+    *: "Állapot bejelentése"
+  </voice>
+</phrase>

apps/lang/moldoveneste.lang

@@ -2232,15 +2232,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Retezare basuri"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Retezare basuri"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Retezare basuri"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Retezare basuri"
   </voice>
 </phrase>
 <phrase>
@@ -8280,15 +8280,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tăiere inalte"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tăiere inalte"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tăiere inalte"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tăiere inalte"
   </voice>
 </phrase>
 <phrase>

apps/lang/nederlands.lang

@@ -9078,15 +9078,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas-afsnijfrequentie"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas-afsnijfrequentie"
   </voice>
 </phrase>
 <phrase>
@@ -9095,15 +9095,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble-afsnijfrequentie"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble-afsnijfrequentie"
   </voice>
 </phrase>
 <phrase>

apps/lang/norsk-nynorsk.lang

@@ -9877,15 +9877,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bassgrense"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bassgrense"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bassgrense"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bassgrense"
   </voice>
 </phrase>
 <phrase>
@@ -10083,15 +10083,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgrense"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgrense"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgrense"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgrense"
   </voice>
 </phrase>
 <phrase>

apps/lang/norsk.lang

@@ -8846,15 +8846,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass-knekkfrekvens"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass-knekkfrekvens"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass-knekkfrekvens"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass-knekkfrekvens"
   </voice>
 </phrase>
 <phrase>
@@ -9901,15 +9901,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantknekkfrekvens"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantknekkfrekvens"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantknekkfrekvens"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantknekkfrekvens"
   </voice>
 </phrase>
 <phrase>

apps/lang/polski.lang

@@ -9095,15 +9095,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Ścięcie basów"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Ścięcie basów"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Ścięcie basów"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Ścięcie basów"
   </voice>
 </phrase>
 <phrase>
@@ -9112,15 +9112,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Ścięcie tonów niskich"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Ścięcie tonów niskich"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Ścięcie tonów niskich"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Ścięcie tonów niskich"
   </voice>
 </phrase>
 <phrase>

apps/lang/portugues-brasileiro.lang

@@ -9171,15 +9171,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Graves"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Graves"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Graves"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Graves"
   </voice>
 </phrase>
 <phrase>
@@ -9188,15 +9188,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Agudos"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Agudos"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Agudos"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Agudos"
   </voice>
 </phrase>
 <phrase>

apps/lang/portugues.lang

@@ -10140,15 +10140,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Graves"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Graves"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Graves"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Graves"
   </voice>
 </phrase>
 <phrase>
@@ -10515,15 +10515,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Agudos"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Agudos"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte dos Agudos"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte dos Agudos"
   </voice>
 </phrase>
 <phrase>

apps/lang/romaneste.lang

@@ -2232,15 +2232,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Retezare basuri"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Retezare basuri"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Retezare basuri"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Retezare basuri"
   </voice>
 </phrase>
 <phrase>
@@ -8280,15 +8280,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tăiere inalte"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tăiere inalte"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tăiere inalte"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tăiere inalte"
   </voice>
 </phrase>
 <phrase>

apps/lang/russian.lang

@@ -6289,15 +6289,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отсечение баса"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отсечение баса"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отсечение баса"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отсечение баса"
   </voice>
 </phrase>
 <phrase>
@@ -8856,15 +8856,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Подавление высоких частот"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Подавление высоких частот"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Подавление высоких частот"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Подавление высоких частот"
   </voice>
 </phrase>
 <phrase>

apps/lang/slovak.lang

@@ -9087,15 +9087,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Hranica hĺbok"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Hranica hĺbok"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Hranica hĺbok"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Hranica hĺbok"
   </voice>
 </phrase>
 <phrase>
@@ -9104,15 +9104,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Hranica výšok"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Hranica výšok"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Hranica výšok"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Hranica výšok"
   </voice>
 </phrase>
 <phrase>

apps/lang/slovenscina.lang

@@ -2988,15 +2988,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -10628,15 +10628,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </voice>
 </phrase>
 <phrase>

apps/lang/srpski.lang

@@ -9213,15 +9213,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Гранична фрекв. за ниске"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Гранична фрекв. за ниске"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Гранична фреквенција за ниске"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Гранична фреквенција за ниске"
   </voice>
 </phrase>
 <phrase>
@@ -9230,15 +9230,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Гранична фрекв. за високе"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Гранична фрекв. за високе"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Гранична фреквенција за високе"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Гранична фреквенција за високе"
   </voice>
 </phrase>
 <phrase>

apps/lang/svenska.lang

@@ -9110,15 +9110,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basgräns"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basgräns"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basgräns"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basgräns"
   </voice>
 </phrase>
 <phrase>
@@ -9127,15 +9127,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgräns"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgräns"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgräns"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgräns"
   </voice>
 </phrase>
 <phrase>

apps/lang/tagalog.lang

@@ -6019,15 +6019,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass araw ng katapusan"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass araw ng katapusan"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass araw ng katapusan"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass araw ng katapusan"
   </voice>
 </phrase>
 <phrase>
@@ -9590,15 +9590,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Pagtatluhin araw ng katapusan"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Pagtatluhin araw ng katapusan"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Pagtatluhin araw ng katapusan"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Pagtatluhin araw ng katapusan"
   </voice>
 </phrase>
 <phrase>

apps/lang/thai.lang

@@ -9918,15 +9918,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "ความถี่ตัดเสียงทุ้ม"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "ความถี่ตัดเสียงทุ้ม"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -10152,15 +10152,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "ความถี่ตัดเสียงแหลม"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "ความถี่ตัดเสียงแหลม"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </voice>
 </phrase>
 <phrase>

apps/lang/turkce.lang

@@ -5446,15 +5446,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tiz Kesme"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tiz Kesme"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tiz Kesme"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tiz Kesme"
   </voice>
 </phrase>
 <phrase>
@@ -9553,15 +9553,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas Kesme"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas Kesme"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas Kesme"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas Kesme"
   </voice>
 </phrase>
 <phrase>

apps/lang/ukrainian.lang

@@ -9102,15 +9102,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Вiдсiкання Басу"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Вiдсiкання Басу"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Вiдсiкання Басу"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Вiдсiкання Басу"
   </voice>
 </phrase>
 <phrase>
@@ -9119,15 +9119,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Вiдсiкання Високих Частот"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Вiдсiкання Високих Частот"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Вiдсiкання Високих Частот"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Вiдсiкання Високих Частот"
   </voice>
 </phrase>
 <phrase>

apps/lang/vietnamese.lang

@@ -9140,15 +9140,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Khoảng cắt âm trầm"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Khoảng cắt âm trầm"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Khoảng cắt âm trầm"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Khoảng cắt âm trầm"
   </voice>
 </phrase>
 <phrase>
@@ -9157,15 +9157,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Khoảng cắt âm cao"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Khoảng cắt âm cao"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Khoảng cắt âm cao"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Khoảng cắt âm cao"
   </voice>
 </phrase>
 <phrase>

apps/lang/vlaams.lang

@@ -10103,15 +10103,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas-afsnijfrequentie"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas-afsnijfrequentie"
   </voice>
 </phrase>
 <phrase>
@@ -10120,15 +10120,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble-afsnijfrequentie"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble-afsnijfrequentie"
   </voice>
 </phrase>
 <phrase>

apps/lang/walon.lang

@@ -10158,15 +10158,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frécwince di côpaedje des basses"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frécwince di côpaedje des basses"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frécwince di côpaedje des basses"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frécwince di côpaedje des basses"
   </voice>
 </phrase>
 <phrase>
@@ -10175,15 +10175,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frécwince di côpaedje des hôts sons"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frécwince di côpaedje des hôts sons"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frécwince di côpaedje des hôts sons"
+    gigabeatfx,ipod6g,ipodnano3g,ipodnano4g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frécwince di côpaedje des hôts sons"
   </voice>
 </phrase>
 <phrase>

apps/main.c

@@ -153,7 +153,10 @@
 #endif
 #endif /* SDL */
 
-/*#define AUTOROCK*/ /* define this to check for "autostart.rock" on boot */
+// #define AUTOROCK /* define this to check for "autostart.rock" on boot */
+/* Alternatively, you can define autostart plugin path and its argument: */
+// #define AUTOROCK     VIEWERS_DATA_DIR"/imageviewer.rock"
+// #define AUTOROCK_ARG "/jpegs/sample.jpg"
 
 static void init(void);
 /* main(), and various functions called by main() and init() may be
@@ -214,17 +217,25 @@ int main(void)
 
 #ifdef AUTOROCK
     {
-        char filename[MAX_PATH];
+        const char *file = ""AUTOROCK;
-        const char *file =
+        file = *file
+                ? file
+                :
 #ifdef APPLICATION
                                 ROCKBOX_DIR
 #else
                                 PLUGIN_APPS_DIR
 #endif
                                     "/autostart.rock";
-        if(file_exists(file)) /* no complaint if it doesn't exist */
+        if (file_exists(file)) /* no complaint if it doesn't exist */
         {
-            plugin_load(file, NULL); /* start if it does */
+            plugin_load(file,
+#ifdef AUTOROCK_ARG
+                AUTOROCK_ARG
+#else
+                NULL
+#endif
+                ); /* start if it does */
         }
     }
 #endif /* #ifdef AUTOROCK */

apps/misc.c

@@ -904,7 +904,7 @@ static void update_norm_tab(void)
     norm_tab[0] = min;
     norm_tab_size = 1;
 
-    for (int i = 0; i < lim; ++i)
+    for (int i = 1; i < lim - 1; ++i)
     {
         int vol = from_normalized_volume(i, min, max, lim);
         int rem = vol % step;
@@ -1944,49 +1944,40 @@ int core_load_bmp(const char * filename, struct bitmap *bm, const int bmformat,
 
 #define NVOL_FRACBITS 16
 #define NVOL_UNITY    (1L << NVOL_FRACBITS)
-#define NVOL_FACTOR   (600L << NVOL_FRACBITS)
-
-#define NVOL_MAX_LINEAR_DB_SCALE (240L << NVOL_FRACBITS)
 
 #define nvol_div(x,y) fp_div((x), (y), NVOL_FRACBITS)
 #define nvol_mul(x,y) fp_mul((x), (y), NVOL_FRACBITS)
 #define nvol_exp10(x) fp_exp10((x), NVOL_FRACBITS)
 #define nvol_log10(x) fp_log10((x), NVOL_FRACBITS)
 
-static bool use_linear_dB_scale(long min_vol, long max_vol)
+static long get_nvol_factor(void)
 {
-    /*
+    long factor = 600L << NVOL_FRACBITS;
-     * Alsamixer uses a linear scale for small ranges.
+    long numdecimals = sound_numdecimals(SOUND_VOLUME);
-     * Commented out so perceptual volume works as advertised on all targets.
-     */
-    /*
-    return max_vol - min_vol <= NVOL_MAX_LINEAR_DB_SCALE;
-    */
 
-    (void)min_vol;
+    if (numdecimals == 0)
-    (void)max_vol;
+        factor /= 10;
-    return false;
+
+    /* nothing *actually* needs this, but: */
+    while (numdecimals-- > 1)
+        factor *= 10;
+
+    return factor;
 }
 
 long to_normalized_volume(long vol, long min_vol, long max_vol, long max_norm)
 {
     long norm, min_norm;
+    long factor = get_nvol_factor();
 
     vol <<= NVOL_FRACBITS;
     min_vol <<= NVOL_FRACBITS;
     max_vol <<= NVOL_FRACBITS;
     max_norm <<= NVOL_FRACBITS;
 
-    if (use_linear_dB_scale(min_vol, max_vol))
+    min_norm = nvol_exp10(nvol_div(min_vol - max_vol, factor));
-    {
+    norm = nvol_exp10(nvol_div(vol - max_vol, factor));
-        norm = nvol_div(vol - min_vol, max_vol - min_vol);
+    norm = nvol_div(norm - min_norm, NVOL_UNITY - min_norm);
-    }
-    else
-    {
-        min_norm = nvol_exp10(nvol_div(min_vol - max_vol, NVOL_FACTOR));
-        norm = nvol_exp10(nvol_div(vol - max_vol, NVOL_FACTOR));
-        norm = nvol_div(norm - min_norm, NVOL_UNITY - min_norm);
-    }
 
     return nvol_mul(norm, max_norm) >> NVOL_FRACBITS;
 }
@@ -1994,6 +1985,7 @@ long to_normalized_volume(long vol, long min_vol, long max_vol, long max_norm)
 long from_normalized_volume(long norm, long min_vol, long max_vol, long max_norm)
 {
     long vol, min_norm;
+    long factor = get_nvol_factor();
 
     norm <<= NVOL_FRACBITS;
     min_vol <<= NVOL_FRACBITS;
@@ -2002,16 +1994,9 @@ long from_normalized_volume(long norm, long min_vol, long max_vol, long max_norm
 
     vol = nvol_div(norm, max_norm);
 
-    if (use_linear_dB_scale(min_vol, max_vol))
+    min_norm = nvol_exp10(nvol_div(min_vol - max_vol, factor));
-    {
+    vol = nvol_mul(vol, NVOL_UNITY - min_norm) + min_norm;
-        vol = nvol_mul(vol, max_vol - min_vol) + min_vol;
+    vol = nvol_mul(nvol_log10(vol), factor) + max_vol;
-    }
-    else
-    {
-        min_norm = nvol_exp10(nvol_div(min_vol - max_vol, NVOL_FACTOR));
-        vol = nvol_mul(vol, NVOL_UNITY - min_norm) + min_norm;
-        vol = nvol_mul(nvol_log10(vol), NVOL_FACTOR) + max_vol;
-    }
 
     return vol >> NVOL_FRACBITS;
 }

apps/pcmbuf.c

@@ -799,8 +799,10 @@ static void pcmbuf_pcm_callback(const void **start, size_t *size)
 
     if (desc)
     {
+        bool track_change = index == chunk_transidx;
+
         /* If last chunk in the track, notify of track change */
-        if (index == chunk_transidx)
+        if (track_change)
         {
             chunk_transidx = INVALID_BUF_INDEX;
             audio_pcmbuf_track_change(true);
@@ -808,6 +810,13 @@ static void pcmbuf_pcm_callback(const void **start, size_t *size)
 
         /* Free it for reuse */
         chunk_ridx = index = index_next(index);
+
+        if (track_change && !audio_pcmbuf_may_play())
+        {
+            current_desc = NULL;
+            *size = 0;
+            return;
+        }
     }
 
     /*- Process the new one -*/

apps/playback.c

@@ -325,6 +325,7 @@ static unsigned int track_event_flags = TEF_NONE; /* (A, O-) */
 static int skip_offset = 0; /* (A, O) */
 
 static bool track_skip_is_manual = false;
+static bool pause_on_track_change = false;
 
 /* Track change notification */
 static struct
@@ -1502,7 +1503,7 @@ static bool halt_decoding_track(bool stop)
 
     codec_skip_pending = false;
     codec_seeking = false;
-
+    pause_on_track_change = false;
     return retval;
 }
 
@@ -2734,10 +2735,14 @@ static void audio_finalise_track_change(void)
         buf_read_cuesheet(info.cuesheet_hid);
         track_id3 = bufgetid3(info.id3_hid);
 
-        if (single_mode_do_pause(info.id3_hid))
+        /* When pause_on_track_change is calculated, next track_info may be missing
+         * (due to a low buffer or an automatic directory change),
+         * so we need to recalculate it. */
+        if (pause_on_track_change || single_mode_do_pause(info.id3_hid))
         {
             play_status = PLAY_PAUSED;
             pcmbuf_pause(true);
+            pause_on_track_change = false;
         }
     }
     /* Sync the next track information */
@@ -2815,11 +2820,16 @@ static void audio_monitor_end_of_playlist(void)
 }
 
 /* Does this track have an entry allocated? */
-static bool audio_can_change_track(int *trackstat, int *id3_hid)
+static bool audio_can_change_track(int *trackstat, enum pcm_track_change_type *type)
 {
     struct track_info info;
     bool have_track = track_list_advance_current(1, &info);
-    *id3_hid = info.id3_hid;
+
+    pause_on_track_change = have_track && single_mode_do_pause(info.id3_hid);
+    *type = pause_on_track_change
+                ? TRACK_CHANGE_END_OF_DATA
+                : TRACK_CHANGE_AUTO;
+
     if (!have_track || info.audio_hid < 0)
     {
         bool end_of_playlist = false;
@@ -2828,8 +2838,8 @@ static bool audio_can_change_track(int *trackstat, int *id3_hid)
         {
             if (filling == STATE_STOPPED)
             {
-                audio_begin_track_change(TRACK_CHANGE_END_OF_DATA, *trackstat);
+                *type = TRACK_CHANGE_END_OF_DATA;
-                return false;
+                return true;
             }
 
             /* Track load is not complete - it might have stopped on a
@@ -2931,13 +2941,10 @@ static void audio_on_codec_complete(int status)
     track_event_flags = TEF_AUTO_SKIP;
     skip_pending = TRACK_SKIP_AUTO;
 
-    int id3_hid = 0;
+    enum pcm_track_change_type type;
-    if (audio_can_change_track(&trackstat, &id3_hid))
+    if (audio_can_change_track(&trackstat, &type))
     {
-        audio_begin_track_change(
+        audio_begin_track_change(type, trackstat);
-                single_mode_do_pause(id3_hid)
-                ? TRACK_CHANGE_END_OF_DATA
-                : TRACK_CHANGE_AUTO, trackstat);
     }
 }
 
@@ -3850,7 +3857,7 @@ void audio_pcmbuf_track_change(bool pcmbuf)
 /* May pcmbuf start PCM playback when the buffer is full enough? */
 bool audio_pcmbuf_may_play(void)
 {
-    return play_status == PLAY_PLAYING && !ff_rw_mode;
+    return play_status == PLAY_PLAYING && !ff_rw_mode && !pause_on_track_change;
 }
 
 

apps/plugin.c

@@ -758,9 +758,6 @@ static const struct plugin_api rockbox_api = {
     audio_current_track,
     audio_flush_and_reload_tracks,
     audio_get_file_pos,
-#ifdef PLUGIN_USE_IRAM
-    audio_hard_stop,
-#endif
     add_playbacklog,
 
     /* menu */

apps/plugin.h

@@ -178,7 +178,7 @@ int plugin_open(const char *plugin, const char *parameter);
  * when this happens please take the opportunity to sort in
  * any new functions "waiting" at the end of the list.
  */
-#define PLUGIN_API_VERSION 277
+#define PLUGIN_API_VERSION 278
 
 /* 239 Marks the removal of ARCHOS HWCODEC and CHARCELL */
 
@@ -889,9 +889,6 @@ struct plugin_api {
     struct mp3entry* (*audio_current_track)(void);
     void (*audio_flush_and_reload_tracks)(void);
     int (*audio_get_file_pos)(void);
-#ifdef PLUGIN_USE_IRAM
-    void (*audio_hard_stop)(void);
-#endif
     void (*add_playbacklog)(struct mp3entry *id3);
 
     /* menu */

apps/plugins/battery_bench.c

@@ -150,12 +150,6 @@ struct battery_tables_t {
 #define BATTERY_OFF BUTTON_POWER
 #define BATTERY_OFF_TXT "POWER"
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define BATTERY_ON BUTTON_PLAY
-#define BATTERY_ON_TXT  "PLAY - start"
-#define BATTERY_OFF BUTTON_BACK
-#define BATTERY_OFF_TXT "BACK"
-
 #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
 
 #define BATTERY_ON  BUTTON_MENU

apps/plugins/blackjack.c

@@ -237,22 +237,6 @@ enum {
 #define BJACK_QUIT          BUTTON_POWER
 #define BJACK_DOUBLEDOWN    BUTTON_MINUS
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define BJACK_SELECT_NAME    "SELECT"
-#define BJACK_STAY_NAME     "PLAY"
-#define BJACK_QUIT_NAME     "POWER"
-#define BJACK_DOUBLE_NAME   "CUSTOM"
-#define BJACK_SELECT        BUTTON_SELECT
-#define BJACK_QUIT          BUTTON_POWER
-#define BJACK_STAY          BUTTON_PLAY
-#define BJACK_MAX           (BUTTON_CUSTOM|BUTTON_UP)
-#define BJACK_MIN           (BUTTON_CUSTOM|BUTTON_DOWN)
-#define BJACK_DOUBLEDOWN    BUTTON_CUSTOM
-#define BJACK_UP            BUTTON_UP
-#define BJACK_DOWN          BUTTON_DOWN
-#define BJACK_RIGHT         BUTTON_RIGHT
-#define BJACK_LEFT          BUTTON_LEFT
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define BJACK_SELECT_NAME   "PLAY"
 #define BJACK_STAY_NAME     "MENU"

apps/plugins/brickmania.c

@@ -169,14 +169,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 #define DOWN BUTTON_RC_VOL_DOWN
 #define RC_QUIT BUTTON_REC
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define QUIT BUTTON_BACK
-#define LEFT BUTTON_LEFT
-#define RIGHT BUTTON_RIGHT
-#define SELECT BUTTON_SELECT
-#define UP BUTTON_UP
-#define DOWN BUTTON_DOWN
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define QUIT BUTTON_POWER
 #define LEFT BUTTON_BACK
@@ -1504,8 +1496,7 @@ static int brickmania_help(void)
         "Releases", "the", "ball/Fire!", "",                            /* 30 */
 #if CONFIG_KEYPAD == IAUDIO_M3_PAD
         "REC:",
-#elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) || \
+#elif (CONFIG_KEYPAD == GIGABEAT_S_PAD)
-      (CONFIG_KEYPAD == CREATIVEZVM_PAD)
         "BACK:",
 #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
       (CONFIG_KEYPAD == IPOD_3G_PAD) || \

apps/plugins/calculator.c

@@ -269,17 +269,6 @@ F3: equal to "="
 #define CALCULATOR_QUIT           BUTTON_POWER
 #define CALCULATOR_CLEAR          BUTTON_MENU
 
-#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD)
-
-#define CALCULATOR_LEFT  BUTTON_LEFT
-#define CALCULATOR_RIGHT BUTTON_RIGHT
-#define CALCULATOR_UP    BUTTON_UP
-#define CALCULATOR_DOWN  BUTTON_DOWN
-#define CALCULATOR_QUIT  BUTTON_BACK
-#define CALCULATOR_INPUT BUTTON_SELECT
-#define CALCULATOR_CALC  BUTTON_MENU
-#define CALCULATOR_CLEAR BUTTON_PLAY
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 
 #define CALCULATOR_LEFT  (BUTTON_BACK|BUTTON_REL)

apps/plugins/calendar.c

@@ -149,16 +149,6 @@
 #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT
 #define CALENDAR_EVENT_MENU_NAME "menu"
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define CALENDAR_QUIT       BUTTON_BACK
-#define CALENDAR_SELECT     BUTTON_SELECT
-#define CALENDAR_NEXT_WEEK  BUTTON_DOWN
-#define CALENDAR_PREV_WEEK  BUTTON_UP
-#define CALENDAR_NEXT_DAY   BUTTON_RIGHT
-#define CALENDAR_PREV_DAY   BUTTON_LEFT
-#define CALENDAR_NEXT_MONTH BUTTON_CUSTOM
-#define CALENDAR_PREV_MONTH BUTTON_PLAY
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define CALENDAR_QUIT       BUTTON_POWER
 #define CALENDAR_SELECT     BUTTON_PLAY

apps/plugins/chessbox/chessbox.make

@@ -39,7 +39,7 @@ $(CHESSBOX_OBJDIR)/chessbox.ovl: $(CHESSBOX_OBJ) $(CHESSBOX_OUTLDS)
 		$(filter %.o, $^) \
 		$(filter %.a, $+) \
 		-lgcc $(CHESSBOX_OVLFLAGS)
-	$(call PRINTS,LD $(@F))$(call objcopy,$(basename $@).elf,$@)
+	$(call PRINTS,LD $(@F))$(call objcopy_plugin,$(basename $@).elf,$@)
 
 # special pattern rule for compiling chessbox with extra flags
 $(CHESSBOX_OBJDIR)/%.o: $(CHESSBOX_SRCDIR)/%.c $(CHESSBOX_SRCDIR)/chessbox.make

apps/plugins/chessbox/chessbox_pgn.h

@@ -222,20 +222,6 @@
 #define CB_RESTART BUTTON_MINUS
 #define CB_MENU    (BUTTON_MENU|BUTTON_REL)
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define CB_SELECT  BUTTON_PLAY
-#define CB_UP      BUTTON_UP
-#define CB_DOWN    BUTTON_DOWN
-#define CB_LEFT    BUTTON_LEFT
-#define CB_RIGHT   BUTTON_RIGHT
-#define CB_PLAY    BUTTON_SELECT
-#define CB_LEVEL   BUTTON_CUSTOM
-#define CB_MENU    BUTTON_MENU
-#define CB_SCROLL_UP     (BUTTON_UP|BUTTON_REPEAT)
-#define CB_SCROLL_DOWN   (BUTTON_DOWN|BUTTON_REPEAT)
-#define CB_SCROLL_LEFT   (BUTTON_LEFT|BUTTON_REPEAT)
-#define CB_SCROLL_RIGHT  (BUTTON_RIGHT|BUTTON_REPEAT)
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define CB_SELECT  (BUTTON_PLAY|BUTTON_REL)
 #define CB_UP      BUTTON_UP

apps/plugins/chessclock.c

@@ -147,16 +147,6 @@
 #define CHC_SETTINGS_DEC    BUTTON_MINUS
 #define CHC_SETTINGS_CANCEL BUTTON_POWER
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define CHC_QUIT BUTTON_BACK
-#define CHC_STARTSTOP BUTTON_PLAY
-#define CHC_RESET BUTTON_CUSTOM
-#define CHC_MENU BUTTON_MENU
-#define CHC_SETTINGS_INC BUTTON_UP
-#define CHC_SETTINGS_DEC BUTTON_DOWN
-#define CHC_SETTINGS_OK BUTTON_SELECT
-#define CHC_SETTINGS_CANCEL BUTTON_BACK
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define CHC_QUIT BUTTON_POWER
 #define CHC_STARTSTOP BUTTON_PLAY

apps/plugins/chip8.c

@@ -1048,16 +1048,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 #elif (CONFIG_KEYPAD == COWON_D2_PAD)
 #define CHIP8_OFF  BUTTON_POWER
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define CHIP8_OFF  BUTTON_BACK
-#define CHIP8_KEY1 BUTTON_MENU
-#define CHIP8_KEY2 BUTTON_UP
-#define CHIP8_KEY3 BUTTON_CUSTOM
-#define CHIP8_KEY4 BUTTON_LEFT
-#define CHIP8_KEY5 BUTTON_PLAY
-#define CHIP8_KEY6 BUTTON_RIGHT
-#define CHIP8_KEY8 BUTTON_DOWN
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define CHIP8_OFF  BUTTON_POWER
 #define CHIP8_KEY1 BUTTON_VOL_UP

apps/plugins/chopper.c

@@ -108,12 +108,6 @@ Still To do:
 #define QUIT BUTTON_POWER
 #define ACTION2 BUTTON_PLUS
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define QUIT BUTTON_BACK
-#define ACTION BUTTON_UP
-#define ACTION2 BUTTON_MENU
-#define ACTIONTEXT "UP"
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define QUIT BUTTON_POWER
 #define ACTION BUTTON_UP

apps/plugins/clix.c

@@ -114,14 +114,6 @@
 #define CLIX_BUTTON_UP      BUTTON_UP
 #define CLIX_BUTTON_DOWN    BUTTON_DOWN
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define CLIX_BUTTON_QUIT    BUTTON_BACK
-#define CLIX_BUTTON_LEFT    BUTTON_LEFT
-#define CLIX_BUTTON_RIGHT   BUTTON_RIGHT
-#define CLIX_BUTTON_CLICK   BUTTON_SELECT
-#define CLIX_BUTTON_UP      BUTTON_UP
-#define CLIX_BUTTON_DOWN    BUTTON_DOWN
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define CLIX_BUTTON_QUIT    BUTTON_POWER
 #define CLIX_BUTTON_LEFT    BUTTON_BACK

apps/plugins/cube.c

@@ -163,16 +163,6 @@
 #elif CONFIG_KEYPAD == COWON_D2_PAD
 #define CUBE_QUIT          BUTTON_POWER
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define CUBE_QUIT          BUTTON_BACK
-#define CUBE_NEXT          BUTTON_RIGHT
-#define CUBE_PREV          BUTTON_LEFT
-#define CUBE_INC           BUTTON_UP
-#define CUBE_DEC           BUTTON_DOWN
-#define CUBE_MODE          BUTTON_MENU
-#define CUBE_PAUSE         BUTTON_PLAY
-#define CUBE_HIGHSPEED     BUTTON_SELECT
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define CUBE_QUIT          BUTTON_POWER
 #define CUBE_NEXT          BUTTON_UP

apps/plugins/doom/i_video.c

@@ -316,18 +316,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ENTER   BUTTON_MENU
 #define DOOMBUTTON_WEAPON  BUTTON_DISPLAY
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define DOOMBUTTON_UP      BUTTON_UP
-#define DOOMBUTTON_DOWN    BUTTON_DOWN
-#define DOOMBUTTON_LEFT    BUTTON_LEFT
-#define DOOMBUTTON_RIGHT   BUTTON_RIGHT
-#define DOOMBUTTON_SHOOT   BUTTON_SELECT
-#define DOOMBUTTON_OPEN    BUTTON_PLAY
-#define DOOMBUTTON_ESC     BUTTON_BACK
-#define DOOMBUTTON_ENTER   BUTTON_PLAY
-#define DOOMBUTTON_WEAPON  BUTTON_MENU
-#define DOOMBUTTON_MAP     BUTTON_CUSTOM
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN

apps/plugins/fft/fft.c

@@ -799,7 +799,7 @@ static inline bool fft_get_fft(void)
 
 #if NUM_CORES > 1
 /* use a worker thread if there is another processor core */
-static volatile bool fft_thread_run SHAREDDATA_ATTR = false;
+static volatile bool fft_thread_run SHAREDBSS_ATTR;
 static unsigned long fft_thread = 0;
 
 static long fft_thread_stack[CACHEALIGN_UP(DEFAULT_STACK_SIZE*4/sizeof(long))]

apps/plugins/flipit.c

@@ -226,18 +226,6 @@
 
 #define FLIPIT_QUIT         BUTTON_POWER
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-
-#define FLIPIT_LEFT         BUTTON_LEFT
-#define FLIPIT_RIGHT        BUTTON_RIGHT
-#define FLIPIT_UP           BUTTON_UP
-#define FLIPIT_DOWN         BUTTON_DOWN
-#define FLIPIT_QUIT         BUTTON_BACK
-#define FLIPIT_SHUFFLE      BUTTON_CUSTOM
-#define FLIPIT_SOLVE        BUTTON_PLAY
-#define FLIPIT_STEP_BY_STEP BUTTON_MENU
-#define FLIPIT_TOGGLE       BUTTON_SELECT
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define FLIPIT_LEFT         BUTTON_BACK
 #define FLIPIT_RIGHT        BUTTON_MENU

apps/plugins/fractals/fractal.h

@@ -200,18 +200,6 @@
 #elif CONFIG_KEYPAD == COWON_D2_PAD
 #define FRACTAL_QUIT            BUTTON_POWER
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define FRACTAL_QUIT            BUTTON_BACK
-#define FRACTAL_UP              BUTTON_UP
-#define FRACTAL_DOWN            BUTTON_DOWN
-#define FRACTAL_LEFT            BUTTON_LEFT
-#define FRACTAL_RIGHT           BUTTON_RIGHT
-#define FRACTAL_ZOOM_IN         BUTTON_PLAY
-#define FRACTAL_ZOOM_OUT        BUTTON_MENU
-#define FRACTAL_PRECISION_INC   (BUTTON_UP | BUTTON_CUSTOM)
-#define FRACTAL_PRECISION_DEC   (BUTTON_DOWN | BUTTON_CUSTOM)
-#define FRACTAL_RESET           BUTTON_SELECT
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define FRACTAL_QUIT            BUTTON_POWER
 #define FRACTAL_UP              BUTTON_UP

apps/plugins/goban/goban.h

@@ -150,20 +150,6 @@
 #define  GBN_BUTTON_CONTEXT            BUTTON_SELECT | BUTTON_REPEAT
 #define  GBN_BUTTON_NEXT_VAR           BUTTON_NEXT
 
-
-#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD) \
-   || (CONFIG_KEYPAD == CREATIVEZV_PAD)
-#define  GBN_BUTTON_UP                 BUTTON_UP
-#define  GBN_BUTTON_DOWN               BUTTON_DOWN
-#define  GBN_BUTTON_LEFT               BUTTON_LEFT
-#define  GBN_BUTTON_RIGHT              BUTTON_RIGHT
-#define  GBN_BUTTON_RETREAT            BUTTON_BACK
-#define  GBN_BUTTON_ADVANCE            BUTTON_CUSTOM
-#define  GBN_BUTTON_MENU               BUTTON_MENU
-#define  GBN_BUTTON_PLAY               BUTTON_SELECT | BUTTON_REL
-#define  GBN_BUTTON_CONTEXT            BUTTON_SELECT | BUTTON_REPEAT
-#define  GBN_BUTTON_NEXT_VAR           BUTTON_PLAY
-
 #elif (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD)
 #define  GBN_BUTTON_UP                 BUTTON_UP | BUTTON_REL
 #define  GBN_BUTTON_DOWN               BUTTON_DOWN

apps/plugins/goban/goban.make

@@ -36,4 +36,4 @@ $(GOBAN_BUILDDIR)/goban.ovl: $(GOBAN_OBJ) $(GOBAN_OUTLDS)
 		$(filter %.o, $^) \
 		$(filter %.a, $+) \
 		-lgcc $(GOBAN_OVLFLAGS)
-	$(call PRINTS,LD $(@F))$(call objcopy,$(basename $@).elf,$@)
+	$(call PRINTS,LD $(@F))$(call objcopy_plugin,$(basename $@).elf,$@)

apps/plugins/imageviewer/imageviewer.make

@@ -40,7 +40,7 @@ $(IMGVBUILDDIR)/%.ovl: $(IMGDEC_OUTLDS)
 		$(filter-out $(PLUGIN_CRT0),$(filter %.o, $^)) \
 		$(filter %.a, $+) \
 		-lgcc $(IMGDEC_OVLFLAGS)
-	$(SILENT)$(call objcopy,$(IMGVBUILDDIR)/$*.elf,$@)
+	$(SILENT)$(call objcopy_plugin,$(IMGVBUILDDIR)/$*.elf,$@)
 
 # rule to create reference map for image decoder
 $(IMGVBUILDDIR)/%.refmap: $(APPSDIR)/plugin.h $(IMGVSRCDIR)/imageviewer.h $(PLUGINLINK_LDS) $(PLUGIN_LIBS)

apps/plugins/imageviewer/imageviewer_button.h

@@ -209,18 +209,6 @@
 
 #elif CONFIG_KEYPAD == COWON_D2_PAD
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-
-#define IMGVIEW_ZOOM_IN     BUTTON_PLAY
-#define IMGVIEW_ZOOM_OUT    BUTTON_CUSTOM
-#define IMGVIEW_UP          BUTTON_UP
-#define IMGVIEW_DOWN        BUTTON_DOWN
-#define IMGVIEW_LEFT        BUTTON_LEFT
-#define IMGVIEW_RIGHT       BUTTON_RIGHT
-#define IMGVIEW_NEXT        BUTTON_SELECT
-#define IMGVIEW_PREVIOUS    BUTTON_BACK
-#define IMGVIEW_MENU        BUTTON_MENU
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define IMGVIEW_ZOOM_IN         (BUTTON_VOL_UP|BUTTON_REL)
 #define IMGVIEW_ZOOM_OUT        (BUTTON_VOL_DOWN|BUTTON_REL)

apps/plugins/imageviewer/jpegp/FILEGETC.c

@@ -5,7 +5,7 @@ static int fd;
 extern int GETC(void)
 {
     unsigned char x = 0;
-    rb->read(fd, &x, 1)
+    rb->read(fd, &x, 1);
     return x;
 }
 

apps/plugins/invadrox.c

@@ -155,13 +155,6 @@
 #define RIGHT BUTTON_PLUS
 #define FIRE BUTTON_MENU
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-
-#define QUIT BUTTON_BACK
-#define LEFT BUTTON_LEFT
-#define RIGHT BUTTON_RIGHT
-#define FIRE BUTTON_SELECT
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 
 #define QUIT BUTTON_POWER

apps/plugins/jewels.c

@@ -191,16 +191,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 #define JEWELS_CANCEL BUTTON_POWER
 #define HK_CANCEL "POWER"
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define JEWELS_UP     BUTTON_UP
-#define JEWELS_DOWN   BUTTON_DOWN
-#define JEWELS_LEFT   BUTTON_LEFT
-#define JEWELS_RIGHT  BUTTON_RIGHT
-#define JEWELS_SELECT BUTTON_SELECT
-#define JEWELS_CANCEL BUTTON_BACK
-#define HK_SELECT "MIDDLE"
-#define HK_CANCEL "BACK"
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define JEWELS_UP     BUTTON_UP
 #define JEWELS_DOWN   BUTTON_DOWN

apps/plugins/lib/keymaps.h

@@ -56,7 +56,6 @@
     (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)      || \
     (CONFIG_KEYPAD == CREATIVE_ZEN_PAD)     || \
     (CONFIG_KEYPAD == SONY_NWZ_PAD)         || \
-    (CONFIG_KEYPAD == CREATIVEZVM_PAD)      || \
     (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD)     || \
     (CONFIG_KEYPAD == IRIVER_H300_PAD)      || \
     (CONFIG_KEYPAD == HM801_PAD)            || \
@@ -128,10 +127,6 @@
 #define BTN_FIRE       BUTTON_SELECT
 #define BTN_PAUSE      BUTTON_BACK
 
-#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD)
-#define BTN_FIRE       BUTTON_PLAY
-#define BTN_PAUSE      BUTTON_MENU
-
 #elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD)
 #define BTN_FIRE       BUTTON_USER
 #define BTN_PAUSE      BUTTON_MENU

apps/plugins/lib/pluginlib_actions.c

@@ -96,7 +96,6 @@ const struct button_mapping pla_main_ctx[] =
     || (CONFIG_KEYPAD == MROBE100_PAD) \
     || (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) \
     || (CONFIG_KEYPAD == SANSA_CLIP_PAD) \
-    || (CONFIG_KEYPAD == CREATIVEZVM_PAD) \
     || (CONFIG_KEYPAD == SANSA_M200_PAD)\
     || (CONFIG_KEYPAD == SANSA_E200_PAD) \
     || (CONFIG_KEYPAD == SANSA_FUZE_PAD) \
@@ -405,12 +404,6 @@ const struct button_mapping pla_main_ctx[] =
     {PLA_SELECT,            BUTTON_PLAY,                        BUTTON_NONE},
     {PLA_SELECT_REL,        BUTTON_PLAY|BUTTON_REL,             BUTTON_PLAY},
     {PLA_SELECT_REPEAT,     BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_NONE},
-#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD)
-    {PLA_CANCEL,            BUTTON_BACK|BUTTON_REL,             BUTTON_BACK},
-    {PLA_EXIT,              BUTTON_BACK|BUTTON_REPEAT,          BUTTON_NONE},
-    {PLA_SELECT,            BUTTON_SELECT,                      BUTTON_NONE},
-    {PLA_SELECT_REL,        BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT},
-    {PLA_SELECT_REPEAT,     BUTTON_SELECT|BUTTON_REPEAT,        BUTTON_NONE},
 #elif (CONFIG_KEYPAD == ONDAVX747_PAD)
     {PLA_CANCEL,            BUTTON_POWER|BUTTON_REL,            BUTTON_POWER},
     {PLA_EXIT,              BUTTON_POWER|BUTTON_REPEAT,         BUTTON_NONE},

apps/plugins/lrcplayer.c

@@ -74,6 +74,7 @@ struct preferences {
     bool wrap;
     bool wipe;
     bool active_one_line;
+    bool autoscroll;
     int  align; /* 0: left, 1: center, 2: right */
     bool statusbar_on;
     bool display_title;
@@ -99,6 +100,7 @@ static const char *extentions[NUM_TYPES] = {
 static struct lrc_info {
     struct mp3entry *id3;
     long elapsed;
+    long scroll;
     long length;
     long ff_rewind;
     int  audio_status;
@@ -1643,21 +1645,25 @@ static int display_lrc_line(struct lrc_line *lrc_line, int ypos, int i)
     struct screen *display = rb->screens[i];
     struct lrc_word *lrc_word;
     struct lrc_brpos *lrc_brpos;
-    long time_start, time_end, elapsed;
+    long time_start, time_end, time_elapsed, elapsed;
     int count, width, nword;
     int xpos;
     const char *str;
     bool active_line;
 
+    if (!prefs.autoscroll)
+        time_elapsed = current.scroll;
+    else
+        time_elapsed = current.elapsed;
     time_start = get_time_start(lrc_line);
     time_end = get_time_start(lrc_line->next);
-    active_line = (time_start <= current.elapsed
+    active_line = (time_start <= time_elapsed
-                    && time_end > current.elapsed);
+                    && time_end > time_elapsed);
 
     if (!lrc_line->width)
     {
         /* empty line. draw bar during interval. */
-        long rin = current.elapsed - time_start;
+        long rin = time_elapsed - time_start;
         long len = time_end - time_start;
         if (current.wipe && active_line && len >= 3500)
         {
@@ -1697,12 +1703,12 @@ static int display_lrc_line(struct lrc_line *lrc_line, int ypos, int i)
         else
             time_end = get_time_start(lrc_line->next);
 
-        if (time_start > current.elapsed || !active_line)
+        if (time_start > time_elapsed || !active_line)
         {
             /* inactive */
             elapsed = 0;
         }
-        else if (!current.wipe || time_end <= current.elapsed)
+        else if (!current.wipe || time_end <= time_elapsed)
         {
             /* active whole word */
             elapsed = lrc_word->width;
@@ -1710,7 +1716,7 @@ static int display_lrc_line(struct lrc_line *lrc_line, int ypos, int i)
         else
         {
             /* wipe word */
-            long rin = current.elapsed - time_start;
+            long rin = time_elapsed - time_start;
             long len = time_end - time_start;
             elapsed = rin * lrc_word->width / len;
         }
@@ -1727,27 +1733,30 @@ static int display_lrc_line(struct lrc_line *lrc_line, int ypos, int i)
                 c = word_count;
                 w = word_width;
             }
-            if (elapsed <= 0)
+            if (prefs.autoscroll)
             {
-                set_to_inactive(display);
+                if (elapsed <= 0)
-            }
+                {
-            else if (elapsed < w)
+                    set_to_inactive(display);
-            {
+                }
-                /* wipe text */
+                else if (elapsed < w)
-                display->fillrect(xpos, ypos, elapsed, font_ui_height);
+                {
-                set_to_inactive(display);
+                    /* wipe text */
-                display->fillrect(xpos+elapsed, ypos,
+                    display->fillrect(xpos, ypos, elapsed, font_ui_height);
-                                  w-elapsed, font_ui_height);
+                    set_to_inactive(display);
+                    display->fillrect(xpos+elapsed, ypos,
+                                      w-elapsed, font_ui_height);
 #if (LCD_DEPTH > 1)
 #ifdef HAVE_REMOTE_LCD
-                if (display->screen_type == SCREEN_REMOTE)
+                    if (display->screen_type == SCREEN_REMOTE)
-                    display->set_drawmode(DRMODE_INVERSEVID);
+                        display->set_drawmode(DRMODE_INVERSEVID);
-                else
+                    else
 #endif
-                    display->set_drawmode(DRMODE_BG);
+                        display->set_drawmode(DRMODE_BG);
 #else
-                display->set_drawmode(DRMODE_INVERSEVID);
+                    display->set_drawmode(DRMODE_INVERSEVID);
 #endif
+                }
             }
             rb->strlcpy(temp_buf, str, c+1);
             display->putsxy(xpos, ypos, temp_buf);
@@ -1777,13 +1786,18 @@ static int display_lrc_line(struct lrc_line *lrc_line, int ypos, int i)
 
 static void display_lrcs(void)
 {
-    long time_start, time_end, rin, len;
+    long time_start, time_end, time_elapsed, rin, len;
     int nline[NB_SCREENS] = {0};
     struct lrc_line *lrc_center = current.ll_head;
 
     if (!lrc_center) return;
 
-    while (get_time_start(lrc_center->next) <= current.elapsed)
+    if (!prefs.autoscroll)
+        time_elapsed = current.scroll;
+    else
+        time_elapsed = current.elapsed;
+
+    while (get_time_start(lrc_center->next) <= time_elapsed)
     {
         nline[SCREEN_MAIN] += lrc_center->nline[SCREEN_MAIN];
 #ifdef HAVE_REMOTE_LCD
@@ -1794,7 +1808,7 @@ static void display_lrcs(void)
 
     time_start = get_time_start(lrc_center);
     time_end = get_time_start(lrc_center->next);
-    rin = current.elapsed - time_start;
+    rin = time_elapsed - time_start;
     len = time_end - time_start;
 
     struct screen *display;
@@ -1810,9 +1824,9 @@ static void display_lrcs(void)
         y = (nblines-1)/2;
         if (rin < 0)
         {
-            /* current.elapsed < time of first lrc */
+            /* time_elapsed < time of first lrc */
             if (!current.wipe)
-                ypos = (time_start - current.elapsed)
+                ypos = (time_start - time_elapsed)
                             * font_ui_height / time_start;
             else
                 y++;
@@ -1849,7 +1863,7 @@ static void display_lrcs(void)
             ypos = display_lrc_line(lrc_line, ypos, i);
             lrc_line = lrc_line->next;
         }
-        if (!lrc_line && ypos < vp_lyrics[i].height)
+        if (!lrc_line && ypos < vp_lyrics[i].height && prefs.autoscroll)
             display->putsxy(0, ypos, "[end]");
 
         display->update_viewport();
@@ -2150,6 +2164,7 @@ static void load_or_save_settings(bool save)
         { TYPE_BOOL, 0, 1, { .bool_p = &prefs.wipe }, "wipe", NULL },
         { TYPE_BOOL, 0, 1, { .bool_p = &prefs.active_one_line },
             "active one line", NULL },
+        { TYPE_BOOL, 0, 1, { .bool_p = &prefs.autoscroll }, "autoscroll", NULL },
         { TYPE_INT,  0, 2, { .int_p =  &prefs.align }, "align", NULL },
         { TYPE_BOOL, 0, 1, { .bool_p = &prefs.statusbar_on },
             "statusbar on", NULL },
@@ -2179,6 +2194,7 @@ static void load_or_save_settings(bool save)
         prefs.wrap = true;
         prefs.wipe = true;
         prefs.active_one_line = false;
+        prefs.autoscroll = true;
         prefs.align = 1; /* center */
         prefs.statusbar_on = false;
         prefs.display_title = true;
@@ -2264,6 +2280,7 @@ static bool lrc_display_menu(void)
         LRC_MENU_WIPE,
         LRC_MENU_ALIGN,
         LRC_MENU_LINE_MODE,
+        LRC_MENU_SCROLL_MODE,
     };
 
     int selected = 0;
@@ -2271,7 +2288,8 @@ static bool lrc_display_menu(void)
 
     MENUITEM_STRINGLIST(menu, "Display Settings", NULL,
                         "Wrap", "Wipe", "Alignment",
-                        "Activate Only Current Line");
+                        "Activate Only Current Line",
+                        "Automatic Scrolling");
 
     struct opt_items align_names[] = {
         {"Left", -1}, {"Centre", -1}, {"Right", -1},
@@ -2295,6 +2313,9 @@ static bool lrc_display_menu(void)
                 usb = rb->set_bool("Activate Only Current Line",
                                         &prefs.active_one_line);
                 break;
+            case LRC_MENU_SCROLL_MODE:
+                usb = rb->set_bool("Automatic Scrolling", &prefs.autoscroll);
+                break;
             case MENU_ATTACHED_USB:
                 usb = true;
                 break;
@@ -2619,10 +2640,28 @@ static int handle_button(void)
             }
             break;
         case ACTION_WPS_VOLDOWN:
-            rb->adjust_volume(-1);
+            if (!prefs.autoscroll)
+            {
+                current.scroll -= 3000;
+                if (current.scroll < 0)
+                    current.scroll = 0;
+            }
+            else
+            {
+                rb->adjust_volume(-1);
+            }
             break;
         case ACTION_WPS_VOLUP:
-            rb->adjust_volume(1);
+            if (!prefs.autoscroll)
+            {
+                current.scroll += 3000;
+                if (current.scroll > current.length)
+                    current.scroll = current.length;
+            }
+            else
+            {
+                rb->adjust_volume(1);
+            }
             break;
         case ACTION_WPS_CONTEXT:
             ret = LRC_GOTO_EDITOR;
@@ -2705,6 +2744,7 @@ static int lrc_main(void)
         {
             current.elapsed = 0;
             current.length =  1;
+            current.scroll =  0;
         }
 
         if (current.id3 && id3_timeout &&
@@ -2782,6 +2822,7 @@ enum plugin_status plugin_start(const void* parameter)
     current.lrc_file[0] = 0;
     current.ff_rewind = -1;
     current.found_lrc = false;
+    current.scroll = 0;
     if (parameter && check_audio_status())
     {
         const char *ext;
@@ -2790,7 +2831,7 @@ enum plugin_status plugin_start(const void* parameter)
         rb->strcpy(current.lrc_file, parameter);
         if (!rb->file_exists(current.lrc_file))
         {
-            rb->splash(HZ, "Specified file dose not exist.");
+            rb->splash(HZ, "Specified file does not exist.");
             return PLUGIN_ERROR;
         }
         ext = rb->strrchr(current.lrc_file, '.');

apps/plugins/lua/lua.make

@@ -73,7 +73,7 @@ $(LUA_BUILDDIR)/lua.ovl: $(LUA_OBJ) $(TLSFLIB) $(LUA_OUTLDS)
 		$(filter %.o, $^) \
 		$(filter %.a, $+) \
 		-lgcc $(LUA_OVLFLAGS)
-	$(call PRINTS,LD $(@F))$(call objcopy,$(basename $@).elf,$@)
+	$(call PRINTS,LD $(@F))$(call objcopy_plugin,$(basename $@).elf,$@)
 
 $(LUA_BUILDDIR):
 	$(call PRINTS,MKDIR $@)mkdir -p $(LUA_BUILDDIR)/

apps/plugins/lua/rocklib.c

@@ -1052,6 +1052,11 @@ LUALIB_API int luaopen_rock(lua_State *L)
 {
     luaL_register(L, LUA_ROCKLIBNAME, rocklib);
     luaL_register(L, LUA_ROCKLIBNAME, rocklib_aux);
+#ifdef SIMULATOR /* rb.SIMULATOR = true allows checking for the SIM in lua */
+        lua_pushboolean(L, 1);
+        luaS_newlloc(L, "SIMULATOR", TSTR_INBIN);
+        lua_setfield(L, -2, "SIMULATOR");
+#endif
     lua_getglobal(L, "require");
     lua_pushstring(L, "rb_defines");
     if (lua_pcall (L, 1, 0, 0))

apps/plugins/lua_scripts/stars.lua

@@ -414,7 +414,11 @@ action_event(rb.actions.ACTION_NONE) -- we can call this now but not after regis
 local eva = rockev.register("action", action_event)
 local evc = rockev.register("timer", action_drift, rb.HZ/7)
 
+if not rb.SIMULATOR then
 while not action_quit() do rb.sleep(rb.HZ) end
+else -- the SIM requires lcd_update to be called from the main thread
+while not action_quit() do _lcd:update(); rb.sleep(10) end
+end
 
 if start_x and start_y then
     file = io.open(fname, "w")

apps/plugins/midi/midiplay.c

@@ -140,14 +140,6 @@
 #elif CONFIG_KEYPAD == COWON_D2_PAD
 #define MIDI_QUIT       BUTTON_POWER
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define MIDI_QUIT       BUTTON_BACK
-#define MIDI_FFWD       BUTTON_RIGHT
-#define MIDI_REWIND     BUTTON_LEFT
-#define MIDI_VOL_UP     BUTTON_UP
-#define MIDI_VOL_DOWN   BUTTON_DOWN
-#define MIDI_PLAYPAUSE  BUTTON_PLAY
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define MIDI_QUIT       (BUTTON_PLAY|BUTTON_REPEAT)
 #define MIDI_FFWD       BUTTON_MENU

apps/plugins/minesweeper.c

@@ -165,16 +165,6 @@ enum minesweeper_status {
 #elif (CONFIG_KEYPAD == COWON_D2_PAD)
 #   define MINESWP_QUIT     BUTTON_POWER
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#   define MINESWP_LEFT     BUTTON_LEFT
-#   define MINESWP_RIGHT    BUTTON_RIGHT
-#   define MINESWP_UP       BUTTON_UP
-#   define MINESWP_DOWN     BUTTON_DOWN
-#   define MINESWP_QUIT     BUTTON_BACK
-#   define MINESWP_TOGGLE   BUTTON_SELECT
-#   define MINESWP_DISCOVER BUTTON_PLAY
-#   define MINESWP_INFO     BUTTON_MENU
-
 #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
 #   define MINESWP_LEFT     BUTTON_LEFT
 #   define MINESWP_RIGHT    BUTTON_RIGHT

apps/plugins/mp3_encoder.c

@@ -2446,12 +2446,6 @@ static void get_mp3_filename(const char *wav_name)
 #elif CONFIG_KEYPAD == COWON_D2_PAD
 #define MP3ENC_DONE BUTTON_POWER
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define MP3ENC_PREV BUTTON_UP
-#define MP3ENC_NEXT BUTTON_DOWN
-#define MP3ENC_DONE BUTTON_BACK
-#define MP3ENC_SELECT BUTTON_SELECT
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define MP3ENC_PREV BUTTON_UP
 #define MP3ENC_NEXT BUTTON_DOWN

apps/plugins/mpegplayer/mpeg_settings.c

@@ -142,16 +142,6 @@ struct mpeg_settings settings;
 #elif CONFIG_KEYPAD == COWON_D2_PAD
 #define MPEG_START_TIME_EXIT        BUTTON_POWER
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define MPEG_START_TIME_SELECT      BUTTON_SELECT
-#define MPEG_START_TIME_LEFT        BUTTON_LEFT
-#define MPEG_START_TIME_RIGHT       BUTTON_RIGHT
-#define MPEG_START_TIME_UP          BUTTON_UP
-#define MPEG_START_TIME_DOWN        BUTTON_DOWN
-#define MPEG_START_TIME_LEFT2       BUTTON_PLAY
-#define MPEG_START_TIME_RIGHT2      BUTTON_MENU
-#define MPEG_START_TIME_EXIT        BUTTON_BACK
-
 #elif (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD)
 #define MPEG_START_TIME_SELECT      (BUTTON_PLAY|BUTTON_REL)
 #define MPEG_START_TIME_LEFT        BUTTON_BACK
@@ -985,13 +975,6 @@ static int get_start_time(uint32_t duration)
         case STATE0:
             if (!sliding)
             {
-                if (rb->global_settings->talk_menu)
-                {
-                    rb->talk_disable(true);
-#ifdef PLUGIN_USE_IRAM
-                    mpegplayer_iram_restore();
-#endif
-                }
                 trigger_cpu_boost();
                 sliding = true;
             }
@@ -1010,10 +993,6 @@ static int get_start_time(uint32_t duration)
                 cancel_cpu_boost();
                 if (rb->global_settings->talk_menu)
                 {
-#ifdef PLUGIN_USE_IRAM
-                    mpegplayer_iram_preserve();
-#endif
-                    rb->talk_disable(false);
                     talk_val(resume_time / TS_SECOND, UNIT_TIME, false);
                     talk_val(resume_time * 100 / duration, UNIT_PERCENT, true);
                 }
@@ -1053,14 +1032,6 @@ static int show_start_menu(uint32_t duration)
                         ID2P(LANG_SETTINGS),
                         ID2P(LANG_MENU_QUIT));
 
-    if (rb->global_settings->talk_menu)
-    {
-#ifdef PLUGIN_USE_IRAM
-        mpegplayer_iram_preserve();
-#endif
-        rb->talk_disable(false);
-    }
-
     rb->button_clear_queue();
 
     while (!menu_quit)
@@ -1109,14 +1080,6 @@ static int show_start_menu(uint32_t duration)
         }
     }
 
-    if (rb->global_settings->talk_menu)
-    {
-        rb->talk_disable(true);
-#ifdef PLUGIN_USE_IRAM
-        mpegplayer_iram_restore();
-#endif
-    }
-
     return result;
 }
 
@@ -1151,14 +1114,6 @@ int mpeg_menu(void)
                         ID2P(LANG_RESUME_PLAYBACK),
                         ID2P(LANG_MENU_QUIT));
 
-    if (rb->global_settings->talk_menu)
-    {
-#ifdef PLUGIN_USE_IRAM
-        mpegplayer_iram_preserve();
-#endif
-        rb->talk_disable(false);
-    }
-
     rb->button_clear_queue();
 
     mpeg_sysevent_clear();
@@ -1184,14 +1139,6 @@ int mpeg_menu(void)
     if (mpeg_sysevent() != 0)
         result = MPEG_MENU_QUIT;
 
-    if (rb->global_settings->talk_menu)
-    {
-        rb->talk_disable(true);
-#ifdef PLUGIN_USE_IRAM
-        mpegplayer_iram_restore();
-#endif
-    }
-
     return result;
 }
 

apps/plugins/mpegplayer/mpegplayer.c

@@ -254,15 +254,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 #define MPEG_VOLDOWN    BUTTON_MINUS
 #define MPEG_VOLUP      BUTTON_PLUS
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define MPEG_MENU       BUTTON_MENU
-#define MPEG_STOP       BUTTON_BACK
-#define MPEG_PAUSE      BUTTON_PLAY
-#define MPEG_VOLDOWN    BUTTON_UP
-#define MPEG_VOLUP      BUTTON_DOWN
-#define MPEG_RW         BUTTON_LEFT
-#define MPEG_FF         BUTTON_RIGHT
-
 #elif CONFIG_KEYPAD ==  CREATIVE_ZENXFI3_PAD
 #define MPEG_MENU       BUTTON_MENU
 #define MPEG_STOP       (BUTTON_PLAY|BUTTON_REPEAT)
@@ -690,54 +681,6 @@ static unsigned draw_blendcolor(unsigned c1, unsigned c2, unsigned char amount)
 }
 #endif
 
-#ifdef PLUGIN_USE_IRAM
-/* IRAM preserving mechanism to enable talking menus */
-static char *iram_saved_copy;
-extern char iramstart[], iramend[];
-
-static void iram_saving_init(void)
-{
-#ifndef SIMULATOR
-    size_t size;
-    iram_saved_copy = (char *)rb->plugin_get_buffer(&size);
-
-    if (size >= (size_t)(iramend-iramstart))
-        iram_saved_copy += size - (size_t)(iramend - iramstart);
-    else
-#endif
-        iram_saved_copy = NULL;
-
-    return;
-}
-
-void mpegplayer_iram_preserve(void)
-{
-    if (iram_saved_copy)
-    {
-        rb->memcpy(iram_saved_copy, iramstart, iramend-iramstart);
-#ifdef HAVE_CPUCACHE_INVALIDATE
-        /* make the icache (if it exists) up to date with the new code */
-        rb->cpucache_invalidate();
-#endif /* HAVE_CPUCACHE_INVALIDATE */
-    }
-    return;
-}
-
-void mpegplayer_iram_restore(void)
-{
-    if (iram_saved_copy)
-    {
-        rb->audio_hard_stop();
-        rb->memcpy(iramstart, iram_saved_copy, iramend-iramstart);
-#ifdef HAVE_CPUCACHE_INVALIDATE
-        /* make the icache (if it exists) up to date with the new code */
-        rb->cpucache_invalidate();
-#endif /* HAVE_CPUCACHE_INVALIDATE */
-    }
-    return;
-}
-#endif
-
 /* Drawing functions that operate rotated on LCD_PORTRAIT displays -
  * most are just wrappers of lcd_* functions with transforms applied.
  * The origin is the upper-left corner of the OSD area */
@@ -2472,29 +2415,12 @@ enum plugin_status plugin_start(const void* parameter)
     int status = PLUGIN_OK; /* assume success */
     bool quit = false;
 
-#if defined(PLUGIN_USE_IRAM) && !defined(SIMULATOR)
-    bool preserved_talk_state;
-#endif
-
     if (parameter == NULL) {
         /* No file = GTFO */
         rb->splash(HZ*2, "No File");
         return PLUGIN_ERROR;
     }
 
-    /* Disable all talking before initializing IRAM */
-    rb->talk_disable(true);
-
-#ifdef PLUGIN_USE_IRAM
-    iram_saving_init();
-
-#ifndef SIMULATOR
-    preserved_talk_state = rb->global_settings->talk_menu;
-    if (!iram_saved_copy)
-        rb->global_settings->talk_menu = false;
-#endif
-#endif
-
 #ifdef HAVE_LCD_COLOR
     rb->lcd_set_backdrop(NULL);
     rb->lcd_set_foreground(LCD_WHITE);
@@ -2645,13 +2571,6 @@ enum plugin_status plugin_start(const void* parameter)
 
     stream_exit();
 
-#if defined(PLUGIN_USE_IRAM) && !defined(SIMULATOR)
-    if (!iram_saved_copy)
-        rb->global_settings->talk_menu = preserved_talk_state;
-#endif
-
-    rb->talk_disable(false);
-
     /* Actually handle delayed processing of system events of interest
      * that were captured in other button loops */
     mpeg_sysevent_handle();

apps/plugins/mpegplayer/mpegplayer.h

@@ -86,10 +86,4 @@
 #define LCD_ENABLE_EVENT_0 MAKE_SYS_EVENT(SYS_EVENT_CLS_PRIVATE, 0)
 #define LCD_ENABLE_EVENT_1 MAKE_SYS_EVENT(SYS_EVENT_CLS_PRIVATE, 1)
 
-#ifdef PLUGIN_USE_IRAM
-/* IRAM preserving mechanism to enable talking menus */
-extern void mpegplayer_iram_preserve(void);
-extern void mpegplayer_iram_restore(void);
-#endif
-
 #endif /* MPEGPLAYER_H */

apps/plugins/open_plugins.c

@@ -176,12 +176,18 @@ static void op_entry_set_checksum(void)
         (op_entry.lang_id <= OPEN_PLUGIN_LANG_INVALID ? 0 : LANG_LAST_INDEX_IN_ARRAY);
 }
 
-static void op_entry_set_name(void)
+static bool op_entry_set_name(void)
 {
     char tmp_buf[OPEN_PLUGIN_NAMESZ+1];
     rb->strlcpy(tmp_buf, op_entry.name, OPEN_PLUGIN_NAMESZ);
+    uint32_t crc = rb->crc_32(tmp_buf, sizeof(tmp_buf), 0xffffffff);
+
     if (rb->kbd_input(tmp_buf, OPEN_PLUGIN_NAMESZ, NULL) >= 0)
+    {
         rb->strlcpy(op_entry.name, tmp_buf, OPEN_PLUGIN_NAMESZ);
+        return crc != rb->crc_32(tmp_buf, sizeof(tmp_buf), 0xffffffff);
+    }
+    return false;
 }
 
 static int op_entry_set_path(void)
@@ -392,10 +398,10 @@ static uint32_t op_entry_add_path(const char *key, const char *plugin, const cha
                     rb->strlcpy(op_entry.param, parameter, OPEN_PLUGIN_BUFSZ);
 
                 /* hash on the parameter path if it is a file */
-                if (op_entry.lang_id <0 && key == op_entry.path &&
+                if (op_entry.lang_id <0 && (key == op_entry.path || key == NULL) &&
                     rb->file_exists(op_entry.param))
                 {
-                    open_plugin_get_hash(op_entry.path, &newhash);
+                    open_plugin_get_hash(op_entry.param, &newhash);
                     op_entry.hash = newhash;
                 }
             }
@@ -692,6 +698,7 @@ static void edit_menu(int selection)
 {
     int selected_item;
     bool exit = false;
+    bool name_set = false;
     int action = 0;
 
     if (!op_entry_read(fd_dat, selection, op_entry_sz))
@@ -713,11 +720,22 @@ static void edit_menu(int selection)
         {
             case ACTION_STD_OK:
                 if (selected_item == 0)
-                    op_entry_set_name();
+                {
+                    name_set = op_entry_set_name();
+                }
                 else if (selected_item == 2)
                     op_entry_set_path();
                 else if (selected_item == 4)
+                {
                     op_entry_set_param();
+                    /* if user already set the name they probably don't want us to change it */
+                    if (!name_set && op_entry.lang_id < 0 && rb->file_exists(op_entry.param))
+                    {
+                        char *slash = rb->strrchr(op_entry.param, '/');
+                        if(slash)
+                            rb->strlcpy(op_entry.name, slash+1, OPEN_PLUGIN_NAMESZ);
+                    }
+                }
                 else
                     exit = true;
 

apps/plugins/oscilloscope.c

@@ -223,20 +223,6 @@
 #define OSCILLOSCOPE_VOL_UP          BUTTON_PLUS
 #define OSCILLOSCOPE_VOL_DOWN        BUTTON_MINUS
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define OSCILLOSCOPE_QUIT            BUTTON_BACK
-#define OSCILLOSCOPE_DRAWMODE        BUTTON_SELECT
-#define OSCILLOSCOPE_ADVMODE         BUTTON_CUSTOM
-#define OSCILLOSCOPE_ORIENTATION_PRE BUTTON_MENU
-#define OSCILLOSCOPE_ORIENTATION     (BUTTON_MENU | BUTTON_REL)
-#define OSCILLOSCOPE_GRAPHMODE_PRE   BUTTON_MENU
-#define OSCILLOSCOPE_GRAPHMODE       (BUTTON_MENU | BUTTON_REPEAT)
-#define OSCILLOSCOPE_PAUSE           BUTTON_PLAY
-#define OSCILLOSCOPE_SPEED_UP        BUTTON_RIGHT
-#define OSCILLOSCOPE_SPEED_DOWN      BUTTON_LEFT
-#define OSCILLOSCOPE_VOL_UP          BUTTON_UP
-#define OSCILLOSCOPE_VOL_DOWN        BUTTON_DOWN
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 #define OSCILLOSCOPE_QUIT            BUTTON_POWER
 #define OSCILLOSCOPE_DRAWMODE        (BUTTON_MENU | BUTTON_UP)

apps/plugins/pacbox/pacbox.c

@@ -387,7 +387,7 @@ static void start_sound(void)
     if (sound_playing)
         return;
 
-#ifndef PLUGIN_USE_IRAM
+#ifndef USE_IRAM
     /* Ensure control of PCM - stopping music itn't obligatory */
     rb->plugin_get_audio_buffer(NULL);
 #endif

apps/plugins/pacbox/pacbox.h

@@ -169,17 +169,6 @@
 
 #define PACMAN_MENU     (BUTTON_MENU|BUTTON_REL)
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-
-#define PACMAN_UP      BUTTON_UP
-#define PACMAN_DOWN    BUTTON_DOWN
-#define PACMAN_LEFT    BUTTON_LEFT
-#define PACMAN_RIGHT   BUTTON_RIGHT
-#define PACMAN_1UP     BUTTON_CUSTOM
-#define PACMAN_2UP     BUTTON_PLAY
-#define PACMAN_COIN    BUTTON_SELECT
-#define PACMAN_MENU    BUTTON_MENU
-
 #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
 
 #define PACMAN_UP       BUTTON_UP

apps/plugins/pegbox.c

@@ -271,23 +271,6 @@
 
 #define QUIT_TEXT "POWER"
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define PEGBOX_SELECT   BUTTON_CUSTOM
-#define PEGBOX_QUIT     BUTTON_BACK
-#define PEGBOX_RESTART  BUTTON_SELECT
-#define PEGBOX_LVL_UP   BUTTON_PLAY
-#define PEGBOX_LVL_DOWN BUTTON_MENU
-#define PEGBOX_UP       BUTTON_UP
-#define PEGBOX_DOWN     BUTTON_DOWN
-#define PEGBOX_RIGHT    BUTTON_RIGHT
-#define PEGBOX_LEFT     BUTTON_LEFT
-
-#define SELECT_TEXT "CUSTOM"
-#define QUIT_TEXT "BACK"
-#define RESTART_TEXT "MIDDLE"
-#define LVL_UP_TEXT "SELECT"
-#define LVL_DOWN_TEXT "MENU"
-
 #elif CONFIG_KEYPAD ==  CREATIVE_ZENXFI3_PAD
 #define PEGBOX_SELECT   (BUTTON_PLAY|BUTTON_REL)
 #define PEGBOX_QUIT     BUTTON_POWER

apps/plugins/pictureflow/pictureflow.c

@@ -126,8 +126,7 @@ const struct button_mapping pf_context_buttons[] =
     {PF_SELECT,       BUTTON_CENTER,              BUTTON_NONE},
     {PF_BACK,         BUTTON_BOTTOMRIGHT,         BUTTON_NONE},
 #endif
-#if CONFIG_KEYPAD == CREATIVEZV_PAD || CONFIG_KEYPAD == CREATIVEZVM_PAD || \
+#if CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || \
-    CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || \
     CONFIG_KEYPAD == GIGABEAT_PAD || CONFIG_KEYPAD == GIGABEAT_S_PAD || \
     CONFIG_KEYPAD == MROBE100_PAD || CONFIG_KEYPAD == MROBE500_PAD || \
     CONFIG_KEYPAD == PHILIPS_SA9200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD || \
@@ -162,8 +161,6 @@ const struct button_mapping pf_context_buttons[] =
     {PF_QUIT,         BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU},
 #elif CONFIG_KEYPAD == IAUDIO_M3_PAD
     {PF_QUIT,         BUTTON_RC_REC,              BUTTON_NONE},
-#elif CONFIG_KEYPAD == MEIZU_M6SL_PAD
-    {PF_QUIT,         BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU},
 #elif CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD
     {PF_QUIT,         BUTTON_OFF,                 BUTTON_NONE},
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD