diff options
Diffstat (limited to 'apps/recorder/radio.c')
-rw-r--r-- | apps/recorder/radio.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 8d85af9937..27a98c6dc4 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -742,7 +742,7 @@ int radio_screen(void) | |||
742 | case ACTION_FM_PRESET: | 742 | case ACTION_FM_PRESET: |
743 | if(num_presets < 1) | 743 | if(num_presets < 1) |
744 | { | 744 | { |
745 | gui_syncsplash(HZ, ID2P(LANG_FM_NO_PRESETS)); | 745 | splash(HZ, ID2P(LANG_FM_NO_PRESETS)); |
746 | update_screen = true; | 746 | update_screen = true; |
747 | FOR_NB_SCREENS(i) | 747 | FOR_NB_SCREENS(i) |
748 | { | 748 | { |
@@ -776,7 +776,7 @@ int radio_screen(void) | |||
776 | case ACTION_FM_FREEZE: | 776 | case ACTION_FM_FREEZE: |
777 | if(!screen_freeze) | 777 | if(!screen_freeze) |
778 | { | 778 | { |
779 | gui_syncsplash(HZ, str(LANG_FM_FREEZE)); | 779 | splash(HZ, str(LANG_FM_FREEZE)); |
780 | screen_freeze = true; | 780 | screen_freeze = true; |
781 | } | 781 | } |
782 | else | 782 | else |
@@ -917,8 +917,8 @@ int radio_screen(void) | |||
917 | FOR_NB_SCREENS(i) | 917 | FOR_NB_SCREENS(i) |
918 | screens[i].puts_scroll(0, top_of_screen + 1, buf); | 918 | screens[i].puts_scroll(0, top_of_screen + 1, buf); |
919 | 919 | ||
920 | snprintf(buf, 128, stereo?str(LANG_CHANNEL_STEREO): | 920 | snprintf(buf, 128, "%s", stereo?str(LANG_CHANNEL_STEREO): |
921 | str(LANG_CHANNEL_MONO)); | 921 | str(LANG_CHANNEL_MONO)); |
922 | FOR_NB_SCREENS(i) | 922 | FOR_NB_SCREENS(i) |
923 | screens[i].puts_scroll(0, top_of_screen + 2, buf); | 923 | screens[i].puts_scroll(0, top_of_screen + 2, buf); |
924 | 924 | ||
@@ -1001,7 +1001,7 @@ int radio_screen(void) | |||
1001 | #if CONFIG_CODEC != SWCODEC | 1001 | #if CONFIG_CODEC != SWCODEC |
1002 | if(audio_status() & AUDIO_STATUS_ERROR) | 1002 | if(audio_status() & AUDIO_STATUS_ERROR) |
1003 | { | 1003 | { |
1004 | gui_syncsplash(0, str(LANG_DISK_FULL)); | 1004 | splash(0, str(LANG_DISK_FULL)); |
1005 | gui_syncstatusbar_draw(&statusbars,true); | 1005 | gui_syncstatusbar_draw(&statusbars,true); |
1006 | FOR_NB_SCREENS(i) | 1006 | FOR_NB_SCREENS(i) |
1007 | { | 1007 | { |
@@ -1083,7 +1083,7 @@ static void radio_save_presets(void) | |||
1083 | } | 1083 | } |
1084 | else | 1084 | else |
1085 | { | 1085 | { |
1086 | gui_syncsplash(HZ, ID2P(LANG_FM_PRESET_SAVE_FAILED)); | 1086 | splash(HZ, ID2P(LANG_FM_PRESET_SAVE_FAILED)); |
1087 | } | 1087 | } |
1088 | } | 1088 | } |
1089 | 1089 | ||
@@ -1169,7 +1169,7 @@ static int radio_add_preset(void) | |||
1169 | } | 1169 | } |
1170 | else | 1170 | else |
1171 | { | 1171 | { |
1172 | gui_syncsplash(HZ, ID2P(LANG_FM_NO_FREE_PRESETS)); | 1172 | splash(HZ, ID2P(LANG_FM_NO_FREE_PRESETS)); |
1173 | } | 1173 | } |
1174 | return true; | 1174 | return true; |
1175 | } | 1175 | } |
@@ -1257,7 +1257,7 @@ static int save_preset_list(void) | |||
1257 | if((!p1) || (len > MAX_FILENAME) || (len == 0)) | 1257 | if((!p1) || (len > MAX_FILENAME) || (len == 0)) |
1258 | { | 1258 | { |
1259 | /* no slash, too long or too short */ | 1259 | /* no slash, too long or too short */ |
1260 | gui_syncsplash(HZ, ID2P(LANG_INVALID_FILENAME)); | 1260 | splash(HZ, ID2P(LANG_INVALID_FILENAME)); |
1261 | } | 1261 | } |
1262 | else | 1262 | else |
1263 | { | 1263 | { |
@@ -1277,7 +1277,7 @@ static int save_preset_list(void) | |||
1277 | } | 1277 | } |
1278 | } | 1278 | } |
1279 | else | 1279 | else |
1280 | gui_syncsplash(HZ, ID2P(LANG_FM_NO_PRESETS)); | 1280 | splash(HZ, ID2P(LANG_FM_NO_PRESETS)); |
1281 | 1281 | ||
1282 | return true; | 1282 | return true; |
1283 | } | 1283 | } |
@@ -1456,8 +1456,6 @@ static int scan_presets(void *viewports) | |||
1456 | const struct fm_region_data * const fmr = | 1456 | const struct fm_region_data * const fmr = |
1457 | &fm_region_data[global_settings.fm_region]; | 1457 | &fm_region_data[global_settings.fm_region]; |
1458 | 1458 | ||
1459 | char buf[MAX_FMPRESET_LEN + 1]; | ||
1460 | |||
1461 | curr_freq = fmr->freq_min; | 1459 | curr_freq = fmr->freq_min; |
1462 | num_presets = 0; | 1460 | num_presets = 0; |
1463 | memset(presets, 0, sizeof(presets)); | 1461 | memset(presets, 0, sizeof(presets)); |
@@ -1473,8 +1471,7 @@ static int scan_presets(void *viewports) | |||
1473 | frac = freq % 100; | 1471 | frac = freq % 100; |
1474 | freq /= 100; | 1472 | freq /= 100; |
1475 | 1473 | ||
1476 | snprintf(buf, MAX_FMPRESET_LEN, str(LANG_FM_SCANNING), freq, frac); | 1474 | splashf(0, str(LANG_FM_SCANNING), freq, frac); |
1477 | gui_syncsplash(0, buf); | ||
1478 | 1475 | ||
1479 | if(tuner_set(RADIO_SCAN_FREQUENCY, curr_freq)) | 1476 | if(tuner_set(RADIO_SCAN_FREQUENCY, curr_freq)) |
1480 | { | 1477 | { |