diff options
-rw-r--r-- | apps/settings_menu.c | 2 | ||||
-rw-r--r-- | apps/wps-display.c | 13 | ||||
-rw-r--r-- | apps/wps.c | 7 | ||||
-rw-r--r-- | uisimulator/win32/Makefile.vc6 | 10 |
4 files changed, 20 insertions, 12 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index da2098e921..cb85af317c 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -150,7 +150,7 @@ static Menu timedate_set(void) | |||
150 | static Menu spindown(void) | 150 | static Menu spindown(void) |
151 | { | 151 | { |
152 | set_int("[Disk spindown]", "s", &global_settings.disk_spindown, | 152 | set_int("[Disk spindown]", "s", &global_settings.disk_spindown, |
153 | ata_spindown, 1, 1, 254 ); | 153 | ata_spindown, 1, 3, 254 ); |
154 | return MENU_OK; | 154 | return MENU_OK; |
155 | } | 155 | } |
156 | 156 | ||
diff --git a/apps/wps-display.c b/apps/wps-display.c index f901f8fae0..5155764b9d 100644 --- a/apps/wps-display.c +++ b/apps/wps-display.c | |||
@@ -327,7 +327,7 @@ static char* get_tag(struct mp3entry* id3, | |||
327 | 327 | ||
328 | case 'r': /* Remaining Time in Song */ | 328 | case 'r': /* Remaining Time in Song */ |
329 | flags->dynamic = true; | 329 | flags->dynamic = true; |
330 | format_time(buf, buf_size, id3->length - id3->elapsed + ff_rewind_count); | 330 | format_time(buf, buf_size, id3->length - id3->elapsed - ff_rewind_count); |
331 | return buf; | 331 | return buf; |
332 | 332 | ||
333 | case 't': /* Total Time */ | 333 | case 't': /* Total Time */ |
@@ -645,10 +645,15 @@ bool draw_player_progress(struct mp3entry* id3, int ff_rewwind_count) | |||
645 | 645 | ||
646 | memset(binline, 1, sizeof binline); | 646 | memset(binline, 1, sizeof binline); |
647 | memset(player_progressbar, 1, sizeof player_progressbar); | 647 | memset(player_progressbar, 1, sizeof player_progressbar); |
648 | if(wps_time_countup == false) | 648 | if(id3->elapsed >= id3->length) |
649 | songpos = ((id3->elapsed - ff_rewwind_count) * 36) / id3->length; | 649 | songpos = 0; |
650 | else | 650 | else |
651 | songpos = ((id3->elapsed + ff_rewwind_count) * 36) / id3->length; | 651 | { |
652 | if(wps_time_countup == false) | ||
653 | songpos = ((id3->elapsed - ff_rewwind_count) * 36) / id3->length; | ||
654 | else | ||
655 | songpos = ((id3->elapsed + ff_rewwind_count) * 36) / id3->length; | ||
656 | } | ||
652 | for (i=0; i < songpos; i++) | 657 | for (i=0; i < songpos; i++) |
653 | binline[i] = 0; | 658 | binline[i] = 0; |
654 | 659 | ||
diff --git a/apps/wps.c b/apps/wps.c index e894cad774..1bd2c6405d 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -887,9 +887,6 @@ int wps_show(void) | |||
887 | 887 | ||
888 | /* prev / restart */ | 888 | /* prev / restart */ |
889 | case BUTTON_LEFT | BUTTON_REL: | 889 | case BUTTON_LEFT | BUTTON_REL: |
890 | if ( lastbutton != BUTTON_LEFT ) | ||
891 | break; | ||
892 | |||
893 | if (!id3 || (id3->elapsed < 3*1000)) | 890 | if (!id3 || (id3->elapsed < 3*1000)) |
894 | mpeg_prev(); | 891 | mpeg_prev(); |
895 | else { | 892 | else { |
@@ -905,8 +902,6 @@ int wps_show(void) | |||
905 | 902 | ||
906 | /* next */ | 903 | /* next */ |
907 | case BUTTON_RIGHT | BUTTON_REL: | 904 | case BUTTON_RIGHT | BUTTON_REL: |
908 | if ( lastbutton != BUTTON_RIGHT ) | ||
909 | break; | ||
910 | mpeg_next(); | 905 | mpeg_next(); |
911 | break; | 906 | break; |
912 | 907 | ||
@@ -941,7 +936,7 @@ int wps_show(void) | |||
941 | #ifdef HAVE_RECORDER_KEYPAD | 936 | #ifdef HAVE_RECORDER_KEYPAD |
942 | case BUTTON_OFF: | 937 | case BUTTON_OFF: |
943 | #else | 938 | #else |
944 | case BUTTON_STOP: | 939 | case BUTTON_STOP | BUTTON_REL: |
945 | #endif | 940 | #endif |
946 | #ifdef HAVE_LCD_CHARCELLS | 941 | #ifdef HAVE_LCD_CHARCELLS |
947 | lcd_icon(ICON_RECORD, false); | 942 | lcd_icon(ICON_RECORD, false); |
diff --git a/uisimulator/win32/Makefile.vc6 b/uisimulator/win32/Makefile.vc6 index e03d4ade4d..43e6990d38 100644 --- a/uisimulator/win32/Makefile.vc6 +++ b/uisimulator/win32/Makefile.vc6 | |||
@@ -17,21 +17,28 @@ | |||
17 | # | 17 | # |
18 | ############################################################################ | 18 | ############################################################################ |
19 | 19 | ||
20 | |||
21 | #CHANGE THIS FIELD TO SPECIFY RECORDER OR PLAYER | ||
22 | TARGET = RECORDER | ||
23 | |||
20 | FIRMWAREDIR = ../../firmware | 24 | FIRMWAREDIR = ../../firmware |
21 | DRIVERS = $(FIRMWAREDIR)/drivers | 25 | DRIVERS = $(FIRMWAREDIR)/drivers |
22 | COMMON = $(FIRMWAREDIR)/common | 26 | COMMON = $(FIRMWAREDIR)/common |
23 | APPSCOMMON = ../common | 27 | APPSCOMMON = ../common |
24 | SIMDIR = ../win32/ | 28 | SIMDIR = ../win32/ |
25 | APPDIR = ../../apps/ | 29 | APPDIR = ../../apps/ |
30 | PLAYERDIR = $(APPDIR)player/ | ||
26 | RECDIR = $(APPDIR)recorder/ | 31 | RECDIR = $(APPDIR)recorder/ |
27 | RM = del | 32 | RM = del |
28 | 33 | ||
29 | !IF ("$(TARGET)" == "RECORDER") | 34 | !IF ("$(TARGET)" == "RECORDER") |
30 | DISPLAY = -DHAVE_LCD_BITMAP | 35 | DISPLAY = -DHAVE_LCD_BITMAP |
31 | KEYPAD = -DHAVE_RECORDER_KEYPAD | 36 | KEYPAD = -DHAVE_RECORDER_KEYPAD |
37 | MODEL_SPECIFIC_DIR = $(RECDIR) | ||
32 | !ELSE | 38 | !ELSE |
33 | DISPLAY = -DHAVE_LCD_CHARCELLS | 39 | DISPLAY = -DHAVE_LCD_CHARCELLS |
34 | KEYPAD = -DHAVE_PLAYER_KEYPAD | 40 | KEYPAD = -DHAVE_PLAYER_KEYPAD |
41 | MODEL_SPECIFIC_DIR = $(PLAYERDIR) | ||
35 | !ENDIF | 42 | !ENDIF |
36 | 43 | ||
37 | CC = cl | 44 | CC = cl |
@@ -39,7 +46,7 @@ RC = rc | |||
39 | LINK = link | 46 | LINK = link |
40 | DEFINES = -DWIN32 -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"WIN32SIM\" | 47 | DEFINES = -DWIN32 -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"WIN32SIM\" |
41 | LDFLAGS = /OUT:uisw32.exe /SUBSYSTEM:windows /NOLOGO /MACHINE:IX86 kernel32.lib user32.lib gdi32.lib | 48 | LDFLAGS = /OUT:uisw32.exe /SUBSYSTEM:windows /NOLOGO /MACHINE:IX86 kernel32.lib user32.lib gdi32.lib |
42 | INCLUDES = -I$(FIRMWAREDIR) -I$(DRIVERS) -I$(COMMON) -I$(APPSCOMMON) -I$(SIMDIR) -I$(APPDIR) -I$(RECDIR) | 49 | INCLUDES = -I$(FIRMWAREDIR) -I$(DRIVERS) -I$(COMMON) -I$(APPSCOMMON) -I$(SIMDIR) -I$(APPDIR) -I$(MODEL_SPECIFIC_DIR) |
43 | LIBS = /DEFAULTLIB:gdi32.lib /DEFAULTLIB:user32.lib | 50 | LIBS = /DEFAULTLIB:gdi32.lib /DEFAULTLIB:user32.lib |
44 | 51 | ||
45 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c | 52 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c |
@@ -47,6 +54,7 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c | |||
47 | SRCS = *.c \ | 54 | SRCS = *.c \ |
48 | $(DRIVERS)/lcd.c $(DRIVERS)/power.c \ | 55 | $(DRIVERS)/lcd.c $(DRIVERS)/power.c \ |
49 | $(APPDIR)*.c \ | 56 | $(APPDIR)*.c \ |
57 | $(PLAYERDIR)*.c \ | ||
50 | $(APPSCOMMON)/*.c \ | 58 | $(APPSCOMMON)/*.c \ |
51 | $(FIRMWAREDIR)/chartables.c $(FIRMWAREDIR)/id3.c $(FIRMWAREDIR)/usb.c $(FIRMWAREDIR)/mpeg.c \ | 59 | $(FIRMWAREDIR)/chartables.c $(FIRMWAREDIR)/id3.c $(FIRMWAREDIR)/usb.c $(FIRMWAREDIR)/mpeg.c \ |
52 | $(FIRMWAREDIR)/powermgmt.c \ | 60 | $(FIRMWAREDIR)/powermgmt.c \ |