diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-09-19 08:17:08 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-09-19 08:17:08 +0000 |
commit | d2000a91783328ba7be454a82b4d9572fe1dacf0 (patch) | |
tree | 46dfff5cde036c688200fe78e4bf26f582486b15 | |
parent | c78d55a31147fcd0775b076c182cdcb265426013 (diff) | |
download | rockbox-d2000a91783328ba7be454a82b4d9572fe1dacf0.tar.gz rockbox-d2000a91783328ba7be454a82b4d9572fe1dacf0.zip |
radio_screen() return value is unused -> void
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28113 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/radio/radio.c | 16 | ||||
-rw-r--r-- | apps/radio/radio.h | 2 |
2 files changed, 3 insertions, 15 deletions
diff --git a/apps/radio/radio.c b/apps/radio/radio.c index e5badb10a8..ec816c6a54 100644 --- a/apps/radio/radio.c +++ b/apps/radio/radio.c | |||
@@ -387,10 +387,9 @@ void talk_freq(int freq, bool enqueue) | |||
387 | } | 387 | } |
388 | 388 | ||
389 | 389 | ||
390 | int radio_screen(void) | 390 | void radio_screen(void) |
391 | { | 391 | { |
392 | bool done = false; | 392 | bool done = false; |
393 | int ret_val = GO_TO_ROOT; | ||
394 | int button; | 393 | int button; |
395 | int i; | 394 | int i; |
396 | bool stereo = false, last_stereo = false; | 395 | bool stereo = false, last_stereo = false; |
@@ -403,7 +402,6 @@ int radio_screen(void) | |||
403 | unsigned long rec_lastclick = 0; | 402 | unsigned long rec_lastclick = 0; |
404 | #endif | 403 | #endif |
405 | #if CONFIG_CODEC != SWCODEC | 404 | #if CONFIG_CODEC != SWCODEC |
406 | bool have_recorded = false; | ||
407 | int timeout = current_tick + HZ/10; | 405 | int timeout = current_tick + HZ/10; |
408 | unsigned int last_seconds = 0; | 406 | unsigned int last_seconds = 0; |
409 | #if !defined(SIMULATOR) | 407 | #if !defined(SIMULATOR) |
@@ -433,9 +431,7 @@ int radio_screen(void) | |||
433 | #ifndef SIMULATOR | 431 | #ifndef SIMULATOR |
434 | 432 | ||
435 | #if CONFIG_CODEC != SWCODEC | 433 | #if CONFIG_CODEC != SWCODEC |
436 | if(rec_create_directory() > 0) | 434 | rec_create_directory(); |
437 | have_recorded = true; | ||
438 | |||
439 | audio_init_recording(talk_get_bufsize()); | 435 | audio_init_recording(talk_get_bufsize()); |
440 | 436 | ||
441 | sound_settings_apply(); | 437 | sound_settings_apply(); |
@@ -558,7 +554,6 @@ int radio_screen(void) | |||
558 | } | 554 | } |
559 | else | 555 | else |
560 | { | 556 | { |
561 | have_recorded = true; | ||
562 | rec_command(RECORDING_CMD_START); | 557 | rec_command(RECORDING_CMD_START); |
563 | update_type = SKIN_REFRESH_ALL; | 558 | update_type = SKIN_REFRESH_ALL; |
564 | } | 559 | } |
@@ -574,7 +569,6 @@ int radio_screen(void) | |||
574 | #endif | 569 | #endif |
575 | keep_playing = true; | 570 | keep_playing = true; |
576 | done = true; | 571 | done = true; |
577 | ret_val = GO_TO_ROOT; | ||
578 | if(presets_have_changed()) | 572 | if(presets_have_changed()) |
579 | { | 573 | { |
580 | if(yesno_pop(ID2P(LANG_FM_SAVE_CHANGES))) | 574 | if(yesno_pop(ID2P(LANG_FM_SAVE_CHANGES))) |
@@ -741,7 +735,6 @@ int radio_screen(void) | |||
741 | #endif | 735 | #endif |
742 | keep_playing = false; | 736 | keep_playing = false; |
743 | done = true; | 737 | done = true; |
744 | ret_val = GO_TO_ROOT; | ||
745 | if(presets_have_changed()) | 738 | if(presets_have_changed()) |
746 | { | 739 | { |
747 | if(yesno_pop(ID2P(LANG_FM_SAVE_CHANGES))) | 740 | if(yesno_pop(ID2P(LANG_FM_SAVE_CHANGES))) |
@@ -884,11 +877,6 @@ int radio_screen(void) | |||
884 | #endif | 877 | #endif |
885 | fms_fix_displays(FMS_EXIT); | 878 | fms_fix_displays(FMS_EXIT); |
886 | in_screen = false; | 879 | in_screen = false; |
887 | #if CONFIG_CODEC != SWCODEC | ||
888 | return have_recorded; | ||
889 | #else | ||
890 | return false; | ||
891 | #endif | ||
892 | } /* radio_screen */ | 880 | } /* radio_screen */ |
893 | 881 | ||
894 | void toggle_mono_mode(bool mono) | 882 | void toggle_mono_mode(bool mono) |
diff --git a/apps/radio/radio.h b/apps/radio/radio.h index daeaee9ca7..76615e39e7 100644 --- a/apps/radio/radio.h +++ b/apps/radio/radio.h | |||
@@ -36,7 +36,7 @@ enum { | |||
36 | void radio_load_presets(char *filename); | 36 | void radio_load_presets(char *filename); |
37 | void radio_save_presets(void); | 37 | void radio_save_presets(void); |
38 | void radio_init(void) INIT_ATTR; | 38 | void radio_init(void) INIT_ATTR; |
39 | int radio_screen(void); | 39 | void radio_screen(void); |
40 | void radio_start(void); | 40 | void radio_start(void); |
41 | void radio_pause(void); | 41 | void radio_pause(void); |
42 | void radio_stop(void); | 42 | void radio_stop(void); |