diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/gwps.c | 54 |
1 files changed, 25 insertions, 29 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 2ec1c4dcc7..5ffdf4e33f 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -134,7 +134,7 @@ long gui_wps_show(void) | |||
134 | while ( 1 ) | 134 | while ( 1 ) |
135 | { | 135 | { |
136 | bool audio_paused = (audio_status() & AUDIO_STATUS_PAUSE)?true:false; | 136 | bool audio_paused = (audio_status() & AUDIO_STATUS_PAUSE)?true:false; |
137 | 137 | ||
138 | /* did someone else (i.e power thread) change audio pause mode? */ | 138 | /* did someone else (i.e power thread) change audio pause mode? */ |
139 | if (wps_state.paused != audio_paused) { | 139 | if (wps_state.paused != audio_paused) { |
140 | wps_state.paused = audio_paused; | 140 | wps_state.paused = audio_paused; |
@@ -160,7 +160,7 @@ long gui_wps_show(void) | |||
160 | if(gui_wps[i].data->peak_meter_enabled) | 160 | if(gui_wps[i].data->peak_meter_enabled) |
161 | pm = true; | 161 | pm = true; |
162 | } | 162 | } |
163 | 163 | ||
164 | if (pm) { | 164 | if (pm) { |
165 | long next_refresh = current_tick; | 165 | long next_refresh = current_tick; |
166 | long next_big_refresh = current_tick + HZ / 5; | 166 | long next_big_refresh = current_tick + HZ / 5; |
@@ -171,7 +171,7 @@ long gui_wps_show(void) | |||
171 | break; | 171 | break; |
172 | } | 172 | } |
173 | peak_meter_peek(); | 173 | peak_meter_peek(); |
174 | sleep(0); /* Sleep until end of current tick. */ | 174 | sleep(0); /* Sleep until end of current tick. */ |
175 | 175 | ||
176 | if (TIME_AFTER(current_tick, next_refresh)) { | 176 | if (TIME_AFTER(current_tick, next_refresh)) { |
177 | FOR_NB_SCREENS(i) | 177 | FOR_NB_SCREENS(i) |
@@ -185,7 +185,7 @@ long gui_wps_show(void) | |||
185 | } | 185 | } |
186 | 186 | ||
187 | } | 187 | } |
188 | 188 | ||
189 | /* The peak meter is disabled | 189 | /* The peak meter is disabled |
190 | -> no additional screen updates needed */ | 190 | -> no additional screen updates needed */ |
191 | else { | 191 | else { |
@@ -408,7 +408,7 @@ long gui_wps_show(void) | |||
408 | if ((button == WPS_RC_PREV) && (lastbutton != WPS_RC_PREV_PRE)) | 408 | if ((button == WPS_RC_PREV) && (lastbutton != WPS_RC_PREV_PRE)) |
409 | break; | 409 | break; |
410 | #endif | 410 | #endif |
411 | #endif | 411 | #endif |
412 | left_lastclick = current_tick; | 412 | left_lastclick = current_tick; |
413 | update_track = true; | 413 | update_track = true; |
414 | 414 | ||
@@ -487,7 +487,7 @@ long gui_wps_show(void) | |||
487 | case WPS_NEXT: | 487 | case WPS_NEXT: |
488 | #ifdef WPS_NEXT_PRE | 488 | #ifdef WPS_NEXT_PRE |
489 | if (lastbutton != WPS_NEXT_PRE) | 489 | if (lastbutton != WPS_NEXT_PRE) |
490 | break; | 490 | break; |
491 | #endif | 491 | #endif |
492 | #ifdef WPS_RC_NEXT | 492 | #ifdef WPS_RC_NEXT |
493 | case WPS_RC_NEXT: | 493 | case WPS_RC_NEXT: |
@@ -607,15 +607,11 @@ long gui_wps_show(void) | |||
607 | /* pitch screen */ | 607 | /* pitch screen */ |
608 | #if CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == IRIVER_H100_PAD \ | 608 | #if CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == IRIVER_H100_PAD \ |
609 | || CONFIG_KEYPAD == IRIVER_H300_PAD | 609 | || CONFIG_KEYPAD == IRIVER_H300_PAD |
610 | case BUTTON_ON | BUTTON_UP: | 610 | case BUTTON_ON | BUTTON_REPEAT: |
611 | case BUTTON_ON | BUTTON_DOWN: | ||
612 | #if CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD | ||
613 | case BUTTON_ON | BUTTON_OFF: | ||
614 | #endif | ||
615 | #ifdef HAVE_LCD_COLOR | 611 | #ifdef HAVE_LCD_COLOR |
616 | lcd_set_backdrop(gui_wps[SCREEN_MAIN].data->old_backdrop); | 612 | lcd_set_backdrop(gui_wps[SCREEN_MAIN].data->old_backdrop); |
617 | #endif | 613 | #endif |
618 | if (2 == pitch_screen()) | 614 | if (1 == pitch_screen()) |
619 | return SYS_USB_CONNECTED; | 615 | return SYS_USB_CONNECTED; |
620 | #ifdef HAVE_LCD_COLOR | 616 | #ifdef HAVE_LCD_COLOR |
621 | if (gui_wps[SCREEN_MAIN].data->has_backdrop) | 617 | if (gui_wps[SCREEN_MAIN].data->has_backdrop) |
@@ -653,8 +649,8 @@ long gui_wps_show(void) | |||
653 | ab_set_A_marker(wps_state.id3->elapsed); | 649 | ab_set_A_marker(wps_state.id3->elapsed); |
654 | break; | 650 | break; |
655 | #endif | 651 | #endif |
656 | 652 | ||
657 | 653 | ||
658 | #ifdef WPS_AB_SET_A_MARKER | 654 | #ifdef WPS_AB_SET_A_MARKER |
659 | /* set A marker for A-B repeat */ | 655 | /* set A marker for A-B repeat */ |
660 | case WPS_AB_SET_A_MARKER: | 656 | case WPS_AB_SET_A_MARKER: |
@@ -717,7 +713,7 @@ long gui_wps_show(void) | |||
717 | restore = true; | 713 | restore = true; |
718 | break; | 714 | break; |
719 | #endif | 715 | #endif |
720 | 716 | ||
721 | case BUTTON_NONE: /* Timeout */ | 717 | case BUTTON_NONE: /* Timeout */ |
722 | update_track = true; | 718 | update_track = true; |
723 | break; | 719 | break; |
@@ -726,7 +722,7 @@ long gui_wps_show(void) | |||
726 | bookmark_autobookmark(); | 722 | bookmark_autobookmark(); |
727 | default_event_handler(SYS_POWEROFF); | 723 | default_event_handler(SYS_POWEROFF); |
728 | break; | 724 | break; |
729 | 725 | ||
730 | default: | 726 | default: |
731 | if(default_event_handler(button) == SYS_USB_CONNECTED) | 727 | if(default_event_handler(button) == SYS_USB_CONNECTED) |
732 | return SYS_USB_CONNECTED; | 728 | return SYS_USB_CONNECTED; |
@@ -748,7 +744,7 @@ long gui_wps_show(void) | |||
748 | if (global_settings.browse_current && | 744 | if (global_settings.browse_current && |
749 | wps_state.current_track_path[0] != '\0') | 745 | wps_state.current_track_path[0] != '\0') |
750 | set_current_file(wps_state.current_track_path); | 746 | set_current_file(wps_state.current_track_path); |
751 | 747 | ||
752 | return 0; | 748 | return 0; |
753 | } | 749 | } |
754 | update_track = false; | 750 | update_track = false; |
@@ -761,7 +757,7 @@ long gui_wps_show(void) | |||
761 | #endif | 757 | #endif |
762 | if (global_settings.fade_on_stop) | 758 | if (global_settings.fade_on_stop) |
763 | fade(0); | 759 | fade(0); |
764 | 760 | ||
765 | FOR_NB_SCREENS(i) | 761 | FOR_NB_SCREENS(i) |
766 | gui_wps[i].display->stop_scroll(); | 762 | gui_wps[i].display->stop_scroll(); |
767 | bookmark_autobookmark(); | 763 | bookmark_autobookmark(); |
@@ -778,10 +774,10 @@ long gui_wps_show(void) | |||
778 | if (global_settings.browse_current && | 774 | if (global_settings.browse_current && |
779 | wps_state.current_track_path[0] != '\0') | 775 | wps_state.current_track_path[0] != '\0') |
780 | set_current_file(wps_state.current_track_path); | 776 | set_current_file(wps_state.current_track_path); |
781 | 777 | ||
782 | return 0; | 778 | return 0; |
783 | } | 779 | } |
784 | 780 | ||
785 | if ( button ) | 781 | if ( button ) |
786 | ata_spin(); | 782 | ata_spin(); |
787 | 783 | ||
@@ -883,8 +879,8 @@ bool wps_data_load(struct wps_data *wps_data, | |||
883 | } | 879 | } |
884 | else | 880 | else |
885 | { | 881 | { |
886 | /* | 882 | /* |
887 | * Hardcode loading WPS_DEFAULTCFG to cause a reset ideally this | 883 | * Hardcode loading WPS_DEFAULTCFG to cause a reset ideally this |
888 | * wants to be a virtual file. Feel free to modify dirbrowse() | 884 | * wants to be a virtual file. Feel free to modify dirbrowse() |
889 | * if you're feeling brave. | 885 | * if you're feeling brave. |
890 | */ | 886 | */ |
@@ -893,7 +889,7 @@ bool wps_data_load(struct wps_data *wps_data, | |||
893 | wps_reset(wps_data); | 889 | wps_reset(wps_data); |
894 | global_settings.wps_file[0] = 0; | 890 | global_settings.wps_file[0] = 0; |
895 | return false; | 891 | return false; |
896 | } | 892 | } |
897 | 893 | ||
898 | #ifdef HAVE_REMOTE_LCD | 894 | #ifdef HAVE_REMOTE_LCD |
899 | if (! strcmp(buf, RWPS_DEFAULTCFG) ) | 895 | if (! strcmp(buf, RWPS_DEFAULTCFG) ) |
@@ -907,13 +903,13 @@ bool wps_data_load(struct wps_data *wps_data, | |||
907 | size_t bmpdirlen; | 903 | size_t bmpdirlen; |
908 | char *bmpdir = strrchr(buf, '.'); | 904 | char *bmpdir = strrchr(buf, '.'); |
909 | bmpdirlen = bmpdir - buf; | 905 | bmpdirlen = bmpdir - buf; |
910 | 906 | ||
911 | fd = open(buf, O_RDONLY); | 907 | fd = open(buf, O_RDONLY); |
912 | 908 | ||
913 | if (fd >= 0) | 909 | if (fd >= 0) |
914 | { | 910 | { |
915 | unsigned int start = 0; | 911 | unsigned int start = 0; |
916 | 912 | ||
917 | wps_reset(wps_data); | 913 | wps_reset(wps_data); |
918 | #ifdef HAVE_LCD_BITMAP | 914 | #ifdef HAVE_LCD_BITMAP |
919 | wps_data->img_buf_ptr = wps_data->img_buf; /* where in image buffer */ | 915 | wps_data->img_buf_ptr = wps_data->img_buf; /* where in image buffer */ |
@@ -928,7 +924,7 @@ bool wps_data_load(struct wps_data *wps_data, | |||
928 | buf, bmpdirlen)) | 924 | buf, bmpdirlen)) |
929 | { | 925 | { |
930 | start += strlen(&wps_data->format_buffer[start]); | 926 | start += strlen(&wps_data->format_buffer[start]); |
931 | 927 | ||
932 | if (start < sizeof(wps_data->format_buffer) - 1) | 928 | if (start < sizeof(wps_data->format_buffer) - 1) |
933 | { | 929 | { |
934 | wps_data->format_buffer[start++] = '\n'; | 930 | wps_data->format_buffer[start++] = '\n'; |
@@ -941,11 +937,11 @@ bool wps_data_load(struct wps_data *wps_data, | |||
941 | { | 937 | { |
942 | gui_wps_format(wps_data); | 938 | gui_wps_format(wps_data); |
943 | } | 939 | } |
944 | 940 | ||
945 | close(fd); | 941 | close(fd); |
946 | 942 | ||
947 | wps_data->wps_loaded = true; | 943 | wps_data->wps_loaded = true; |
948 | 944 | ||
949 | return start > 0; | 945 | return start > 0; |
950 | } | 946 | } |
951 | } | 947 | } |