summaryrefslogtreecommitdiff
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.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,
212 struct mp3entry *pid3; 212 struct mp3entry *pid3;
213 char buf[MAX_PATH*2], tempbuf[MAX_PATH]; 213 char buf[MAX_PATH*2], tempbuf[MAX_PATH];
214 const char *filename; 214 const char *filename;
215 bool ismusic = true;
216#if CONFIG_TUNER 215#if CONFIG_TUNER
217 if (current_screen() == GO_TO_FM) 216 if (current_screen() == GO_TO_FM)
218 { 217 {
219 cur_pos = radio_current_preset(); 218 cur_pos = radio_current_preset();
220 count = radio_preset_count(); 219 count = radio_preset_count();
221 ismusic = false;
222 } 220 }
223 else 221 else
224#endif 222#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 @@
30#include "settings.h" 30#include "settings.h"
31#include "wps.h" 31#include "wps.h"
32#include "file.h" 32#include "file.h"
33#if CONFIG_TUNER
33#include "radio.h" 34#include "radio.h"
35#endif
34#include "skin_engine/skin_engine.h" 36#include "skin_engine/skin_engine.h"
35#include "skin_engine/skin_fonts.h" 37#include "skin_engine/skin_fonts.h"
36#include "statusbar-skinned.h" 38#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)
592#if CONFIG_CODEC != SWCODEC 592#if CONFIG_CODEC != SWCODEC
593 bool have_recorded = false; 593 bool have_recorded = false;
594 int timeout = current_tick + HZ/10; 594 int timeout = current_tick + HZ/10;
595 unsigned int seconds = 0;
596 unsigned int last_seconds = 0; 595 unsigned int last_seconds = 0;
597 int hours, minutes; 596 int hours, minutes;
597#ifndef SIMULATOR
598 unsigned int seconds = 0;
598 struct audio_recording_options rec_options; 599 struct audio_recording_options rec_options;
600#endif
599#endif /* CONFIG_CODEC != SWCODEC */ 601#endif /* CONFIG_CODEC != SWCODEC */
600#ifndef HAVE_NOISY_IDLE_MODE 602#ifndef HAVE_NOISY_IDLE_MODE
601 int button_timeout = current_tick + (2*HZ); 603 int button_timeout = current_tick + (2*HZ);