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 @@
 #include "iap.h"
 #endif
 
-#ifdef HAVE_RDS_CAP
-#include "rds.h"
-#endif
-
 #include "talk.h"
 
 static const char* threads_getname(int selected_item, void *data,
@@ -2166,17 +2162,25 @@ static int radio_callback(int btn, struct gui_synclist *lists)
 #endif /* TEA5760 */
 
 #ifdef HAVE_RDS_CAP
-        simplelist_addline("PI:%04X PS:'%8s'",
-                           rds_get_pi(), rds_get_ps());
-        simplelist_addline("RT:%s",
-                           rds_get_rt());
-        time_t seconds = rds_get_ct();
+    {
+        char buf[65*4];
+        uint16_t pi;
+        time_t seconds;
+
+        tuner_get_rds_info(RADIO_RDS_NAME, buf, sizeof (buf));
+        tuner_get_rds_info(RADIO_RDS_PROGRAM_INFO, &pi, sizeof (pi));
+        simplelist_addline("PI:%04X PS:'%8s'", pi, buf);
+        tuner_get_rds_info(RADIO_RDS_TEXT, buf, sizeof (buf));
+        simplelist_addline("RT:%s", buf);
+        tuner_get_rds_info(RADIO_RDS_CURRENT_TIME, &seconds, sizeof (seconds));
+
         struct tm* time = gmtime(&seconds);
         simplelist_addline(
             "CT:%4d-%02d-%02d %02d:%02d",
             time->tm_year + 1900, time->tm_mon + 1, time->tm_mday,
             time->tm_hour, time->tm_min, time->tm_sec);
-#endif
+    }
+#endif /* HAVE_RDS_CAP */
     return ACTION_REDRAW;
 }
 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,
 #ifdef HAVE_RDS_CAP
             return "rds";
         case SKIN_TOKEN_RDS_NAME:
-            return tuner_get_rds_info(RADIO_RDS_NAME);
+            tuner_get_rds_info(RADIO_RDS_NAME, buf, buf_size);
+            return buf;
         case SKIN_TOKEN_RDS_TEXT:
-            return tuner_get_rds_info(RADIO_RDS_TEXT);
+            tuner_get_rds_info(RADIO_RDS_TEXT, buf, buf_size);
+            return buf;
 #else
             return NULL; /* end of the SKIN_TOKEN_HAVE_RDS case */
 #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)
 
             default:
                 default_event_handler(button);
-#ifdef HAVE_RDS_CAP
-                if (tuner_get(RADIO_EVENT))
-                    update_type = SKIN_REFRESH_ALL;
-#endif
                 if (!tuner_get(RADIO_PRESENT))
                 {
 #if CONFIG_CODEC != SWCODEC && !defined(SIMULATOR)