len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-13 15:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added tracknum and playlist to id3 browser (Magnus Holmgren). Enabled id3 browser on recorder.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2249 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2002-09-09 23:18:44 +00:00
parent f50b4fc20c
commit 889197dbf5
1 changed files with 47 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

59
apps/wps.c
View file

@ -178,12 +178,11 @@ static void handle_usb(void)
#endif #endif
} }
#ifdef HAVE_PLAYER_KEYPAD static int browse_id3(void)
int player_id3_show(void)
{ {
int button; int button;
int menu_pos = 0; int menu_pos = 0;
int menu_max = 6; int menu_max = 8;
bool exit = false; bool exit = false;
char scroll_text[MAX_PATH]; char scroll_text[MAX_PATH];
@ -191,6 +190,7 @@ int player_id3_show(void)
lcd_clear_display(); lcd_clear_display();
lcd_puts(0, 0, "-ID3 Info- "); lcd_puts(0, 0, "-ID3 Info- ");
lcd_puts(0, 1, "--Screen-- "); lcd_puts(0, 1, "--Screen-- ");
lcd_update();
sleep(HZ); sleep(HZ);
while (!exit) while (!exit)
@ -217,6 +217,21 @@ int player_id3_show(void)
break; break;
case 3: case 3:
lcd_puts(0, 0, "[Tracknum]");
if (id3->tracknum)
{
snprintf(scroll_text,sizeof(scroll_text), "%d",
id3->tracknum);
lcd_puts_scroll(0, 1, scroll_text);
}
else
{
lcd_puts_scroll(0, 1, "<no tracknum>");
}
break;
case 4:
lcd_puts(0, 0, "[Length]"); lcd_puts(0, 0, "[Length]");
snprintf(scroll_text,sizeof(scroll_text), "%d:%02d", snprintf(scroll_text,sizeof(scroll_text), "%d:%02d",
id3->length / 60000, id3->length / 60000,
@ -224,21 +239,29 @@ int player_id3_show(void)
lcd_puts(0, 1, scroll_text); lcd_puts(0, 1, scroll_text);
break; break;
case 4: case 5:
lcd_puts(0, 0, "[Playlist]");
snprintf(scroll_text,sizeof(scroll_text), "%d/%d",
id3->index + 1, playlist.amount);
lcd_puts_scroll(0, 1, scroll_text);
break;
case 6:
lcd_puts(0, 0, "[Bitrate]"); lcd_puts(0, 0, "[Bitrate]");
snprintf(scroll_text,sizeof(scroll_text), "%d kbps", snprintf(scroll_text,sizeof(scroll_text), "%d kbps",
id3->bitrate); id3->bitrate);
lcd_puts(0, 1, scroll_text); lcd_puts(0, 1, scroll_text);
break; break;
case 5: case 7:
lcd_puts(0, 0, "[Frequency]"); lcd_puts(0, 0, "[Frequency]");
snprintf(scroll_text,sizeof(scroll_text), "%d kHz", snprintf(scroll_text,sizeof(scroll_text), "%d Hz",
id3->frequency); id3->frequency);
lcd_puts(0, 1, scroll_text); lcd_puts(0, 1, scroll_text);
break; break;
case 6: case 8:
lcd_puts(0, 0, "[Path]"); lcd_puts(0, 0, "[Path]");
lcd_puts_scroll(0, 1, id3->path); lcd_puts_scroll(0, 1, id3->path);
break; break;
@ -250,6 +273,9 @@ int player_id3_show(void)
switch(button) switch(button)
{ {
case BUTTON_LEFT: case BUTTON_LEFT:
#ifdef HAVE_RECORDER_KEYPAD
case BUTTON_UP:
#endif
if (menu_pos > 0) if (menu_pos > 0)
menu_pos--; menu_pos--;
else else
@ -257,6 +283,9 @@ int player_id3_show(void)
break; break;
case BUTTON_RIGHT: case BUTTON_RIGHT:
#ifdef HAVE_RECORDER_KEYPAD
case BUTTON_DOWN:
#endif
if (menu_pos < menu_max) if (menu_pos < menu_max)
menu_pos++; menu_pos++;
else else
@ -266,7 +295,11 @@ int player_id3_show(void)
case BUTTON_REPEAT: case BUTTON_REPEAT:
break; break;
#ifdef HAVE_PLAYER_KEYPAD
case BUTTON_STOP: case BUTTON_STOP:
#else
case BUTTON_OFF:
#endif
case BUTTON_PLAY: case BUTTON_PLAY:
lcd_stop_scroll(); lcd_stop_scroll();
wps_display(id3); wps_display(id3);
@ -283,7 +316,6 @@ int player_id3_show(void)
} }
return 0; return 0;
} }
#endif
static bool ffwd_rew(int button) static bool ffwd_rew(int button)
{ {
@ -563,17 +595,20 @@ static bool menu(void)
/* show id3 tags */ /* show id3 tags */
case BUTTON_MENU | BUTTON_ON: case BUTTON_MENU | BUTTON_ON:
lcd_stop_scroll();
lcd_icon(ICON_PARAM, true); lcd_icon(ICON_PARAM, true);
lcd_icon(ICON_AUDIO, true); lcd_icon(ICON_AUDIO, true);
if(player_id3_show() == SYS_USB_CONNECTED) #else
case BUTTON_F1 | BUTTON_ON:
#endif
if(browse_id3() == SYS_USB_CONNECTED)
return true; return true;
#ifdef HAVE_PLAYER_KEYPAD
lcd_icon(ICON_PARAM, false); lcd_icon(ICON_PARAM, false);
lcd_icon(ICON_AUDIO, true); lcd_icon(ICON_AUDIO, true);
#endif
wps_display(id3); wps_display(id3);
exit = true; exit = true;
break; break;
#endif
case SYS_USB_CONNECTED: case SYS_USB_CONNECTED:
handle_usb(); handle_usb();