diff options
author | Anton Oleynikov <len0x@rockbox.org> | 2005-11-19 20:45:32 +0000 |
---|---|---|
committer | Anton Oleynikov <len0x@rockbox.org> | 2005-11-19 20:45:32 +0000 |
commit | 2c836341edfc7336a4792f8085d00bf9c8fd7b47 (patch) | |
tree | 7d22d24dde92432680cdde163c5968a7be5ece94 /apps | |
parent | 5745e4106ce0d8e04bec0962af9701793698cb8d (diff) | |
download | rockbox-2c836341edfc7336a4792f8085d00bf9c8fd7b47.tar.gz rockbox-2c836341edfc7336a4792f8085d00bf9c8fd7b47.zip |
new icons for radio status
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8002 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/statusbar.c | 1 | ||||
-rw-r--r-- | apps/recorder/icons.c | 4 | ||||
-rw-r--r-- | apps/recorder/icons.h | 2 | ||||
-rw-r--r-- | apps/status.c | 4 | ||||
-rw-r--r-- | apps/status.h | 4 |
5 files changed, 11 insertions, 4 deletions
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index d279c220cc..dad317e9e2 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -226,6 +226,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
226 | bar->info.volume); | 226 | bar->info.volume); |
227 | gui_statusbar_icon_play_state(display, current_playmode() + | 227 | gui_statusbar_icon_play_state(display, current_playmode() + |
228 | Icon_Play); | 228 | Icon_Play); |
229 | |||
229 | switch (bar->info.repeat) { | 230 | switch (bar->info.repeat) { |
230 | #ifdef AB_REPEAT_ENABLE | 231 | #ifdef AB_REPEAT_ENABLE |
231 | case REPEAT_AB: | 232 | case REPEAT_AB: |
diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c index 66ac3cb727..baba77bc52 100644 --- a/apps/recorder/icons.c +++ b/apps/recorder/icons.c | |||
@@ -63,12 +63,14 @@ const unsigned char bitmap_icons_7x8[][7] = | |||
63 | {0x08,0x1c,0x3e,0x7f,0x1c,0x3e,0x7f}, /* Fast backward */ | 63 | {0x08,0x1c,0x3e,0x7f,0x1c,0x3e,0x7f}, /* Fast backward */ |
64 | {0x1c,0x3e,0x7f,0x7f,0x7f,0x3e,0x1c}, /* Record */ | 64 | {0x1c,0x3e,0x7f,0x7f,0x7f,0x3e,0x1c}, /* Record */ |
65 | {0x1c,0x3e,0x7f,0x00,0x7f,0x3e,0x1c}, /* Record pause */ | 65 | {0x1c,0x3e,0x7f,0x00,0x7f,0x3e,0x1c}, /* Record pause */ |
66 | {0x40,0xa0,0xa0,0xa0,0x7f,0x02,0x02}, /* Radio on */ | ||
67 | {0x42,0xa4,0xa8,0xb0,0x7f,0x22,0x42}, /* Radio mute */ | ||
66 | {0x44,0x4e,0x5f,0x44,0x44,0x44,0x38}, /* Repeat playmode */ | 68 | {0x44,0x4e,0x5f,0x44,0x44,0x44,0x38}, /* Repeat playmode */ |
67 | {0x44,0x4e,0x5f,0x44,0x38,0x02,0x7f}, /* Repeat-one playmode */ | 69 | {0x44,0x4e,0x5f,0x44,0x38,0x02,0x7f}, /* Repeat-one playmode */ |
68 | {0x3e,0x41,0x51,0x41,0x45,0x41,0x3e}, /* Shuffle playmode (dice) */ | 70 | {0x3e,0x41,0x51,0x41,0x45,0x41,0x3e}, /* Shuffle playmode (dice) */ |
69 | {0x04,0x0c,0x1c,0x3c,0x1c,0x0c,0x04}, /* Down-arrow */ | 71 | {0x04,0x0c,0x1c,0x3c,0x1c,0x0c,0x04}, /* Down-arrow */ |
70 | {0x20,0x30,0x38,0x3c,0x38,0x30,0x20}, /* Up-arrow */ | 72 | {0x20,0x30,0x38,0x3c,0x38,0x30,0x20}, /* Up-arrow */ |
71 | {0x7f,0x04,0x4e,0x5f,0x44,0x38,0x7f}, /* Repeat-AB playmode */ | 73 | {0x7f,0x04,0x4e,0x5f,0x44,0x38,0x7f} /* Repeat-AB playmode */ |
72 | }; | 74 | }; |
73 | 75 | ||
74 | #if CONFIG_LED == LED_VIRTUAL | 76 | #if CONFIG_LED == LED_VIRTUAL |
diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h index f4bd8c44cf..6ffcc9cb80 100644 --- a/apps/recorder/icons.h +++ b/apps/recorder/icons.h | |||
@@ -60,6 +60,8 @@ enum icons_7x8 { | |||
60 | Icon_FastBackward, | 60 | Icon_FastBackward, |
61 | Icon_Record, | 61 | Icon_Record, |
62 | Icon_RecPause, | 62 | Icon_RecPause, |
63 | Icon_Radio, | ||
64 | Icon_Radio_Mute, | ||
63 | Icon_Repeat, | 65 | Icon_Repeat, |
64 | Icon_RepeatOne, | 66 | Icon_RepeatOne, |
65 | Icon_Shuffle, | 67 | Icon_Shuffle, |
diff --git a/apps/status.c b/apps/status.c index 6a7c6a423d..00f8c5e1fe 100644 --- a/apps/status.c +++ b/apps/status.c | |||
@@ -126,10 +126,10 @@ int current_playmode(void) | |||
126 | audio_stat = get_radio_status(); | 126 | audio_stat = get_radio_status(); |
127 | 127 | ||
128 | if(audio_stat == FMRADIO_PLAYING) | 128 | if(audio_stat == FMRADIO_PLAYING) |
129 | return STATUS_PLAY; | 129 | return STATUS_RADIO; |
130 | 130 | ||
131 | if(audio_stat == FMRADIO_PAUSED) | 131 | if(audio_stat == FMRADIO_PAUSED) |
132 | return STATUS_PAUSE; | 132 | return STATUS_RADIO_PAUSE; |
133 | #endif | 133 | #endif |
134 | 134 | ||
135 | return STATUS_STOP; | 135 | return STATUS_STOP; |
diff --git a/apps/status.h b/apps/status.h index 29316f98b1..25d3166d78 100644 --- a/apps/status.h +++ b/apps/status.h | |||
@@ -42,7 +42,9 @@ enum playmode | |||
42 | STATUS_FASTFORWARD, | 42 | STATUS_FASTFORWARD, |
43 | STATUS_FASTBACKWARD, | 43 | STATUS_FASTBACKWARD, |
44 | STATUS_RECORD, | 44 | STATUS_RECORD, |
45 | STATUS_RECORD_PAUSE | 45 | STATUS_RECORD_PAUSE, |
46 | STATUS_RADIO, | ||
47 | STATUS_RADIO_PAUSE | ||
46 | }; | 48 | }; |
47 | 49 | ||
48 | void status_init(void); | 50 | void status_init(void); |