nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Split HAVE_SCROLLWHEEL into HAVE_SCROLLWHEEL and HAVE_WHEEL_ACCELERATION, where the latter now activates the wheel acceleration code. 

HAVE_SCROLLWHEEL plainly indicates the existence of a scrollwheel, thus all ipods define it now (in addition to the ones and some 
sansas which did before). Same applies to the manual.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20177 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-03-02 19:25:50 +00:00
parent 09f012a64f
commit fd14cac7c2
54 changed files with 229 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/debug_menu.c
View File

@ -2522,7 +2522,7 @@ static bool cpu_boost_log(void)
}
#endif
#if (defined(HAVE_SCROLLWHEEL) && (CONFIG_KEYPAD==IPOD_4G_PAD) && !defined(SIMULATOR))
#if (defined(HAVE_WHEEL_ACCELERATION) && (CONFIG_KEYPAD==IPOD_4G_PAD) && !defined(SIMULATOR))
extern bool wheel_is_touched;
extern int old_wheel_value;
extern int new_wheel_value;
@ -2724,7 +2724,7 @@ static const struct the_menu_item menuitems[] = {
#ifdef CPU_BOOST_LOGGING
{"cpu_boost log",cpu_boost_log},
#endif
#if (defined(HAVE_SCROLLWHEEL) && (CONFIG_KEYPAD==IPOD_4G_PAD) && !defined(SIMULATOR))
#if (defined(HAVE_WHEEL_ACCELERATION) && (CONFIG_KEYPAD==IPOD_4G_PAD) && !defined(SIMULATOR))
{"Debug scrollwheel", dbg_scrollwheel},
#endif
};

4
apps/features.txt
View File

@ -143,6 +143,10 @@ rtc
scrollwheel
#endif
#if defined(HAVE_WHEEL_ACCELERATION)
wheel_acceleration
#endif
#if defined(ARCHOS_RECORDER) || defined(ARCHOS_PLAYER)
soft_shutdown
#endif

6
apps/gui/list.c
View File

@ -588,7 +588,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists,
static bool scrolling_left = false;
#endif
#ifdef HAVE_SCROLLWHEEL
#ifdef HAVE_WHEEL_ACCELERATION
int next_item_modifier = button_apply_acceleration(get_action_data());
#else
static int next_item_modifier = 1;
@ -659,7 +659,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists,
case ACTION_STD_PREV:
case ACTION_STD_PREVREPEAT:
gui_list_select_at_offset(lists, -next_item_modifier);
#ifndef HAVE_SCROLLWHEEL
#ifndef HAVE_WHEEL_ACCELERATION
if (button_queue_count() < FRAMEDROP_TRIGGER)
#endif
gui_synclist_draw(lists);
@ -673,7 +673,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists,
case ACTION_STD_NEXT:
case ACTION_STD_NEXTREPEAT:
gui_list_select_at_offset(lists, next_item_modifier);
#ifndef HAVE_SCROLLWHEEL
#ifndef HAVE_WHEEL_ACCELERATION
if (button_queue_count() < FRAMEDROP_TRIGGER)
#endif
gui_synclist_draw(lists);

3
apps/gui/option_select.c
View File

@ -38,9 +38,6 @@
#include "quickscreen.h"
#if defined (HAVE_SCROLLWHEEL) || \
(CONFIG_KEYPAD == IPOD_3G_PAD) || \
(CONFIG_KEYPAD == IPOD_4G_PAD) || \
(CONFIG_KEYPAD == IPOD_1G2G_PAD) || \
(CONFIG_KEYPAD == PLAYER_PAD)
/* Define this if your target makes sense to have
smaller values at the top of the list increasing down the list */

12
apps/lang/bulgarian.lang
View File

@ -4561,15 +4561,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Скорост на ускоряване в списъците"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: ""
scrollwheel: ""
wheel_acceleration: ""
</voice>
</phrase>
<phrase>
@ -9566,15 +9566,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Начално задържане на ускоряването на списъците"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: ""
scrollwheel: ""
wheel_acceleration: ""
</voice>
</phrase>
<phrase>

12
apps/lang/catala.lang
View File

@ -3260,15 +3260,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Retard abans d'acceleració de llista"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Retard abans d'acceleració de llista"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3277,15 +3277,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Velocitat d'acceleració"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Velocitat d'acceleració"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/chinese-simp.lang
View File

@ -9208,15 +9208,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "列表加速度"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "列表加速度"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -10537,15 +10537,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "列表加速前时滞"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "列表加速前时滞"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/chinese-trad.lang
View File

@ -9183,15 +9183,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "列表加速速度"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -10520,15 +10520,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "列表加速緩沖"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/czech.lang
View File

@ -3264,15 +3264,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Prodleva před zrychlením"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Prodleva před zrychlením"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3281,15 +3281,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Zrychlení seznamu"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Zrychlení seznamu"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/dansk.lang
View File

@ -10087,15 +10087,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Liste acceleration hastighed"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Liste acceleration hastighed"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -10267,15 +10267,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Pause før listeacceleration"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Pause før listeacceleration"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/deutsch.lang
View File

@ -3279,15 +3279,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Listenbeschleunigungs-Verzögerung"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Listenbeschleunigungs-Verzögerung"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3296,15 +3296,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Listenbeschleunigung"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Listenbeschleunigung"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/english.lang
View File

@ -3352,15 +3352,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3369,15 +3369,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/espanol.lang
View File

@ -9778,15 +9778,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Velocidad de aceleración de lista"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Velocidad de aceleración de lista"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -11019,15 +11019,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Retraso para comenzar la aceleración de la lista"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Retraso para comenzar la aceleración de la lista"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/finnish.lang
View File

@ -10220,15 +10220,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Listan kiihdytyksen aloitusviive"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Listan kiihdytyksen aloitusviive"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -10237,15 +10237,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Listan kiihdytysnopeus"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Listan kiihdytysnopeus"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/francais.lang
View File

@ -3309,15 +3309,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Délais avant accélération liste"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Délais avant accélération de la liste"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3326,15 +3326,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Vitesse d'accélération liste"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Vitesse d'accélération de la liste"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/greek.lang
View File

@ -3266,15 +3266,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Καθυστέρηση εκκίνησης επιτάχυνσης λίστας"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Καθυστέρηση εκκίνησης επιτάχυνσης λίστας"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3283,15 +3283,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Ταχύτητα επιτάχυνσης λίστας"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Ταχύτητα επιτάχυνσης λίστας"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/hebrew.lang
View File

@ -3260,15 +3260,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "השהיה לפי האצה בגלילת רשימות"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3277,15 +3277,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "מהירות האצה בגלילת רשימות"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/italiano.lang
View File

@ -3281,15 +3281,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Ritardo Iniziale Accelerazione Lista"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Ritardo Iniziale Accelerazione Lista"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3298,15 +3298,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Velocità Accelerazione Lista"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Velocità Accelerazione Lista"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/japanese.lang
View File

@ -3285,15 +3285,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "加速するまでの時間"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "加速するまでの時間"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3302,15 +3302,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "加速度"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "加速度"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/korean.lang
View File

@ -10531,15 +10531,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "목록 가속 속도"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "목록 가속 속도"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -11715,15 +11715,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "목록 가속 시작 지연시간"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "목록 가속 시작 지연시간"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/magyar.lang
View File

@ -3255,15 +3255,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Lista gyorsítás késleltetése"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3272,15 +3272,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Lista gyorsítás sebessége"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/nederlands.lang
View File

@ -10022,15 +10022,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Lijst Acceleratie Snelheid"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Lijst Acceleratie Snelheid"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -10202,15 +10202,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Lijst Acceleratie Start Vertraging"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Lijst Acceleratie Start Vertraging"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/norsk-nynorsk.lang
View File

@ -10090,15 +10090,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Vis akselereringsfart"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Vis akselereringsfart"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -10831,15 +10831,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Pause før listeakselerering"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Pause før listeakselerering"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/norsk.lang
View File

@ -10366,15 +10366,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Aksellerasjonshastighet i lister"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Aksellerasjonshastighet i lister"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -11193,15 +11193,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Listeaksellerasjon startforsinkelse"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Listeaksellerasjon startforsinkelse"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/polski.lang
View File

@ -3269,15 +3269,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Opóźnienie przyspiesznie przy przeglądaniu list"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Opóźnienie przyspiesznie przy przeglądaniu list"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3286,15 +3286,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Przyspieszenie przeglądania list"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Przyspieszenie przeglądania list"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/portugues-brasileiro.lang
View File

@ -3279,15 +3279,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Demora para Início da Aceleração da Lista"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Demora para Início da Aceleração da Lista"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3296,15 +3296,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Velocidade da Aceleração da Lista"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Velocidade da Aceleração da Lista"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/portugues.lang
View File

@ -8176,15 +8176,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Velocidade de Aceleração da Lista"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -10022,15 +10022,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Atraso no Início da Acelaração da Lista"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/romaneste.lang
View File

@ -4820,15 +4820,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Viteza accelerare lista"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -9693,15 +9693,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Intarzierea accelerarii startului listei"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/russian.lang
View File

@ -8725,15 +8725,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Ускорение списка"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Ускорение списка"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -10755,15 +10755,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Задержка начала списка"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Задержка начала списка"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/srpski.lang
View File

@ -3269,15 +3269,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Кашњење до почетка скроловања листе"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Кашњење до почетка скроловања листе"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3286,15 +3286,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Брзина скроловања листе"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Брзина скроловања листе"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/svenska.lang
View File

@ -3285,15 +3285,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Listaccelerationsstart"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Listaccelerationsstart"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3302,15 +3302,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Listaccelerationssteg"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Listaccelerationssteg"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/tagalog.lang
View File

@ -3269,15 +3269,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Bilisihan ng listahan umpisahan abala"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3286,15 +3286,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Bilisihan ng listahan tulin"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/thai.lang
View File

@ -3263,15 +3263,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "หน่วงเวลาการเร่งรายการเริ่มต้น"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3280,15 +3280,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "ความเร็วของการเร่งรายการ"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

12
apps/lang/walon.lang
View File

@ -3284,15 +3284,15 @@
user:
<source>
*: "List Acceleration Start Delay"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Tårdjaedje divant acceleråcion djivêye"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Tårdjaedje divant l'acceleråcion del djivêye"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>
@ -3301,15 +3301,15 @@
user:
<source>
*: "List Acceleration Speed"
scrollwheel: none
wheel_acceleration: none
</source>
<dest>
*: "Radisté d'acceleråcion djivêye"
scrollwheel: none
wheel_acceleration: none
</dest>
<voice>
*: "Radisté d'acceleråcion del djivêye"
scrollwheel: none
wheel_acceleration: none
</voice>
</phrase>
<phrase>

6
apps/menus/display_menu.c
View File

@ -251,11 +251,11 @@ MENUITEM_SETTING(jump_scroll, &global_settings.jump_scroll, NULL);
MENUITEM_SETTING(jump_scroll_delay, &global_settings.jump_scroll_delay, NULL);
#endif
/* list acceleration */
#ifndef HAVE_SCROLLWHEEL
#ifndef HAVE_WHEEL_ACCELERATION
MENUITEM_SETTING(list_accel_start_delay,
&global_settings.list_accel_start_delay, NULL);
MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL);
#endif /* HAVE_SCROLLWHEEL */
#endif /* HAVE_WHEEL_ACCELERATION */
#ifdef HAVE_LCD_BITMAP
static int screenscroll_callback(int action,const struct menu_item_ex *this_item)
{
@ -290,7 +290,7 @@ MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON,
&offset_out_of_view, &screen_scroll_step,
#endif
&scroll_paginated,
#ifndef HAVE_SCROLLWHEEL
#ifndef HAVE_WHEEL_ACCELERATION
&list_accel_start_delay, &list_accel_wait
#endif
);

2
apps/settings.h
View File

@ -478,7 +478,7 @@ struct user_settings
#endif
/* misc options */
#ifndef HAVE_SCROLLWHEEL
#ifndef HAVE_WHEEL_ACCELERATION
int list_accel_start_delay; /* ms before we start increaseing step size */
int list_accel_wait; /* ms between increases */
#endif

6
apps/settings_list.c
View File

@ -319,7 +319,7 @@ static int32_t backlight_getlang(int value, int unit)
}
#endif
#ifndef HAVE_SCROLLWHEEL
#ifndef HAVE_WHEEL_ACCELERATION
static void scanaccel_formatter(char *buffer, size_t buffer_size,
int val, const char *unit)
{
@ -1420,14 +1420,14 @@ const struct settings_list settings[] = {
MAX_BRIGHTNESS_SETTING, 1, NULL, NULL,
buttonlight_set_brightness),
#endif
#ifndef HAVE_SCROLLWHEEL
#ifndef HAVE_WHEEL_ACCELERATION
INT_SETTING(0, list_accel_start_delay, LANG_LISTACCEL_START_DELAY,
2, "list_accel_start_delay", UNIT_MS, 0, 10, 1,
formatter_unit_0_is_off, getlang_unit_0_is_off, NULL),
INT_SETTING(0, list_accel_wait, LANG_LISTACCEL_ACCEL_SPEED,
3, "list_accel_wait", UNIT_SEC, 1, 10, 1,
scanaccel_formatter, getlang_unit_0_is_off, NULL),
#endif /* HAVE_SCROLLWHEEL */
#endif /* HAVE_WHEEL_ACCELERATION */
#if CONFIG_CODEC == SWCODEC
/* keyclick */
CHOICE_SETTING(0, keyclick, LANG_KEYCLICK, 0,

4
firmware/drivers/button.c
View File

@ -549,7 +549,7 @@ void button_clear_queue(void)
#endif /* SIMULATOR */
#ifdef HAVE_SCROLLWHEEL
#ifdef HAVE_WHEEL_ACCELERATION
/* WHEEL_ACCEL_FACTOR = 2^16 / WHEEL_ACCEL_START */
#define WHEEL_ACCEL_FACTOR (1<<16)/WHEEL_ACCEL_START
/**
@ -591,4 +591,4 @@ int button_apply_acceleration(const unsigned int data)
return delta;
}
#endif /* HAVE_SCROLLWHEEL */
#endif /* HAVE_WHEEL_ACCELERATION */

2
firmware/export/button.h
View File

@ -56,7 +56,7 @@ int wheel_status(void);
void wheel_send_events(bool send);
#endif
#ifdef HAVE_SCROLLWHEEL
#ifdef HAVE_WHEEL_ACCELERATION
int button_apply_acceleration(const unsigned int data);
#endif

2
firmware/export/config-e200.h
View File

@ -106,6 +106,8 @@
/* define this if the unit uses a scrollwheel for navigation */
#define HAVE_SCROLLWHEEL
/* define to activate advanced wheel acceleration code */
#define HAVE_WHEEL_ACCELERATION
/* define from which rotation speed [degree/sec] on the acceleration starts */
#define WHEEL_ACCEL_START 540
/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */

2
firmware/export/config-e200v2.h
View File

@ -116,6 +116,8 @@
/* define this if the unit uses a scrollwheel for navigation */
#define HAVE_SCROLLWHEEL
/* define to activate advanced wheel acceleration code */
#define HAVE_WHEEL_ACCELERATION
/* define from which rotation speed [degree/sec] on the acceleration starts */
#define WHEEL_ACCEL_START 540
/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */

2
firmware/export/config-fuze.h
View File

@ -116,6 +116,8 @@
/* define this if the unit uses a scrollwheel for navigation */
#define HAVE_SCROLLWHEEL
/* define to activate advanced wheel acceleration code */
#define HAVE_WHEEL_ACCELERATION
/* define from which rotation speed [degree/sec] on the acceleration starts */
#define WHEEL_ACCEL_START 540
/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */

2
firmware/export/config-ipod1g2g.h
View File

@ -69,6 +69,8 @@
#define CONFIG_KEYPAD IPOD_1G2G_PAD
#define HAVE_SCROLLWHEEL
/* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC

2
firmware/export/config-ipod3g.h
View File

@ -70,6 +70,8 @@
#define CONFIG_KEYPAD IPOD_3G_PAD
#define HAVE_SCROLLWHEEL
/* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC

2
firmware/export/config-ipod4g.h
View File

@ -106,6 +106,8 @@
/* define this if the unit uses a scrollwheel for navigation */
#define HAVE_SCROLLWHEEL
/* define to activate advanced wheel acceleration code */
#define HAVE_WHEEL_ACCELERATION
/* define from which rotation speed [degree/sec] on the acceleration starts */
#define WHEEL_ACCEL_START 270
/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */

2
firmware/export/config-ipodcolor.h
View File

@ -90,6 +90,8 @@
/* define this if the unit uses a scrollwheel for navigation */
#define HAVE_SCROLLWHEEL
/* define to activate advanced wheel acceleration code */
#define HAVE_WHEEL_ACCELERATION
/* define from which rotation speed [degree/sec] on the acceleration starts */
#define WHEEL_ACCEL_START 270
/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */

2
firmware/export/config-ipodmini.h
View File

@ -69,6 +69,8 @@
#define CONFIG_KEYPAD IPOD_4G_PAD
#define HAVE_SCROLLWHEEL
/* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC

2
firmware/export/config-ipodmini2g.h
View File

@ -111,6 +111,8 @@
/* define this if the unit uses a scrollwheel for navigation */
#define HAVE_SCROLLWHEEL
/* define to activate advanced wheel acceleration code */
#define HAVE_WHEEL_ACCELERATION
/* define from which rotation speed [degree/sec] on the acceleration starts */
#define WHEEL_ACCEL_START 270
/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */

2
firmware/export/config-ipodnano.h
View File

@ -94,6 +94,8 @@
/* define this if the unit uses a scrollwheel for navigation */
#define HAVE_SCROLLWHEEL
/* define to activate advanced wheel acceleration code */
#define HAVE_WHEEL_ACCELERATION
/* define from which rotation speed [degree/sec] on the acceleration starts */
#define WHEEL_ACCEL_START 270
/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */

2
firmware/export/config-ipodvideo.h
View File

@ -100,6 +100,8 @@
/* define this if the unit uses a scrollwheel for navigation */
#define HAVE_SCROLLWHEEL
/* define to activate advanced wheel acceleration code */
#define HAVE_WHEEL_ACCELERATION
/* define from which rotation speed [degree/sec] on the acceleration starts */
#define WHEEL_ACCEL_START 270
/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */

2
manual/appendix/config_file_options.tex
View File

@ -134,7 +134,7 @@
\opt{radio}{radio, }
bookmarks & N/A\\
playlist catalog directory & /path/to/dir & N/A\\
\opt{scrollwheel}{
\opt{wheel_acceleration}{
list\_accel\_start\_delay & 0 to 10 & ms\\
list\_accel\_wait & 1 to 10 & seconds\\
}

2
manual/plugins/calculator.tex
View File

@ -12,7 +12,7 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp{} / \ButtonDown}
\opt{SANSA_E200_PAD}{/}
\opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
\opt{scrollwheel}{\ButtonScrollFwd{} / \ButtonScrollBack}
\opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
& Move around the keypad\\
%

12
manual/plugins/pictureflow.tex
View File

@ -23,23 +23,21 @@ play music.}
\subsubsection{Keys}
\begin{table}
\begin{btnmap}{}{}
\opt{scrollwheel,ipodmini,IPOD_1G2G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}{
\opt{scrollwheel,ipodmini,IPOD_1G2G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
\opt{scrollwheel,IRIVER_H10_PAD}{
\opt{scrollwheel}{\ButtonScrollFwd{} / \ButtonScrollBack}
\opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
& Scroll through albums / track list\\}
\nopt{scrollwheel,ipodmini,IPOD_1G2G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}{\ButtonLeft{} / \ButtonRight
\nopt{scrollwheel,IRIVER_H10_PAD}{\ButtonLeft{} / \ButtonRight
& Scroll through albums\\}
\nopt{scrollwheel,ipodmini,IPOD_1G2G_PAD,IPOD_3G_PAD,SANSA_C200_PAD,IRIVER_H10_PAD}{\ButtonUp{} / \ButtonDown
\nopt{scrollwheel,SANSA_C200_PAD,IRIVER_H10_PAD}{\ButtonUp{} / \ButtonDown
& Scroll through track list\\}
\opt{SANSA_C200_PAD}{\ButtonUp
& Scroll up through track list\\}
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,%
GIGABEATS_PAD,SANSA_E200_PAD,SANSA_C200_PAD,MROBE100_PAD,%
IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonSelect}
\nopt{IRIVER_H10_PAD}{\ButtonSelect}
\opt{IRIVER_H10_PAD}{\ButtonRew}
& Switch between cover view and track list\\

2
manual/plugins/rockblox.tex
View File

@ -32,7 +32,7 @@ making the blocks fall faster. If the pile of blocks reaches the ceiling, the ga
\opt{RECORDER_PAD}{\ButtonPlay}
\opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
\opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd}
\opt{scrollwheel}{\ButtonScrollFwd}
\opt{IAUDIO_X5_PAD}{\ButtonPower}
\opt{IRIVER_H10_PAD}{\ButtonRew}
\opt{SANSA_C200_PAD}{\ButtonVolDown}