diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/status.c | 74 |
1 files changed, 38 insertions, 36 deletions
diff --git a/apps/status.c b/apps/status.c index 1ff3f926d8..8473004a1a 100644 --- a/apps/status.c +++ b/apps/status.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "thread.h" | 23 | #include "thread.h" |
24 | #include "settings.h" | 24 | #include "settings.h" |
25 | #include "status.h" | 25 | #include "status.h" |
26 | 26 | #include "mpeg.h" | |
27 | static enum playmode current_mode; | 27 | static enum playmode current_mode; |
28 | 28 | ||
29 | void status_init(void) | 29 | void status_init(void) |
@@ -40,60 +40,62 @@ void status_draw(void) | |||
40 | { | 40 | { |
41 | #if defined(HAVE_LCD_CHARCELLS) && !defined(SIMULATOR) | 41 | #if defined(HAVE_LCD_CHARCELLS) && !defined(SIMULATOR) |
42 | int battlevel = battery_level(); | 42 | int battlevel = battery_level(); |
43 | int volume = mpeg_val2phys(SOUND_VOLUME, global_settings.volume); | ||
43 | 44 | ||
44 | lcd_icon(ICON_BATTERY, true); | 45 | lcd_icon(ICON_BATTERY, true); |
45 | if(battlevel > 25) | 46 | if(battlevel > 25) |
46 | lcd_icon(ICON_BATTERY_1, true); | 47 | lcd_icon(ICON_BATTERY_1, true); |
47 | else | 48 | else |
48 | lcd_icon(ICON_BATTERY_1, false); | 49 | lcd_icon(ICON_BATTERY_1, false); |
49 | if(battlevel > 50) | 50 | if(battlevel > 50) |
50 | lcd_icon(ICON_BATTERY_2, true); | 51 | lcd_icon(ICON_BATTERY_2, true); |
51 | else | 52 | else |
52 | lcd_icon(ICON_BATTERY_2, false); | 53 | lcd_icon(ICON_BATTERY_2, false); |
53 | if(battlevel > 75) | 54 | if(battlevel > 75) |
54 | lcd_icon(ICON_BATTERY_3, true); | 55 | lcd_icon(ICON_BATTERY_3, true); |
55 | else | 56 | else |
56 | lcd_icon(ICON_BATTERY_3, false); | 57 | lcd_icon(ICON_BATTERY_3, false); |
57 | 58 | ||
58 | 59 | ||
60 | DEBUGF("vol: %d\n", volume); | ||
59 | lcd_icon(ICON_VOLUME, true); | 61 | lcd_icon(ICON_VOLUME, true); |
60 | if(global_settings.volume > 10) | 62 | if(volume > 10) |
61 | lcd_icon(ICON_VOLUME_1, true); | 63 | lcd_icon(ICON_VOLUME_1, true); |
62 | else | 64 | else |
63 | lcd_icon(ICON_VOLUME_1, false); | 65 | lcd_icon(ICON_VOLUME_1, false); |
64 | if(global_settings.volume > 30) | 66 | if(volume > 30) |
65 | lcd_icon(ICON_VOLUME_2, true); | 67 | lcd_icon(ICON_VOLUME_2, true); |
66 | else | 68 | else |
67 | lcd_icon(ICON_VOLUME_2, false); | 69 | lcd_icon(ICON_VOLUME_2, false); |
68 | if(global_settings.volume > 50) | 70 | if(volume > 50) |
69 | lcd_icon(ICON_VOLUME_3, true); | 71 | lcd_icon(ICON_VOLUME_3, true); |
70 | else | 72 | else |
71 | lcd_icon(ICON_VOLUME_3, false); | 73 | lcd_icon(ICON_VOLUME_3, false); |
72 | if(global_settings.volume > 70) | 74 | if(volume > 70) |
73 | lcd_icon(ICON_VOLUME_4, true); | 75 | lcd_icon(ICON_VOLUME_4, true); |
74 | else | 76 | else |
75 | lcd_icon(ICON_VOLUME_4, false); | 77 | lcd_icon(ICON_VOLUME_4, false); |
76 | if(global_settings.volume > 90) | 78 | if(volume > 90) |
77 | lcd_icon(ICON_VOLUME_5, true); | 79 | lcd_icon(ICON_VOLUME_5, true); |
78 | else | 80 | else |
79 | lcd_icon(ICON_VOLUME_5, false); | 81 | lcd_icon(ICON_VOLUME_5, false); |
80 | 82 | ||
81 | switch(current_mode) | 83 | switch(current_mode) |
82 | { | 84 | { |
83 | case STATUS_PLAY: | 85 | case STATUS_PLAY: |
84 | lcd_icon(ICON_PLAY, true); | 86 | lcd_icon(ICON_PLAY, true); |
85 | lcd_icon(ICON_PAUSE, false); | 87 | lcd_icon(ICON_PAUSE, false); |
86 | break; | 88 | break; |
87 | 89 | ||
88 | case STATUS_STOP: | 90 | case STATUS_STOP: |
89 | lcd_icon(ICON_PLAY, false); | 91 | lcd_icon(ICON_PLAY, false); |
90 | lcd_icon(ICON_PAUSE, false); | 92 | lcd_icon(ICON_PAUSE, false); |
91 | break; | 93 | break; |
92 | 94 | ||
93 | case STATUS_PAUSE: | 95 | case STATUS_PAUSE: |
94 | lcd_icon(ICON_PLAY, false); | 96 | lcd_icon(ICON_PLAY, false); |
95 | lcd_icon(ICON_PAUSE, true); | 97 | lcd_icon(ICON_PAUSE, true); |
96 | break; | 98 | break; |
97 | } | 99 | } |
98 | #endif | 100 | #endif |
99 | } | 101 | } |