diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/debug_menu.c | 24 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 6 | ||||
-rw-r--r-- | apps/radio/radio.c | 4 |
3 files changed, 18 insertions, 16 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 000dbdc4fc..d761b9f868 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -127,10 +127,6 @@ | |||
127 | #include "iap.h" | 127 | #include "iap.h" |
128 | #endif | 128 | #endif |
129 | 129 | ||
130 | #ifdef HAVE_RDS_CAP | ||
131 | #include "rds.h" | ||
132 | #endif | ||
133 | |||
134 | #include "talk.h" | 130 | #include "talk.h" |
135 | 131 | ||
136 | static const char* threads_getname(int selected_item, void *data, | 132 | static const char* threads_getname(int selected_item, void *data, |
@@ -2166,17 +2162,25 @@ static int radio_callback(int btn, struct gui_synclist *lists) | |||
2166 | #endif /* TEA5760 */ | 2162 | #endif /* TEA5760 */ |
2167 | 2163 | ||
2168 | #ifdef HAVE_RDS_CAP | 2164 | #ifdef HAVE_RDS_CAP |
2169 | simplelist_addline("PI:%04X PS:'%8s'", | 2165 | { |
2170 | rds_get_pi(), rds_get_ps()); | 2166 | char buf[65*4]; |
2171 | simplelist_addline("RT:%s", | 2167 | uint16_t pi; |
2172 | rds_get_rt()); | 2168 | time_t seconds; |
2173 | time_t seconds = rds_get_ct(); | 2169 | |
2170 | tuner_get_rds_info(RADIO_RDS_NAME, buf, sizeof (buf)); | ||
2171 | tuner_get_rds_info(RADIO_RDS_PROGRAM_INFO, &pi, sizeof (pi)); | ||
2172 | simplelist_addline("PI:%04X PS:'%8s'", pi, buf); | ||
2173 | tuner_get_rds_info(RADIO_RDS_TEXT, buf, sizeof (buf)); | ||
2174 | simplelist_addline("RT:%s", buf); | ||
2175 | tuner_get_rds_info(RADIO_RDS_CURRENT_TIME, &seconds, sizeof (seconds)); | ||
2176 | |||
2174 | struct tm* time = gmtime(&seconds); | 2177 | struct tm* time = gmtime(&seconds); |
2175 | simplelist_addline( | 2178 | simplelist_addline( |
2176 | "CT:%4d-%02d-%02d %02d:%02d", | 2179 | "CT:%4d-%02d-%02d %02d:%02d", |
2177 | time->tm_year + 1900, time->tm_mon + 1, time->tm_mday, | 2180 | time->tm_year + 1900, time->tm_mon + 1, time->tm_mday, |
2178 | time->tm_hour, time->tm_min, time->tm_sec); | 2181 | time->tm_hour, time->tm_min, time->tm_sec); |
2179 | #endif | 2182 | } |
2183 | #endif /* HAVE_RDS_CAP */ | ||
2180 | return ACTION_REDRAW; | 2184 | return ACTION_REDRAW; |
2181 | } | 2185 | } |
2182 | static bool dbg_fm_radio(void) | 2186 | static bool dbg_fm_radio(void) |
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index c07d4cf2df..cbf732fe10 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c | |||
@@ -540,9 +540,11 @@ const char *get_radio_token(struct wps_token *token, int preset_offset, | |||
540 | #ifdef HAVE_RDS_CAP | 540 | #ifdef HAVE_RDS_CAP |
541 | return "rds"; | 541 | return "rds"; |
542 | case SKIN_TOKEN_RDS_NAME: | 542 | case SKIN_TOKEN_RDS_NAME: |
543 | return tuner_get_rds_info(RADIO_RDS_NAME); | 543 | tuner_get_rds_info(RADIO_RDS_NAME, buf, buf_size); |
544 | return buf; | ||
544 | case SKIN_TOKEN_RDS_TEXT: | 545 | case SKIN_TOKEN_RDS_TEXT: |
545 | return tuner_get_rds_info(RADIO_RDS_TEXT); | 546 | tuner_get_rds_info(RADIO_RDS_TEXT, buf, buf_size); |
547 | return buf; | ||
546 | #else | 548 | #else |
547 | return NULL; /* end of the SKIN_TOKEN_HAVE_RDS case */ | 549 | return NULL; /* end of the SKIN_TOKEN_HAVE_RDS case */ |
548 | #endif /* HAVE_RDS_CAP */ | 550 | #endif /* HAVE_RDS_CAP */ |
diff --git a/apps/radio/radio.c b/apps/radio/radio.c index d89c0be304..77fd324c8f 100644 --- a/apps/radio/radio.c +++ b/apps/radio/radio.c | |||
@@ -696,10 +696,6 @@ void radio_screen(void) | |||
696 | 696 | ||
697 | default: | 697 | default: |
698 | default_event_handler(button); | 698 | default_event_handler(button); |
699 | #ifdef HAVE_RDS_CAP | ||
700 | if (tuner_get(RADIO_EVENT)) | ||
701 | update_type = SKIN_REFRESH_ALL; | ||
702 | #endif | ||
703 | if (!tuner_get(RADIO_PRESENT)) | 699 | if (!tuner_get(RADIO_PRESENT)) |
704 | { | 700 | { |
705 | #if CONFIG_CODEC != SWCODEC && !defined(SIMULATOR) | 701 | #if CONFIG_CODEC != SWCODEC && !defined(SIMULATOR) |