1 files changed, 23 insertions, 28 deletions

diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c
index dc533cf017..97d6266a02 100644
--- a/apps/recorder/radio.c
+++ b/apps/recorder/radio.c
@@ -114,9 +114,6 @@ static int curr_preset = -1;
 static int curr_freq;
 static int radio_mode = RADIO_SCAN_MODE;
 
-static int radio_status = FMRADIO_OFF;
-static bool in_screen = false;
-
 #define MAX_PRESETS 64
 static bool presets_loaded = false, presets_changed = false;
 static struct fmstation presets[MAX_PRESETS];
@@ -185,14 +182,11 @@ void radio_init(void)
     radio_stop();
 }
 
+/* For powermgmt.c to check status for shutdown since it can't access
+   the global_status structure directly. */
 int get_radio_status(void)
 {
-    return radio_status;
-}
-
-bool in_radio_screen(void)
-{
-    return in_screen;
+    return global_status.radio_status;
 }
 
 /* secret flag for starting paused - prevents unmute */
@@ -202,14 +196,14 @@ void radio_start(void)
     bool start_paused;
     int mute_timeout;
 
-    if(radio_status == FMRADIO_PLAYING)
+    if(global_status.radio_status == FMRADIO_PLAYING)
         return;
 
-    start_paused = radio_status & FMRADIO_START_PAUSED;
+    start_paused = global_status.radio_status & FMRADIO_START_PAUSED;
     /* clear flag before any yielding */
-    radio_status &= ~FMRADIO_START_PAUSED;
+    global_status.radio_status &= ~FMRADIO_START_PAUSED;
 
-    if(radio_status == FMRADIO_OFF)
+    if(global_status.radio_status == FMRADIO_OFF)
         radio_power(true);
 
     curr_freq = global_status.last_frequency 
@@ -219,7 +213,7 @@ void radio_start(void)
     radio_set(RADIO_SLEEP, 0); /* wake up the tuner */
     radio_set(RADIO_FREQUENCY, curr_freq);
 
-    if(radio_status == FMRADIO_OFF)
+    if(global_status.radio_status == FMRADIO_OFF)
     {
         radio_set(RADIO_IF_MEASUREMENT, 0);
         radio_set(RADIO_SENSITIVITY, 0);
@@ -248,34 +242,34 @@ void radio_start(void)
     if(!start_paused)
         radio_set(RADIO_MUTE, 0);
 
-    radio_status = FMRADIO_PLAYING;
+    global_status.radio_status = FMRADIO_PLAYING;
 } /* radio_start */
 
 void radio_pause(void)
 {
-    if(radio_status == FMRADIO_PAUSED)
+    if(global_status.radio_status == FMRADIO_PAUSED)
         return;
 
-    if(radio_status == FMRADIO_OFF)
+    if(global_status.radio_status == FMRADIO_OFF)
     {
-        radio_status |= FMRADIO_START_PAUSED;    
+        global_status.radio_status |= FMRADIO_START_PAUSED;    
         radio_start();
     }
 
     radio_set(RADIO_MUTE, 1);
     radio_set(RADIO_SLEEP, 1);
 
-    radio_status = FMRADIO_PAUSED;
+    global_status.radio_status = FMRADIO_PAUSED;
 } /* radio_pause */
 
 void radio_stop(void)
 {
-    if(radio_status == FMRADIO_OFF)
+    if(global_status.radio_status == FMRADIO_OFF)
         return;
 
     radio_set(RADIO_MUTE, 1);
     radio_set(RADIO_SLEEP, 1); /* low power mode, if available */
-    radio_status = FMRADIO_OFF;
+    global_status.radio_status = FMRADIO_OFF;
     radio_power(false); /* status update, power off if avail. */
 } /* radio_stop */
 
@@ -397,7 +391,7 @@ bool radio_screen(void)
     gui_buttonbar_set_display(&buttonbar, &(screens[SCREEN_MAIN]) );
 #endif
     /* change status to "in screen" */
-    in_screen = true;
+    global_status.in_radio_screen = true;
 
     /* always display status bar in radio screen for now */
     global_settings.statusbar = true;
@@ -422,7 +416,7 @@ bool radio_screen(void)
     }
                                        
 #ifndef SIMULATOR
-    if(radio_status == FMRADIO_OFF)    
+    if(global_status.radio_status == FMRADIO_OFF)    
         audio_stop();
 
 #if CONFIG_CODEC != SWCODEC
@@ -449,10 +443,11 @@ bool radio_screen(void)
 
     /* turn on radio */
 #if CONFIG_CODEC == SWCODEC
-    rec_set_source(AUDIO_SRC_FMRADIO, (radio_status == FMRADIO_PAUSED) ?
+    rec_set_source(AUDIO_SRC_FMRADIO,
+                   (global_status.radio_status == FMRADIO_PAUSED) ?
                        SRCF_FMRADIO_PAUSED : SRCF_FMRADIO_PLAYING);
 #else
-    if (radio_status == FMRADIO_OFF)
+    if (global_status.radio_status == FMRADIO_OFF)
         radio_start();
 #endif
 
@@ -676,7 +671,7 @@ bool radio_screen(void)
                 break;
 
             case ACTION_FM_PLAY:
-                if (radio_status == FMRADIO_PLAYING)
+                if (global_status.radio_status == FMRADIO_PLAYING)
                     radio_pause();
                 else
                     radio_start();
@@ -819,7 +814,7 @@ bool radio_screen(void)
                 timeout = current_tick + HZ;
 
                 /* keep "mono" from always being displayed when paused */
-                if (radio_status != FMRADIO_PAUSED)
+                if (global_status.radio_status != FMRADIO_PAUSED)
                 {
                     stereo = radio_get(RADIO_STEREO) &&
                         !global_settings.fm_force_mono;
@@ -962,7 +957,7 @@ bool radio_screen(void)
     /* restore status bar settings */
     global_settings.statusbar = statusbar;
 
-    in_screen = false;
+    global_status.in_radio_screen = false;
     
     return have_recorded;
 } /* radio_screen */