From 2c836341edfc7336a4792f8085d00bf9c8fd7b47 Mon Sep 17 00:00:00 2001 From: Anton Oleynikov Date: Sat, 19 Nov 2005 20:45:32 +0000 Subject: new icons for radio status git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8002 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/statusbar.c | 1 + apps/recorder/icons.c | 4 +++- apps/recorder/icons.h | 2 ++ apps/status.c | 4 ++-- 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) bar->info.volume); gui_statusbar_icon_play_state(display, current_playmode() + Icon_Play); + switch (bar->info.repeat) { #ifdef AB_REPEAT_ENABLE 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] = {0x08,0x1c,0x3e,0x7f,0x1c,0x3e,0x7f}, /* Fast backward */ {0x1c,0x3e,0x7f,0x7f,0x7f,0x3e,0x1c}, /* Record */ {0x1c,0x3e,0x7f,0x00,0x7f,0x3e,0x1c}, /* Record pause */ + {0x40,0xa0,0xa0,0xa0,0x7f,0x02,0x02}, /* Radio on */ + {0x42,0xa4,0xa8,0xb0,0x7f,0x22,0x42}, /* Radio mute */ {0x44,0x4e,0x5f,0x44,0x44,0x44,0x38}, /* Repeat playmode */ {0x44,0x4e,0x5f,0x44,0x38,0x02,0x7f}, /* Repeat-one playmode */ {0x3e,0x41,0x51,0x41,0x45,0x41,0x3e}, /* Shuffle playmode (dice) */ {0x04,0x0c,0x1c,0x3c,0x1c,0x0c,0x04}, /* Down-arrow */ {0x20,0x30,0x38,0x3c,0x38,0x30,0x20}, /* Up-arrow */ - {0x7f,0x04,0x4e,0x5f,0x44,0x38,0x7f}, /* Repeat-AB playmode */ + {0x7f,0x04,0x4e,0x5f,0x44,0x38,0x7f} /* Repeat-AB playmode */ }; #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 { Icon_FastBackward, Icon_Record, Icon_RecPause, + Icon_Radio, + Icon_Radio_Mute, Icon_Repeat, Icon_RepeatOne, 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) audio_stat = get_radio_status(); if(audio_stat == FMRADIO_PLAYING) - return STATUS_PLAY; + return STATUS_RADIO; if(audio_stat == FMRADIO_PAUSED) - return STATUS_PAUSE; + return STATUS_RADIO_PAUSE; #endif 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 STATUS_FASTFORWARD, STATUS_FASTBACKWARD, STATUS_RECORD, - STATUS_RECORD_PAUSE + STATUS_RECORD_PAUSE, + STATUS_RADIO, + STATUS_RADIO_PAUSE }; void status_init(void); -- cgit