diff options
author | Justin Heiner <jheiner@rockbox.org> | 2002-08-17 00:23:36 +0000 |
---|---|---|
committer | Justin Heiner <jheiner@rockbox.org> | 2002-08-17 00:23:36 +0000 |
commit | 80743ff20c73d7114f5bba9e797bb8c3754935d4 (patch) | |
tree | 753826853f9e1f8112ac8e9b9bf8c7a7e67d52c7 /apps | |
parent | 152c023f95b922ace1f2b2509ac793792b80fe48 (diff) | |
download | rockbox-80743ff20c73d7114f5bba9e797bb8c3754935d4.tar.gz rockbox-80743ff20c73d7114f5bba9e797bb8c3754935d4.zip |
WPS in player now displays volume level while changing it
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1791 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/wps.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/apps/wps.c b/apps/wps.c index d8ec1212f2..2183d3b8ed 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -327,6 +327,21 @@ static void display_file_time(unsigned int elapsed, unsigned int length) | |||
327 | #endif | 327 | #endif |
328 | } | 328 | } |
329 | 329 | ||
330 | void display_volume_level(int vol_level) | ||
331 | { | ||
332 | char buffer[32]; | ||
333 | |||
334 | lcd_stop_scroll(); | ||
335 | lcd_clear_display(); | ||
336 | snprintf(buffer,sizeof(buffer),"Vol: %d %s", vol_level * 2, "%"); | ||
337 | |||
338 | #ifdef HAVE_LCD_CHARCELLS | ||
339 | lcd_puts(0, 0, buffer); | ||
340 | #else | ||
341 | lcd_puts(2, 3, buffer); | ||
342 | #endif | ||
343 | } | ||
344 | |||
330 | void display_keylock_text(bool locked) | 345 | void display_keylock_text(bool locked) |
331 | { | 346 | { |
332 | lcd_stop_scroll(); | 347 | lcd_stop_scroll(); |
@@ -585,6 +600,12 @@ int wps_show(void) | |||
585 | case BUTTON_LEFT | BUTTON_REL: | 600 | case BUTTON_LEFT | BUTTON_REL: |
586 | if (!keys_locked) | 601 | if (!keys_locked) |
587 | { | 602 | { |
603 | if (menu_button_is_down) | ||
604 | { | ||
605 | sleep(HZ/2); | ||
606 | draw_screen(id3); | ||
607 | } | ||
608 | |||
588 | if (ff_rewind) | 609 | if (ff_rewind) |
589 | { | 610 | { |
590 | /* rewind */ | 611 | /* rewind */ |
@@ -620,6 +641,12 @@ int wps_show(void) | |||
620 | case BUTTON_RIGHT | BUTTON_REL: | 641 | case BUTTON_RIGHT | BUTTON_REL: |
621 | if (!keys_locked) | 642 | if (!keys_locked) |
622 | { | 643 | { |
644 | if (menu_button_is_down) | ||
645 | { | ||
646 | sleep(HZ/2); | ||
647 | draw_screen(id3); | ||
648 | } | ||
649 | |||
623 | if (ff_rewind) | 650 | if (ff_rewind) |
624 | { | 651 | { |
625 | /* fast forward */ | 652 | /* fast forward */ |
@@ -661,6 +688,9 @@ int wps_show(void) | |||
661 | if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME)) | 688 | if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME)) |
662 | global_settings.volume = mpeg_sound_min(SOUND_VOLUME); | 689 | global_settings.volume = mpeg_sound_min(SOUND_VOLUME); |
663 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); | 690 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); |
691 | #ifdef HAVE_PLAYER_KEYPAD | ||
692 | display_volume_level(global_settings.volume); | ||
693 | #endif | ||
664 | status_draw(); | 694 | status_draw(); |
665 | settings_save(); | 695 | settings_save(); |
666 | break; | 696 | break; |
@@ -672,6 +702,9 @@ int wps_show(void) | |||
672 | if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME)) | 702 | if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME)) |
673 | global_settings.volume = mpeg_sound_max(SOUND_VOLUME); | 703 | global_settings.volume = mpeg_sound_max(SOUND_VOLUME); |
674 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); | 704 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); |
705 | #ifdef HAVE_PLAYER_KEYPAD | ||
706 | display_volume_level(global_settings.volume); | ||
707 | #endif | ||
675 | status_draw(); | 708 | status_draw(); |
676 | settings_save(); | 709 | settings_save(); |
677 | break; | 710 | break; |