summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-05-12 10:59:20 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-05-12 10:59:20 +0000
commit7b931f0a5a7dc90bc488c9f521ed5aeae42f8d73 (patch)
tree4dfd7af3511bb1b182682c54ec9b3185315900a0
parent1bd072c92d5f6d4a9a26d738a421f5a05048bb29 (diff)
downloadrockbox-7b931f0a5a7dc90bc488c9f521ed5aeae42f8d73.tar.gz
rockbox-7b931f0a5a7dc90bc488c9f521ed5aeae42f8d73.tar.bz2
rockbox-7b931f0a5a7dc90bc488c9f521ed5aeae42f8d73.zip
fix red and yellow (most of it anyway)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25965 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/skin_engine/skin_display.c2
-rw-r--r--apps/gui/theme_settings.c2
-rw-r--r--apps/recorder/radio.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 8d4e5b58f4..16b2dc1213 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -212,13 +212,11 @@ static void draw_playlist_viewer_list(struct gui_wps *gwps,
struct mp3entry *pid3;
char buf[MAX_PATH*2], tempbuf[MAX_PATH];
const char *filename;
- bool ismusic = true;
#if CONFIG_TUNER
if (current_screen() == GO_TO_FM)
{
cur_pos = radio_current_preset();
count = radio_preset_count();
- ismusic = false;
}
else
#endif
diff --git a/apps/gui/theme_settings.c b/apps/gui/theme_settings.c
index 9690193a88..7f4046c70b 100644
--- a/apps/gui/theme_settings.c
+++ b/apps/gui/theme_settings.c
@@ -30,7 +30,9 @@
#include "settings.h"
#include "wps.h"
#include "file.h"
+#if CONFIG_TUNER
#include "radio.h"
+#endif
#include "skin_engine/skin_engine.h"
#include "skin_engine/skin_fonts.h"
#include "statusbar-skinned.h"
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c
index e8a1154797..10ae109739 100644
--- a/apps/recorder/radio.c
+++ b/apps/recorder/radio.c
@@ -592,10 +592,12 @@ int radio_screen(void)
#if CONFIG_CODEC != SWCODEC
bool have_recorded = false;
int timeout = current_tick + HZ/10;
- unsigned int seconds = 0;
unsigned int last_seconds = 0;
int hours, minutes;
+#ifndef SIMULATOR
+ unsigned int seconds = 0;
struct audio_recording_options rec_options;
+#endif
#endif /* CONFIG_CODEC != SWCODEC */
#ifndef HAVE_NOISY_IDLE_MODE
int button_timeout = current_tick + (2*HZ);