len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

MIDI player: Allow pause and seeking during pause. Print out the play/pause/seek position in seconds.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15985 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Stepan Moskovchenko 2008-01-02 06:35:59 +00:00
parent a39039d80b
commit 59acdc336b
2 changed files with 62 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

40
apps/plugins/midi/midiplay.c
View file

@ -33,6 +33,7 @@ PLUGIN_IRAM_DECLARE
#define BTN_UP BUTTON_UP #define BTN_UP BUTTON_UP
#define BTN_DOWN BUTTON_DOWN #define BTN_DOWN BUTTON_DOWN
#define BTN_LEFT BUTTON_LEFT #define BTN_LEFT BUTTON_LEFT
#define BTN_PLAY BUTTON_PLAY
#elif CONFIG_KEYPAD == ONDIO_PAD #elif CONFIG_KEYPAD == ONDIO_PAD
#define BTN_QUIT BUTTON_OFF #define BTN_QUIT BUTTON_OFF
@ -40,6 +41,8 @@ PLUGIN_IRAM_DECLARE
#define BTN_UP BUTTON_UP #define BTN_UP BUTTON_UP
#define BTN_DOWN BUTTON_DOWN #define BTN_DOWN BUTTON_DOWN
#define BTN_LEFT BUTTON_LEFT #define BTN_LEFT BUTTON_LEFT
#define BTN_PLAY (BUTTON_MENU | BUTTON_OFF)
#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
#define BTN_QUIT BUTTON_OFF #define BTN_QUIT BUTTON_OFF
@ -47,8 +50,8 @@ PLUGIN_IRAM_DECLARE
#define BTN_UP BUTTON_UP #define BTN_UP BUTTON_UP
#define BTN_DOWN BUTTON_DOWN #define BTN_DOWN BUTTON_DOWN
#define BTN_LEFT BUTTON_LEFT #define BTN_LEFT BUTTON_LEFT
#define BTN_RC_QUIT BUTTON_RC_STOP #define BTN_RC_QUIT BUTTON_RC_STOP
#define BTN_PLAY BUTTON_ON
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \
(CONFIG_KEYPAD == IPOD_1G2G_PAD) (CONFIG_KEYPAD == IPOD_1G2G_PAD)
@ -57,6 +60,8 @@ PLUGIN_IRAM_DECLARE
#define BTN_LEFT BUTTON_LEFT #define BTN_LEFT BUTTON_LEFT
#define BTN_UP BUTTON_SCROLL_FWD #define BTN_UP BUTTON_SCROLL_FWD
#define BTN_DOWN BUTTON_SCROLL_BACK #define BTN_DOWN BUTTON_SCROLL_BACK
#define BTN_PLAY BUTTON_PLAY
#elif (CONFIG_KEYPAD == GIGABEAT_PAD) #elif (CONFIG_KEYPAD == GIGABEAT_PAD)
#define BTN_QUIT BUTTON_POWER #define BTN_QUIT BUTTON_POWER
@ -64,6 +69,8 @@ PLUGIN_IRAM_DECLARE
#define BTN_LEFT BUTTON_LEFT #define BTN_LEFT BUTTON_LEFT
#define BTN_UP BUTTON_UP #define BTN_UP BUTTON_UP
#define BTN_DOWN BUTTON_DOWN #define BTN_DOWN BUTTON_DOWN
#define BTN_PAUSE BUTTON_A
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD)
@ -72,6 +79,8 @@ PLUGIN_IRAM_DECLARE
#define BTN_LEFT BUTTON_LEFT #define BTN_LEFT BUTTON_LEFT
#define BTN_UP BUTTON_UP #define BTN_UP BUTTON_UP
#define BTN_DOWN BUTTON_DOWN #define BTN_DOWN BUTTON_DOWN
#define BTN_PLAY BUTTON_REC
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define BTN_QUIT BUTTON_POWER #define BTN_QUIT BUTTON_POWER
@ -79,6 +88,8 @@ PLUGIN_IRAM_DECLARE
#define BTN_LEFT BUTTON_LEFT #define BTN_LEFT BUTTON_LEFT
#define BTN_UP BUTTON_UP #define BTN_UP BUTTON_UP
#define BTN_DOWN BUTTON_DOWN #define BTN_DOWN BUTTON_DOWN
#define BTN_PLAY BUTTON_PLAY
#elif CONFIG_KEYPAD == IRIVER_H10_PAD #elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define BTN_QUIT BUTTON_POWER #define BTN_QUIT BUTTON_POWER
@ -86,6 +97,8 @@ PLUGIN_IRAM_DECLARE
#define BTN_LEFT BUTTON_LEFT #define BTN_LEFT BUTTON_LEFT
#define BTN_UP BUTTON_SCROLL_UP #define BTN_UP BUTTON_SCROLL_UP
#define BTN_DOWN BUTTON_SCROLL_DOWN #define BTN_DOWN BUTTON_SCROLL_DOWN
#define BTN_PLAY BUTTON_PLAY
#elif CONFIG_KEYPAD == MROBE500_PAD #elif CONFIG_KEYPAD == MROBE500_PAD
#define BTN_QUIT BUTTON_POWER #define BTN_QUIT BUTTON_POWER
@ -93,6 +106,8 @@ PLUGIN_IRAM_DECLARE
#define BTN_LEFT BUTTON_LEFT #define BTN_LEFT BUTTON_LEFT
#define BTN_UP BUTTON_RC_PLAY #define BTN_UP BUTTON_RC_PLAY
#define BTN_DOWN BUTTON_RC_DOWN #define BTN_DOWN BUTTON_RC_DOWN
#define BTN_PLAY BUTTON_RC_HEART
#endif #endif
@ -274,6 +289,7 @@ static int midimain(void * filename)
synthbuf(); synthbuf();
rb->pcm_play_data(&get_more, NULL, 0); rb->pcm_play_data(&get_more, NULL, 0);
int isPlaying = 1; /* 0 = paused */
int vol=0; int vol=0;
while(!quit) while(!quit)
@ -318,8 +334,10 @@ static int midimain(void * filename)
/* but run through the tracks without the synth running */ /* but run through the tracks without the synth running */
rb->pcm_play_stop(); rb->pcm_play_stop();
seekBackward(5); seekBackward(5);
rb->pcm_play_data(&get_more, NULL, 0); printf("Rewind to %d:%02d\n", playingTime/60, playingTime%60);
if(isPlaying)
rb->pcm_play_data(&get_more, NULL, 0);
break; break;
} }
@ -327,10 +345,28 @@ static int midimain(void * filename)
{ {
rb->pcm_play_stop(); rb->pcm_play_stop();
seekForward(5); seekForward(5);
printf("Skip to %d:%02d\n", playingTime/60, playingTime%60);
if(isPlaying)
rb->pcm_play_data(&get_more, NULL, 0); rb->pcm_play_data(&get_more, NULL, 0);
break; break;
} }
case BTN_PLAY:
{
if(isPlaying == 1)
{
printf("Paused at %d:%02d\n", playingTime/60, playingTime%60);
isPlaying = 0;
rb->pcm_play_stop();
} else
{
printf("Playing from %d:%02d\n", playingTime/60, playingTime%60);
isPlaying = 1;
rb->pcm_play_data(&get_more, NULL, 0);
}
break;
}
#ifdef BTN_RC_QUIT #ifdef BTN_RC_QUIT
case BTN_RC_QUIT: case BTN_RC_QUIT:

7
apps/plugins/midi/midiutil.c
View file

@ -144,6 +144,13 @@ int printf(const char *fmt, ...)
ok = rb->vsnprintf(p_buf,sizeof(p_buf), fmt, ap); ok = rb->vsnprintf(p_buf,sizeof(p_buf), fmt, ap);
va_end(ap); va_end(ap);
int i=0;
/* Device LCDs display newlines funny. */
for(i=0; p_buf[i]!=0; i++)
if(p_buf[i] == '\n')
p_buf[i] = ' ';
rb->lcd_putsxy(1,p_xtpt, (unsigned char *)p_buf); rb->lcd_putsxy(1,p_xtpt, (unsigned char *)p_buf);
rb->lcd_update(); rb->lcd_update();