diff options
| author | Hristo Kovachev <bger@rockbox.org> | 2006-01-25 20:57:13 +0000 |
|---|---|---|
| committer | Hristo Kovachev <bger@rockbox.org> | 2006-01-25 20:57:13 +0000 |
| commit | facf94eb8b1611e765516d88bd4946993d3139db (patch) | |
| tree | 424bafcc1451f853ca8700e551de77e4f0a4b28d /apps/plugins | |
| parent | 00598459bbd415f68bef86f79c796b9da608d905 (diff) | |
| download | rockbox-facf94eb8b1611e765516d88bd4946993d3139db.zip rockbox-facf94eb8b1611e765516d88bd4946993d3139db.tar.gz rockbox-facf94eb8b1611e765516d88bd4946993d3139db.tar.bz2 rockbox-facf94eb8b1611e765516d88bd4946993d3139db.tar.xz | |
Button mappings for iPods, using mp3_is_playing() for harware platforms, file format converted to unix
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8453 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/battery_bench.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 3eebb44..56d6575 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -48,6 +48,12 @@ PLUGIN_HEADER #define BATTERY_OFF BUTTON_OFF #define BATTERY_RC_OFF BUTTON_RC_STOP + +#elif CONFIG_KEYPAD == IPOD_4G_PAD + +#define BATTERY_ON BUTTON_PLAY +#define BATTERY_OFF BUTTON_MENU + #endif @@ -159,8 +165,13 @@ void thread(void) } else { - if(!rb->pcm_is_playing() && - (*rb->current_tick - tick) > DISK_SPINDOWN_TIMEOUT * HZ) + if( +#if CONFIG_CODEC == SWCODEC + !rb->pcm_is_playing() +#else + !rb->mp3_is_playing() +#endif + && (*rb->current_tick - tick) > DISK_SPINDOWN_TIMEOUT * HZ) timeflag = true; if(last_voltage != rb->battery_voltage()) |