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

Remote WPS support (and some WPS bugfixes) by Stephan Wezel 

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7934 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Christi Scarborough 2005-11-17 20:14:59 +00:00
parent bc1fb0f5d9
commit 4c0b83f5e9
26 changed files with 113 additions and 3002 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/SOURCES
View File

@ -29,8 +29,6 @@ tree.c
dbtree.c
database.c
filetree.c
wps-display.c
wps.c
screen_access.c
gui/buttonbar.c
@ -40,6 +38,8 @@ gui/scrollbar.c
gui/select.c
gui/splash.c
gui/statusbar.c
gui/gwps.c
gui/gwps-common.c
gui/textarea.c
#ifdef HAVE_LCD_CHARCELLS

2
apps/bookmark.c
View File

@ -27,7 +27,7 @@
#include "button.h"
#include "usb.h"
#include "audio.h"
#include "wps.h"
#include "playlist.h"
#include "settings.h"
#include "tree.h"
#include "bookmark.h"

1
apps/database.c
View File

@ -35,7 +35,6 @@
#include "mpeg.h"
#include "misc.h"
#include "ata.h"
#include "wps.h"
#include "filetypes.h"
#include "applimits.h"
#include "icons.h"

2
apps/dbtree.c
View File

@ -35,7 +35,7 @@
#include "mpeg.h"
#include "misc.h"
#include "ata.h"
#include "wps.h"
#include "playlist.h"
#include "filetypes.h"
#include "applimits.h"
#include "dbtree.h"

16
apps/filetree.c
View File

@ -31,7 +31,7 @@
#include "filetypes.h"
#include "talk.h"
#include "playlist.h"
#include "wps-display.h"
#include "gwps.h"
#include "lang.h"
#include "language.h"
#include "screens.h"
@ -273,6 +273,9 @@ int ft_load(struct tree_context* c, const char* tempdir)
(dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_M3U) ||
(*c->dirfilter == SHOW_SUPPORTED && !filetype_supported(dptr->attr)))) ||
(*c->dirfilter == SHOW_WPS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_WPS) ||
#ifdef HAVE_REMOTE_LCD
(*c->dirfilter == SHOW_RWPS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_RWPS) ||
#endif
(*c->dirfilter == SHOW_CFG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_CFG) ||
(*c->dirfilter == SHOW_LNG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_LNG) ||
(*c->dirfilter == SHOW_MOD && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_MOD) ||
@ -381,11 +384,20 @@ int ft_enter(struct tree_context* c)
/* wps config file */
case TREE_ATTR_WPS:
wps_load(buf,true);
wps_data_load(gui_syncwps.gui_wps[0].data, buf, true, true);
set_file(buf, global_settings.wps_file,
MAX_FILENAME);
break;
#ifdef HAVE_REMOTE_LCD
/* remote-wps config file */
case TREE_ATTR_RWPS:
wps_data_load(gui_syncwps.gui_wps[1].data, buf, true, true);
set_file(buf, global_settings.rwps_file,
MAX_FILENAME);
break;
#endif
case TREE_ATTR_CFG:
if (!settings_load_config(buf))
break;

2
apps/gui/statusbar.c
View File

@ -34,7 +34,7 @@
#include "led.h"
#include "status.h" /* needed for battery_state global var */
#include "wps.h" /* for keys_locked */
#include "gwps.h" /* for keys_locked */
#include "statusbar.h"

12
apps/lang/english.lang
View File

@ -3437,3 +3437,15 @@ eng: "=== Please Wait ==="
voice:
new:
id: VOICE_EXT_RWPS
desc: spoken only, for file extension
eng: ""
voice: "remote while-playing-screen"
new:
id: LANG_REMOTE_WHILE_PLAYING
desc: in settings_menu()
eng: "Browse .rwps files"
voice: "Browse remote while-playing-screen files"
new:

7
apps/main.c
View File

@ -49,7 +49,7 @@
#include "sprintf.h"
#include "font.h"
#include "language.h"
#include "wps-display.h"
#include "gwps.h"
#include "playlist.h"
#include "buffer.h"
#include "rolo.h"
@ -138,6 +138,8 @@ void init(void)
settings_reset();
settings_calc_config_sector();
settings_load(SETTINGS_ALL);
gui_sync_data_wps_init();
gui_sync_wps_init();
settings_apply();
init_dircache();
sleep(HZ/2);
@ -295,7 +297,8 @@ void init(void)
settings_calc_config_sector();
settings_load(SETTINGS_ALL);
init_dircache();
gui_sync_data_wps_init();
gui_sync_wps_init();
settings_apply();
status_init();

1
apps/onplay.c
View File

@ -46,7 +46,6 @@
#include "filetypes.h"
#include "plugin.h"
#include "bookmark.h"
#include "wps.h"
#include "action.h"
#include "splash.h"
#ifdef HAVE_LCD_BITMAP

2
apps/playback.c
View File

@ -34,8 +34,6 @@
#include "sprintf.h"
#include "settings.h"
#include "codecs.h"
#include "wps.h"
#include "wps-display.h"
#include "audio.h"
#include "logf.h"
#include "mp3_playback.h"

2
apps/recorder/peakmeter.c
View File

@ -24,7 +24,7 @@
#include "ata.h"
#include "lcd.h"
#include "widgets.h"
#include "wps-display.h"
#include "gwps.h"
#include "sprintf.h"
#include "button.h"
#include "system.h"

2
apps/screen_access.c
View File

@ -123,6 +123,8 @@ void screen_init(struct screen * screen, enum screen_type screen_type)
screen->height=2;
screen->double_height=&lcd_double_height;
screen->putc=&lcd_putc;
screen->get_locked_pattern=&lcd_get_locked_pattern;
screen->define_pattern=&lcd_define_pattern;
#ifdef SIMULATOR
screen->icon=&sim_lcd_icon;
#else

2
apps/screen_access.h
View File

@ -99,6 +99,8 @@ struct screen
void (*scroll_delay)(int ms);
void (*stop_scroll)(void);
void (*clear_display)(void);
unsigned char (*get_locked_pattern)(void);
void (*define_pattern)(int pat, const char *pattern);
#if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR)
void (*update)(void);
#endif

4
apps/screens.c
View File

@ -46,7 +46,7 @@
#include "led.h"
#include "sound.h"
#include "abrepeat.h"
#include "wps-display.h"
#include "gwps-common.h"
#include "splash.h"
#if defined(HAVE_LCD_BITMAP)
#include "widgets.h"
@ -1226,7 +1226,7 @@ bool browse_id3(void)
line = draw_id3_item(line, top, LANG_ID3_YEAR, body);
wps_format_time(buf, sizeof(buf), id3->length);
gui_wps_format_time(buf, sizeof(buf), id3->length);
line = draw_id3_item(line, top, LANG_ID3_LENGHT, buf);
snprintf(buf, sizeof(buf), "%d/%d", playlist_get_display_index(),

50
apps/settings.c
View File

@ -59,7 +59,7 @@
#endif
#include "lang.h"
#include "language.h"
#include "wps-display.h"
#include "gwps.h"
#include "powermgmt.h"
#include "bookmark.h"
#include "sprintf.h"
@ -85,7 +85,7 @@ const char rec_base_directory[] = REC_BASE_DIR;
#include "dsp.h"
#endif
#define CONFIG_BLOCK_VERSION 31
#define CONFIG_BLOCK_VERSION 32
#define CONFIG_BLOCK_SIZE 512
#define RTC_BLOCK_SIZE 44
@ -758,10 +758,16 @@ int settings_save( void )
strncpy(&config_block[0xb8], global_settings.wps_file, MAX_FILENAME);
strncpy(&config_block[0xcc], global_settings.lang_file, MAX_FILENAME);
strncpy(&config_block[0xe0], global_settings.font_file, MAX_FILENAME);
#ifdef HAVE_REMOTE_LCD
strncpy(&config_block[0xf4], global_settings.rwps_file, MAX_FILENAME);
#endif
if(save_config_buffer())
{
lcd_clear_display();
#ifdef HAVE_REMOTE_LCD
lcd_remote_clear_display();
#endif
#ifdef HAVE_LCD_CHARCELLS
lcd_puts(0, 0, str(LANG_SETTINGS_SAVE_PLAYER));
lcd_puts(0, 1, str(LANG_SETTINGS_BATTERY_PLAYER));
@ -769,6 +775,11 @@ int settings_save( void )
lcd_puts(4, 2, str(LANG_SETTINGS_SAVE_RECORDER));
lcd_puts(2, 4, str(LANG_SETTINGS_BATTERY_RECORDER));
lcd_update();
#ifdef HAVE_REMOTE_LCD
lcd_remote_puts(4, 2, str(LANG_SETTINGS_SAVE_RECORDER));
lcd_remote_puts(2, 4, str(LANG_SETTINGS_BATTERY_RECORDER));
lcd_remote_update();
#endif
#endif
sleep(HZ*2);
return -1;
@ -879,10 +890,21 @@ void settings_apply(void)
global_settings.wps_file[0] != 0xff ) {
snprintf(buf, sizeof buf, WPS_DIR "/%s.wps",
global_settings.wps_file);
wps_load(buf, false);
wps_data_load(gui_syncwps.gui_wps[0].data, buf, true, false);
}
else
wps_reset();
wps_data_init(gui_syncwps.gui_wps[0].data);
#ifdef HAVE_REMOTE_LCD
if ( global_settings.rwps_file[0] &&
global_settings.rwps_file[0] != 0xff ) {
snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps",
global_settings.rwps_file);
wps_data_load(gui_syncwps.gui_wps[1].data, buf, true, false);
}
else
wps_data_init(gui_syncwps.gui_wps[1].data);
#endif
#ifdef HAVE_LCD_BITMAP
if ( global_settings.font_file[0] &&
@ -1003,6 +1025,9 @@ void settings_load(int which)
strncpy(global_settings.wps_file, &config_block[0xb8], MAX_FILENAME);
strncpy(global_settings.lang_file, &config_block[0xcc], MAX_FILENAME);
strncpy(global_settings.font_file, &config_block[0xe0], MAX_FILENAME);
#ifdef HAVE_REMOTE_LCD
strncpy(global_settings.rwps_file, &config_block[0xf4], MAX_FILENAME);
#endif
}
}
@ -1141,9 +1166,15 @@ bool settings_load_config(const char* file)
/* check for the string values */
if (!strcasecmp(name, "wps")) {
if (wps_load(value,false))
if (wps_data_load(gui_syncwps.gui_wps[0].data,value,true, false))
set_file(value, global_settings.wps_file, MAX_FILENAME);
}
#ifdef HAVE_REMOTE_LCD
else if (!strcasecmp(name, "rwps")) {
if (wps_data_load(gui_syncwps.gui_wps[1].data,value,true, false))
set_file(value, global_settings.rwps_file, MAX_FILENAME);
}
#endif
else if (!strcasecmp(name, "lang")) {
if (!lang_load(value))
{
@ -1283,6 +1314,12 @@ bool settings_save_config(void)
fdprintf(fd, "wps: %s/%s.wps\r\n", WPS_DIR,
global_settings.wps_file);
#ifdef HAVE_REMOTE_LCD
if (global_settings.rwps_file[0] != 0)
fdprintf(fd, "rwps: %s/%s.rwps\r\n", WPS_DIR,
global_settings.rwps_file);
#endif
if (global_settings.lang_file[0] != 0)
fdprintf(fd, "lang: %s/%s.lng\r\n", ROCKBOX_DIR LANG_DIR,
global_settings.lang_file);
@ -1365,6 +1402,9 @@ void settings_reset(void) {
#endif
global_settings.contrast = lcd_default_contrast();
global_settings.wps_file[0] = '\0';
#ifdef HAVE_REMOTE_LCD
global_settings.rwps_file[0] = '\0';
#endif
global_settings.font_file[0] = '\0';
global_settings.lang_file[0] = '\0';

5
apps/settings.h
View File

@ -359,6 +359,9 @@ struct user_settings
bool dircache; /* enable directory cache */
int dircache_size; /* directory cache structure last size, 22 bits */
#endif
#ifdef HAVE_REMOTE_LCD
unsigned char rwps_file[MAX_FILENAME+1]; /* last remote-wps */
#endif
};
enum optiontype { INT, BOOL };
@ -443,7 +446,7 @@ enum
* must be added after NUM_FILTER_MODES. */
enum { SHOW_ALL, SHOW_SUPPORTED, SHOW_MUSIC, SHOW_PLAYLIST, SHOW_ID3DB,
NUM_FILTER_MODES,
SHOW_WPS, SHOW_CFG, SHOW_LNG, SHOW_MOD, SHOW_FONT, SHOW_PLUGINS};
SHOW_WPS, SHOW_RWPS, SHOW_CFG, SHOW_LNG, SHOW_MOD, SHOW_FONT, SHOW_PLUGINS};
/* recursive dir insert options */
enum { RECURSE_OFF, RECURSE_ON, RECURSE_ASK };

10
apps/settings_menu.c
View File

@ -996,6 +996,13 @@ static bool custom_wps_browse(void)
return rockbox_browse(WPS_DIR, SHOW_WPS);
}
#ifdef HAVE_REMOTE_LCD
static bool custom_remote_wps_browse(void)
{
return rockbox_browse(WPS_DIR, SHOW_RWPS);
}
#endif
static bool custom_cfg_browse(void)
{
return rockbox_browse(ROCKBOX_DIR, SHOW_CFG);
@ -1602,6 +1609,9 @@ static bool display_settings_menu(void)
{ ID2P(LANG_CUSTOM_FONT), font_browse },
#endif
{ ID2P(LANG_WHILE_PLAYING), custom_wps_browse },
#ifdef HAVE_REMOTE_LCD
{ ID2P(LANG_REMOTE_WHILE_PLAYING), custom_remote_wps_browse },
#endif
{ ID2P(LANG_LCD_MENU), lcd_settings_menu },
#ifdef HAVE_REMOTE_LCD
{ ID2P(LANG_LCD_REMOTE_MENU), lcd_remote_settings_menu },

2
apps/status.c
View File

@ -26,7 +26,7 @@
#include "status.h"
#include "mp3_playback.h"
#include "audio.h"
#include "wps.h"
#include "gwps.h"
#include "abrepeat.h"
#ifdef HAVE_RTC
#include "timefuncs.h"

9
apps/tree.c
View File

@ -36,8 +36,7 @@
#include "audio.h"
#include "playlist.h"
#include "menu.h"
#include "wps.h"
#include "wps-display.h"
#include "gwps.h"
#include "settings.h"
#include "status.h"
#include "debug.h"
@ -97,6 +96,9 @@ const struct filetype filetypes[] = {
{ "m3u", TREE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST },
{ "cfg", TREE_ATTR_CFG, Icon_Config, VOICE_EXT_CFG },
{ "wps", TREE_ATTR_WPS, Icon_Wps, VOICE_EXT_WPS },
#ifdef HAVE_REMOTE_LCD
{ "rwps", TREE_ATTR_RWPS, Icon_Wps, VOICE_EXT_RWPS },
#endif
{ "lng", TREE_ATTR_LNG, Icon_Language, LANG_LANGUAGE },
{ "rock",TREE_ATTR_ROCK,Icon_Plugin, VOICE_EXT_ROCK },
#ifdef HAVE_LCD_BITMAP
@ -212,6 +214,7 @@ void browse_root(void)
{
/* essential to all programs that wants to display things */
screen_access_init();
gui_sync_wps_screen_init();
filetype_init();
check_rockboxdir();
@ -885,7 +888,7 @@ static bool dirbrowse(void)
int i;
FOR_NB_SCREENS(i)
screens[i].stop_scroll();
if (wps_show() == SYS_USB_CONNECTED)
if (gui_wps_show() == SYS_USB_CONNECTED)
reload_dir = true;
#ifdef HAVE_HOTSWAP
else

1
apps/tree.h
View File

@ -213,6 +213,7 @@ struct tree_context {
#define TREE_ATTR_LNG 0x0700 /* binary lang file */
#define TREE_ATTR_ROCK 0x0800 /* binary rockbox plugin */
#define TREE_ATTR_MOD 0x0900 /* firmware file */
#define TREE_ATTR_RWPS 0x1000 /* remote-wps config file */
#define TREE_ATTR_MASK 0xFF00 /* which bits tree.c uses for file types */
void tree_get_filetypes(const struct filetype**, int*);

1841
apps/wps-display.c
View File

File diff suppressed because it is too large Load Diff

48
apps/wps-display.h
View File

@ -1,48 +0,0 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2002 Björn Stenberg
*
* All files in this archive are subject to the GNU General Public License.
* See the file COPYING in the source tree root for full license agreement.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#ifndef WPS_DISPLAY
#define WPS_DISPLAY
#include <stdbool.h>
#include "id3.h"
/* constants used in line_type and as refresh_mode for wps_refresh */
#define WPS_REFRESH_STATIC 1 /* line doesn't change over time */
#define WPS_REFRESH_DYNAMIC 2 /* line may change (e.g. time flag) */
#define WPS_REFRESH_SCROLL 4 /* line scrolls */
#define WPS_REFRESH_PLAYER_PROGRESS 8 /* line contains a progress bar */
#define WPS_REFRESH_PEAK_METER 16 /* line contains a peak meter */
#define WPS_REFRESH_ALL 0xff /* to refresh all line types */
/* to refresh only those lines that change over time */
#define WPS_REFRESH_NON_STATIC (WPS_REFRESH_ALL & ~WPS_REFRESH_STATIC & ~WPS_REFRESH_SCROLL)
/* alignments */
#define WPS_ALIGN_RIGHT 32
#define WPS_ALIGN_CENTER 64
#define WPS_ALIGN_LEFT 128
void wps_format_time(char* buf, int buf_size, long time);
bool wps_refresh(struct mp3entry* id3, struct mp3entry* nid3,
int ffwd_offset, unsigned char refresh_mode);
bool wps_display(struct mp3entry* id3, struct mp3entry* nid3);
bool wps_load(const char* file, bool display);
void wps_reset(void);
#endif

882
apps/wps.c
View File

@ -1,882 +0,0 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2002 Jerome Kuptz
*
* All files in this archive are subject to the GNU General Public License.
* See the file COPYING in the source tree root for full license agreement.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include "system.h"
#include "file.h"
#include "lcd.h"
#include "font.h"
#include "backlight.h"
#include "button.h"
#include "kernel.h"
#include "tree.h"
#include "debug.h"
#include "sprintf.h"
#include "settings.h"
#include "wps.h"
#include "wps-display.h"
#include "audio.h"
#include "mp3_playback.h"
#include "usb.h"
#include "status.h"
#include "main_menu.h"
#include "ata.h"
#include "screens.h"
#include "playlist.h"
#ifdef HAVE_LCD_BITMAP
#include "icons.h"
#include "peakmeter.h"
#endif
#include "action.h"
#include "lang.h"
#include "bookmark.h"
#include "misc.h"
#include "sound.h"
#include "onplay.h"
#include "abrepeat.h"
#include "playback.h"
#include "splash.h"
#define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */
/* 3% of 30min file == 54s step size */
#define MIN_FF_REWIND_STEP 500
bool keys_locked = false;
static bool ff_rewind = false;
static bool paused = false;
static struct mp3entry* id3 = NULL;
static struct mp3entry* nid3 = NULL;
static char current_track_path[MAX_PATH+1];
/* set volume
return true if screen restore is needed
return false otherwise
*/
static bool setvol(void)
{
if (global_settings.volume < sound_min(SOUND_VOLUME))
global_settings.volume = sound_min(SOUND_VOLUME);
if (global_settings.volume > sound_max(SOUND_VOLUME))
global_settings.volume = sound_max(SOUND_VOLUME);
sound_set_volume(global_settings.volume);
status_draw(false);
wps_refresh(id3, nid3, 0, WPS_REFRESH_NON_STATIC);
settings_save();
#ifdef HAVE_LCD_CHARCELLS
gui_syncsplash(0, false, "Vol: %d %% ",
sound_val2phys(SOUND_VOLUME, global_settings.volume));
return true;
#endif
return false;
}
static bool ffwd_rew(int button)
{
static const int ff_rew_steps[] = {
1000, 2000, 3000, 4000,
5000, 6000, 8000, 10000,
15000, 20000, 25000, 30000,
45000, 60000
};
unsigned int step = 0; /* current ff/rewind step */
unsigned int max_step = 0; /* maximum ff/rewind step */
int ff_rewind_count = 0; /* current ff/rewind count (in ticks) */
int direction = -1; /* forward=1 or backward=-1 */
long accel_tick = 0; /* next time at which to bump the step size */
bool exit = false;
bool usb = false;
while (!exit) {
switch ( button ) {
case WPS_FFWD:
#ifdef WPS_RC_FFWD
case WPS_RC_FFWD:
#endif
direction = 1;
case WPS_REW:
#ifdef WPS_RC_REW
case WPS_RC_REW:
#endif
if (ff_rewind)
{
if (direction == 1)
{
/* fast forwarding, calc max step relative to end */
max_step =
(id3->length - (id3->elapsed + ff_rewind_count)) *
FF_REWIND_MAX_PERCENT / 100;
}
else
{
/* rewinding, calc max step relative to start */
max_step = (id3->elapsed + ff_rewind_count) *
FF_REWIND_MAX_PERCENT / 100;
}
max_step = MAX(max_step, MIN_FF_REWIND_STEP);
if (step > max_step)
step = max_step;
ff_rewind_count += step * direction;
if (global_settings.ff_rewind_accel != 0 &&
current_tick >= accel_tick)
{
step *= 2;
accel_tick = current_tick +
global_settings.ff_rewind_accel*HZ;
}
}
else
{
if ( (audio_status() & AUDIO_STATUS_PLAY) &&
id3 && id3->length )
{
if (!paused)
audio_pause();
#if CONFIG_KEYPAD == PLAYER_PAD
lcd_stop_scroll();
#endif
if (direction > 0)
status_set_ffmode(STATUS_FASTFORWARD);
else
status_set_ffmode(STATUS_FASTBACKWARD);
ff_rewind = true;
step = ff_rew_steps[global_settings.ff_rewind_min_step];
accel_tick = current_tick +
global_settings.ff_rewind_accel*HZ;
}
else
break;
}
if (direction > 0) {
if ((id3->elapsed + ff_rewind_count) > id3->length)
ff_rewind_count = id3->length - id3->elapsed;
}
else {
if ((int)(id3->elapsed + ff_rewind_count) < 0)
ff_rewind_count = -id3->elapsed;
}
if(wps_time_countup == false)
wps_refresh(id3, nid3, -ff_rewind_count,
WPS_REFRESH_PLAYER_PROGRESS |
WPS_REFRESH_DYNAMIC);
else
wps_refresh(id3, nid3, ff_rewind_count,
WPS_REFRESH_PLAYER_PROGRESS |
WPS_REFRESH_DYNAMIC);
break;
case WPS_PREV:
case WPS_NEXT:
#ifdef WPS_RC_PREV
case WPS_RC_PREV:
case WPS_RC_NEXT:
#endif
audio_ff_rewind(id3->elapsed+ff_rewind_count);
ff_rewind_count = 0;
ff_rewind = false;
status_set_ffmode(0);
if (!paused)
audio_resume();
#ifdef HAVE_LCD_CHARCELLS
wps_display(id3, nid3);
#endif
exit = true;
break;
default:
if(default_event_handler(button) == SYS_USB_CONNECTED) {
status_set_ffmode(0);
usb = true;
exit = true;
}
break;
}
if (!exit)
button = button_get(true);
}
/* let audio thread update id3->elapsed before calling wps_refresh */
yield();
wps_refresh(id3, nid3, 0, WPS_REFRESH_ALL);
return usb;
}
static bool update(void)
{
bool track_changed = audio_has_changed_track();
bool retcode = false;
nid3 = audio_next_track();
if (track_changed)
{
lcd_stop_scroll();
id3 = audio_current_track();
if (wps_display(id3, nid3))
retcode = true;
else
wps_refresh(id3, nid3, 0, WPS_REFRESH_ALL);
if (id3)
memcpy(current_track_path, id3->path, sizeof(current_track_path));
}
if (id3)
wps_refresh(id3, nid3, 0, WPS_REFRESH_NON_STATIC);
status_draw(false);
return retcode;
}
static void fade(bool fade_in)
{
unsigned fp_global_vol = global_settings.volume << 8;
unsigned fp_step = fp_global_vol / 30;
if (fade_in) {
/* fade in */
unsigned fp_volume = 0;
/* zero out the sound */
sound_set_volume(0);
sleep(HZ/10); /* let audio thread run */
audio_resume();
while (fp_volume < fp_global_vol) {
fp_volume += fp_step;
sleep(1);
sound_set_volume(fp_volume >> 8);
}
sound_set_volume(global_settings.volume);
}
else {
/* fade out */
unsigned fp_volume = fp_global_vol;
while (fp_volume > fp_step) {
fp_volume -= fp_step;
sleep(1);
sound_set_volume(fp_volume >> 8);
}
audio_pause();
#ifndef SIMULATOR
/* let audio thread run and wait for the mas to run out of data */
while (!mp3_pause_done())
#endif
sleep(HZ/10);
/* reset volume to what it was before the fade */
sound_set_volume(global_settings.volume);
}
}
#ifdef WPS_KEYLOCK
static void display_keylock_text(bool locked)
{
char* s;
lcd_stop_scroll();
#ifdef HAVE_LCD_CHARCELLS
if(locked)
s = str(LANG_KEYLOCK_ON_PLAYER);
else
s = str(LANG_KEYLOCK_OFF_PLAYER);
#else
if(locked)
s = str(LANG_KEYLOCK_ON_RECORDER);
else
s = str(LANG_KEYLOCK_OFF_RECORDER);
#endif
gui_syncsplash(HZ, true, s);
}
static void waitfor_nokey(void)
{
/* wait until all keys are released */
while (button_get(false) != BUTTON_NONE)
yield();
}
#endif
/* demonstrates showing different formats from playtune */
long wps_show(void)
{
long button = 0, lastbutton = 0;
bool ignore_keyup = true;
bool restore = false;
long restoretimer = 0; /* timer to delay screen redraw temporarily */
bool exit = false;
bool update_track = false;
unsigned long right_lastclick = 0;
unsigned long left_lastclick = 0;
id3 = nid3 = NULL;
current_track_path[0] = '\0';
#ifdef HAVE_LCD_CHARCELLS
status_set_audio(true);
status_set_param(false);
#else
if(global_settings.statusbar)
lcd_setmargins(0, STATUSBAR_HEIGHT);
else
lcd_setmargins(0, 0);
#endif
#ifdef AB_REPEAT_ENABLE
ab_repeat_init();
ab_reset_markers();
#endif
ff_rewind = false;
if(audio_status() & AUDIO_STATUS_PLAY)
{
id3 = audio_current_track();
nid3 = audio_next_track();
if (id3) {
if (wps_display(id3, nid3))
return 0;
wps_refresh(id3, nid3, 0, WPS_REFRESH_ALL);
memcpy(current_track_path, id3->path, sizeof(current_track_path));
}
restore = true;
}
while ( 1 )
{
bool audio_paused = (audio_status() & AUDIO_STATUS_PAUSE)?true:false;
/* did someone else (i.e power thread) change audio pause mode? */
if (paused != audio_paused) {
paused = audio_paused;
/* if another thread paused audio, we are probably in car mode,
about to shut down. lets save the settings. */
if (paused) {
settings_save();
#if !defined(HAVE_RTC) && !defined(HAVE_SW_POWEROFF)
ata_flush();
#endif
}
}
#ifdef HAVE_LCD_BITMAP
/* when the peak meter is enabled we want to have a
few extra updates to make it look smooth. On the
other hand we don't want to waste energy if it
isn't displayed */
if (peak_meter_enabled) {
long next_refresh = current_tick;
long next_big_refresh = current_tick + HZ / 5;
button = BUTTON_NONE;
while (TIME_BEFORE(current_tick, next_big_refresh)) {
button = button_get(false);
if (button != BUTTON_NONE) {
break;
}
peak_meter_peek();
sleep(0); /* Sleep until end of current tick. */
if (TIME_AFTER(current_tick, next_refresh)) {
wps_refresh(id3, nid3, 0, WPS_REFRESH_PEAK_METER);
next_refresh += HZ / PEAK_METER_FPS;
}
}
}
/* The peak meter is disabled
-> no additional screen updates needed */
else {
button = button_get_w_tmo(HZ/5);
}
#else
button = button_get_w_tmo(HZ/5);
#endif
/* discard first event if it's a button release */
if (button && ignore_keyup)
{
ignore_keyup = false;
/* Negative events are system events */
if (button >= 0 && button & BUTTON_REL )
continue;
}
#ifdef WPS_KEYLOCK
/* ignore non-remote buttons when keys are locked */
if (keys_locked &&
! ((button < 0) ||
(button == BUTTON_NONE) ||
((button & WPS_KEYLOCK) == WPS_KEYLOCK) ||
(button & BUTTON_REMOTE)
))
{
if (!(button & BUTTON_REL))
display_keylock_text(true);
restore = true;
button = BUTTON_NONE;
}
#endif
/* Exit if audio has stopped playing. This can happen if using the
sleep timer with the charger plugged or if starting a recording
from F1 */
if (!audio_status())
exit = true;
switch(button)
{
#ifdef WPS_CONTEXT
case WPS_CONTEXT:
onplay(id3->path, TREE_ATTR_MPA, CONTEXT_WPS);
restore = true;
break;
#endif
#ifdef WPS_RC_BROWSE
case WPS_RC_BROWSE:
#endif
case WPS_BROWSE:
#ifdef WPS_BROWSE_PRE
if ((lastbutton != WPS_BROWSE_PRE)
#ifdef WPS_RC_BROWSE_PRE
&& (lastbutton != WPS_RC_BROWSE_PRE)
#endif
)
break;
#endif
#ifdef HAVE_LCD_CHARCELLS
status_set_record(false);
status_set_audio(false);
#endif
lcd_stop_scroll();
/* set dir browser to current playing song */
if (global_settings.browse_current &&
current_track_path[0] != '\0')
set_current_file(current_track_path);
return 0;
break;
/* play/pause */
case WPS_PAUSE:
#ifdef WPS_PAUSE_PRE
if (lastbutton != WPS_PAUSE_PRE)
break;
#endif
#ifdef WPS_RC_PAUSE
case WPS_RC_PAUSE:
#ifdef WPS_RC_PAUSE_PRE
if ((button == WPS_RC_PAUSE) && (lastbutton != WPS_RC_PAUSE_PRE))
break;
#endif
#endif
if ( paused )
{
paused = false;
if ( global_settings.fade_on_stop )
fade(1);
else
audio_resume();
}
else
{
paused = true;
if ( global_settings.fade_on_stop )
fade(0);
else
audio_pause();
settings_save();
#if !defined(HAVE_RTC) && !defined(HAVE_SW_POWEROFF)
ata_flush(); /* make sure resume info is saved */
#endif
}
break;
/* volume up */
case WPS_INCVOL:
case WPS_INCVOL | BUTTON_REPEAT:
#ifdef WPS_RC_INCVOL
case WPS_RC_INCVOL:
case WPS_RC_INCVOL | BUTTON_REPEAT:
#endif
global_settings.volume++;
if (setvol()) {
restore = true;
restoretimer = current_tick + HZ;
}
break;
/* volume down */
case WPS_DECVOL:
case WPS_DECVOL | BUTTON_REPEAT:
#ifdef WPS_RC_DECVOL
case WPS_RC_DECVOL:
case WPS_RC_DECVOL | BUTTON_REPEAT:
#endif
global_settings.volume--;
if (setvol()) {
restore = true;
restoretimer = current_tick + HZ;
}
break;
/* fast forward / rewind */
#ifdef WPS_RC_FFWD
case WPS_RC_FFWD:
#endif
case WPS_FFWD:
#ifdef WPS_NEXT_DIR
if (current_tick - right_lastclick < HZ)
{
audio_next_dir();
right_lastclick = 0;
break;
}
#endif
#ifdef WPS_RC_REW
case WPS_RC_REW:
#endif
case WPS_REW:
#ifdef WPS_PREV_DIR
if (current_tick - left_lastclick < HZ)
{
audio_prev_dir();
left_lastclick = 0;
break;
}
#endif
ffwd_rew(button);
break;
/* prev / restart */
case WPS_PREV:
#ifdef WPS_PREV_PRE
if (lastbutton != WPS_PREV_PRE)
break;
#endif
#ifdef WPS_RC_PREV
case WPS_RC_PREV:
#ifdef WPS_RC_PREV_PRE
if ((button == WPS_RC_PREV) && (lastbutton != WPS_RC_PREV_PRE))
break;
#endif
#endif
left_lastclick = current_tick;
update_track = true;
#ifdef AB_REPEAT_ENABLE
/* if we're in A/B repeat mode and the current position
is past the A marker, jump back to the A marker... */
if ( ab_repeat_mode_enabled() && ab_after_A_marker(id3->elapsed) )
{
ab_jump_to_A_marker();
break;
}
/* ...otherwise, do it normally */
#endif
if (!id3 || (id3->elapsed < 3*1000)) {
audio_prev();
}
else {
if (!paused)
audio_pause();
audio_ff_rewind(0);
if (!paused)
audio_resume();
}
break;
#ifdef WPS_NEXT_DIR
#ifdef WPS_RC_NEXT_DIR
case WPS_RC_NEXT_DIR:
#endif
case WPS_NEXT_DIR:
audio_next_dir();
break;
#endif
#ifdef WPS_PREV_DIR
#ifdef WPS_RC_PREV_DIR
case WPS_RC_PREV_DIR:
#endif
case WPS_PREV_DIR:
audio_prev_dir();
break;
#endif
/* next */
case WPS_NEXT:
#ifdef WPS_NEXT_PRE
if (lastbutton != WPS_NEXT_PRE)
break;
#endif
#ifdef WPS_RC_NEXT
case WPS_RC_NEXT:
#ifdef WPS_RC_NEXT_PRE
if ((button == WPS_RC_NEXT) && (lastbutton != WPS_RC_NEXT_PRE))
break;
#endif
#endif
right_lastclick = current_tick;
update_track = true;
#ifdef AB_REPEAT_ENABLE
/* if we're in A/B repeat mode and the current position is
before the A marker, jump to the A marker... */
if ( ab_repeat_mode_enabled() && ab_before_A_marker(id3->elapsed) )
{
ab_jump_to_A_marker();
break;
}
/* ...otherwise, do it normally */
#endif
audio_next();
break;
#ifdef WPS_MENU
/* menu key functions */
case WPS_MENU:
#ifdef WPS_MENU_PRE
if (lastbutton != WPS_MENU_PRE)
break;
#endif
#ifdef WPS_RC_MENU
case WPS_RC_MENU:
#ifdef WPS_RC_MENU_PRE
if ((button == WPS_RC_MENU) && (lastbutton != WPS_RC_MENU_PRE))
break;
#endif
#endif
lcd_stop_scroll();
if (main_menu())
return true;
#ifdef HAVE_LCD_BITMAP
if (global_settings.statusbar)
lcd_setmargins(0, STATUSBAR_HEIGHT);
else
lcd_setmargins(0, 0);
#endif
restore = true;
break;
#endif /* WPS_MENU */
#ifdef WPS_KEYLOCK
/* key lock */
case WPS_KEYLOCK:
case WPS_KEYLOCK | BUTTON_REPEAT:
keys_locked = !keys_locked;
display_keylock_text(keys_locked);
restore = true;
waitfor_nokey();
break;
#endif
#if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == IRIVER_H100_PAD)
/* play settings */
case WPS_QUICK:
if (quick_screen(CONTEXT_WPS, WPS_QUICK))
return SYS_USB_CONNECTED;
restore = true;
lastbutton = 0;
break;
/* screen settings */
#ifdef BUTTON_F3
case BUTTON_F3:
if (quick_screen(CONTEXT_WPS, BUTTON_F3))
return SYS_USB_CONNECTED;
restore = true;
break;
#endif
/* pitch screen */
#if CONFIG_KEYPAD == RECORDER_PAD
case BUTTON_ON | BUTTON_UP:
case BUTTON_ON | BUTTON_DOWN:
if (2 == pitch_screen())
return SYS_USB_CONNECTED;
restore = true;
break;
#endif
#endif
#ifdef AB_REPEAT_ENABLE
#ifdef WPS_AB_SET_A_MARKER
/* set A marker for A-B repeat */
case WPS_AB_SET_A_MARKER:
if (ab_repeat_mode_enabled())
ab_set_A_marker(id3->elapsed);
break;
#endif
#ifdef WPS_AB_SET_B_MARKER
/* set B marker for A-B repeat and jump to A */
case WPS_AB_SET_B_MARKER:
if (ab_repeat_mode_enabled())
{
ab_set_B_marker(id3->elapsed);
ab_jump_to_A_marker();
update_track = true;
}
break;
#endif
#ifdef WPS_AB_RESET_AB_MARKERS
/* reset A&B markers */
case WPS_AB_RESET_AB_MARKERS:
if (ab_repeat_mode_enabled())
{
ab_reset_markers();
update_track = true;
}
break;
#endif
#endif /* AB_REPEAT_ENABLE */
/* stop and exit wps */
#ifdef WPS_EXIT
case WPS_EXIT:
# ifdef WPS_EXIT_PRE
if (lastbutton != WPS_EXIT_PRE)
break;
# endif
exit = true;
# ifdef WPS_RC_EXIT
case WPS_RC_EXIT:
# ifdef WPS_RC_EXIT_PRE
if (lastbutton != WPS_RC_EXIT_PRE)
break;
# endif
exit = true;
# endif
break;
#endif
#ifdef WPS_ID3
case WPS_ID3:
browse_id3();
restore = true;
break;
#endif
case BUTTON_NONE: /* Timeout */
update_track = true;
break;
default:
if(default_event_handler(button) == SYS_USB_CONNECTED)
return SYS_USB_CONNECTED;
update_track = true;
break;
}
if (update_track)
{
if (update())
{
/* set dir browser to current playing song */
if (global_settings.browse_current &&
current_track_path[0] != '\0')
set_current_file(current_track_path);
return 0;
}
update_track = false;
}
if (exit) {
#ifdef HAVE_LCD_CHARCELLS
status_set_record(false);
status_set_audio(false);
#endif
if (global_settings.fade_on_stop)
fade(0);
lcd_stop_scroll();
bookmark_autobookmark();
audio_stop();
#ifdef AB_REPEAT_ENABLE
ab_reset_markers();
#endif
/* Keys can be locked when exiting, so either unlock here
or implement key locking in tree.c too */
keys_locked=false;
/* set dir browser to current playing song */
if (global_settings.browse_current &&
current_track_path[0] != '\0')
set_current_file(current_track_path);
return 0;
}
if ( button )
ata_spin();
if (restore &&
((restoretimer == 0) ||
(restoretimer < current_tick)))
{
restore = false;
restoretimer = 0;
if (wps_display(id3, nid3))
{
/* set dir browser to current playing song */
if (global_settings.browse_current &&
current_track_path[0] != '\0')
set_current_file(current_track_path);
return 0;
}
if (id3)
wps_refresh(id3, nid3, 0, WPS_REFRESH_NON_STATIC);
}
if (button != BUTTON_NONE)
lastbutton = button;
}
return 0; /* unreachable - just to reduce compiler warnings */
}

205
apps/wps.h
View File

@ -1,205 +0,0 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2002 Jerome Kuptz
*
* All files in this archive are subject to the GNU General Public License.
* See the file COPYING in the source tree root for full license agreement.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#ifndef _WPS_H
#define _WPS_H
#include "id3.h"
#include "playlist.h"
/* button definitions */
#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
(CONFIG_KEYPAD == IRIVER_H300_PAD)
#define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL)
#define WPS_NEXT_PRE BUTTON_RIGHT
#define WPS_PREV (BUTTON_LEFT | BUTTON_REL)
#define WPS_PREV_PRE BUTTON_LEFT
#define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT)
#define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT)
#define WPS_INCVOL BUTTON_UP
#define WPS_DECVOL BUTTON_DOWN
#define WPS_PAUSE (BUTTON_ON | BUTTON_REL)
#define WPS_PAUSE_PRE BUTTON_ON
#define WPS_MENU (BUTTON_MODE | BUTTON_REL)
#define WPS_MENU_PRE BUTTON_MODE
#define WPS_BROWSE (BUTTON_SELECT | BUTTON_REL)
#define WPS_BROWSE_PRE BUTTON_SELECT
#define WPS_EXIT (BUTTON_OFF | BUTTON_REL)
#define WPS_EXIT_PRE BUTTON_OFF
#define WPS_ID3 (BUTTON_MODE | BUTTON_ON)
#define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT)
#define WPS_QUICK (BUTTON_MODE | BUTTON_REPEAT)
#define WPS_NEXT_DIR (BUTTON_RIGHT | BUTTON_ON)
#define WPS_PREV_DIR (BUTTON_LEFT | BUTTON_ON)
#define WPS_RC_NEXT_DIR (BUTTON_RC_BITRATE | BUTTON_REL)
#define WPS_RC_PREV_DIR (BUTTON_RC_SOURCE | BUTTON_REL)
#define WPS_RC_NEXT (BUTTON_RC_FF | BUTTON_REL)
#define WPS_RC_NEXT_PRE BUTTON_RC_FF
#define WPS_RC_PREV (BUTTON_RC_REW | BUTTON_REL)
#define WPS_RC_PREV_PRE BUTTON_RC_REW
#define WPS_RC_FFWD (BUTTON_RC_FF | BUTTON_REPEAT)
#define WPS_RC_REW (BUTTON_RC_REW | BUTTON_REPEAT)
#define WPS_RC_PAUSE BUTTON_RC_ON
#define WPS_RC_INCVOL BUTTON_RC_VOL_UP
#define WPS_RC_DECVOL BUTTON_RC_VOL_DOWN
#define WPS_RC_EXIT (BUTTON_RC_STOP | BUTTON_REL)
#define WPS_RC_EXIT_PRE BUTTON_RC_STOP
#define WPS_RC_MENU (BUTTON_RC_MODE | BUTTON_REL)
#define WPS_RC_MENU_PRE BUTTON_RC_MODE
#define WPS_RC_BROWSE (BUTTON_RC_MENU | BUTTON_REL)
#define WPS_RC_BROWSE_PRE BUTTON_RC_MENU
#elif CONFIG_KEYPAD == RECORDER_PAD
#define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL)
#define WPS_NEXT_PRE BUTTON_RIGHT
#define WPS_PREV (BUTTON_LEFT | BUTTON_REL)
#define WPS_PREV_PRE BUTTON_LEFT
#define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT)
#define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT)
#define WPS_INCVOL BUTTON_UP
#define WPS_DECVOL BUTTON_DOWN
#define WPS_PAUSE_PRE BUTTON_PLAY
#define WPS_PAUSE (BUTTON_PLAY | BUTTON_REL)
#define WPS_MENU (BUTTON_F1 | BUTTON_REL)
#define WPS_MENU_PRE BUTTON_F1
#define WPS_BROWSE (BUTTON_ON | BUTTON_REL)
#define WPS_BROWSE_PRE BUTTON_ON
#define WPS_EXIT BUTTON_OFF
#define WPS_KEYLOCK (BUTTON_F1 | BUTTON_DOWN)
#define WPS_ID3 (BUTTON_F1 | BUTTON_ON)
#define WPS_CONTEXT (BUTTON_PLAY | BUTTON_REPEAT)
#define WPS_QUICK BUTTON_F2
#ifdef AB_REPEAT_ENABLE
#define WPS_AB_SET_A_MARKER (BUTTON_ON | BUTTON_LEFT)
#define WPS_AB_SET_B_MARKER (BUTTON_ON | BUTTON_RIGHT)
#define WPS_AB_RESET_AB_MARKERS (BUTTON_ON | BUTTON_OFF)
#endif
#define WPS_RC_NEXT BUTTON_RC_RIGHT
#define WPS_RC_PREV BUTTON_RC_LEFT
#define WPS_RC_PAUSE BUTTON_RC_PLAY
#define WPS_RC_INCVOL BUTTON_RC_VOL_UP
#define WPS_RC_DECVOL BUTTON_RC_VOL_DOWN
#define WPS_RC_EXIT BUTTON_RC_STOP
#elif CONFIG_KEYPAD == PLAYER_PAD
#define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL)
#define WPS_NEXT_PRE BUTTON_RIGHT
#define WPS_PREV (BUTTON_LEFT | BUTTON_REL)
#define WPS_PREV_PRE BUTTON_LEFT
#define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT)
#define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT)
#define WPS_INCVOL (BUTTON_MENU | BUTTON_RIGHT)
#define WPS_DECVOL (BUTTON_MENU | BUTTON_LEFT)
#define WPS_PAUSE_PRE BUTTON_PLAY
#define WPS_PAUSE (BUTTON_PLAY | BUTTON_REL)
#define WPS_MENU (BUTTON_MENU | BUTTON_REL)
#define WPS_MENU_PRE BUTTON_MENU
#define WPS_BROWSE (BUTTON_ON | BUTTON_REL)
#define WPS_BROWSE_PRE BUTTON_ON
#define WPS_EXIT BUTTON_STOP
#define WPS_KEYLOCK (BUTTON_MENU | BUTTON_STOP)
#define WPS_ID3 (BUTTON_MENU | BUTTON_ON)
#define WPS_CONTEXT (BUTTON_PLAY | BUTTON_REPEAT)
#ifdef AB_REPEAT_ENABLE
#define WPS_AB_SET_A_MARKER (BUTTON_ON | BUTTON_LEFT)
#define WPS_AB_SET_B_MARKER (BUTTON_ON | BUTTON_RIGHT)
#define WPS_AB_RESET_AB_MARKERS (BUTTON_ON | BUTTON_STOP)
#endif
#define WPS_RC_NEXT BUTTON_RC_RIGHT
#define WPS_RC_PREV BUTTON_RC_LEFT
#define WPS_RC_PAUSE BUTTON_RC_PLAY
#define WPS_RC_INCVOL BUTTON_RC_VOL_UP
#define WPS_RC_DECVOL BUTTON_RC_VOL_DOWN
#define WPS_RC_EXIT BUTTON_RC_STOP
#elif CONFIG_KEYPAD == ONDIO_PAD
#define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL)
#define WPS_NEXT_PRE BUTTON_RIGHT
#define WPS_PREV (BUTTON_LEFT | BUTTON_REL)
#define WPS_PREV_PRE BUTTON_LEFT
#define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT)
#define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT)
#define WPS_INCVOL BUTTON_UP
#define WPS_DECVOL BUTTON_DOWN
#define WPS_PAUSE BUTTON_OFF
/* #define WPS_MENU Ondio can't have both main menu and context menu in wps */
#define WPS_BROWSE (BUTTON_MENU | BUTTON_REL)
#define WPS_BROWSE_PRE BUTTON_MENU
#define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN)
#define WPS_EXIT (BUTTON_OFF | BUTTON_REPEAT)
#define WPS_CONTEXT (BUTTON_MENU | BUTTON_REPEAT)
#elif CONFIG_KEYPAD == GMINI100_PAD
#define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL)
#define WPS_NEXT_PRE BUTTON_RIGHT
#define WPS_PREV (BUTTON_LEFT | BUTTON_REL)
#define WPS_PREV_PRE BUTTON_LEFT
#define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT)
#define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT)
#define WPS_INCVOL BUTTON_UP
#define WPS_DECVOL BUTTON_DOWN
#define WPS_PAUSE BUTTON_PLAY
#define WPS_MENU (BUTTON_MENU | BUTTON_REL)
#define WPS_MENU_PRE BUTTON_MENU
#define WPS_BROWSE (BUTTON_ON | BUTTON_REL)
#define WPS_BROWSE_PRE BUTTON_ON
#define WPS_EXIT BUTTON_OFF
#define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN)
#define WPS_ID3 (BUTTON_MENU | BUTTON_ON)
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD)
/* TODO: Check WPS button assignments */
#define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL)
#define WPS_NEXT_PRE BUTTON_RIGHT
#define WPS_PREV (BUTTON_LEFT | BUTTON_REL)
#define WPS_PREV_PRE BUTTON_LEFT
#define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT)
#define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT)
#define WPS_INCVOL BUTTON_UP
#define WPS_DECVOL BUTTON_DOWN
#define WPS_PAUSE BUTTON_OFF
/* #define WPS_MENU iPod can't have both main menu and context menu in wps */
#define WPS_BROWSE (BUTTON_MENU | BUTTON_REL)
#define WPS_BROWSE_PRE BUTTON_MENU
#define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN)
#define WPS_EXIT (BUTTON_OFF | BUTTON_REPEAT)
#define WPS_CONTEXT (BUTTON_MENU | BUTTON_REPEAT)
#endif
extern bool keys_locked;
extern bool wps_time_countup;
long wps_show(void);
bool refresh_wps(bool refresh_scroll);
void handle_usb(void);
#if CONFIG_KEYPAD == RECORDER_PAD
bool f2_screen(void);
bool f3_screen(void);
#endif
#endif

1
docs/CREDITS
View File

@ -139,3 +139,4 @@ Alyssa Milburn
Kevin Ferrare
Anton Oleynikov
Mark Arigo
Magnus Westerlund

2
wps/rockbox_default.rwps Normal file
View File

@ -0,0 +1,2 @@
# Dummy file to allow Rockbox to reset to the default WPS config.
# Do not edit this file. It's never actually loaded by Rockbox.