1
0
Fork 0
forked from len0rd/rockbox

fix red and yellow (most of it anyway)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25965 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-05-12 10:59:20 +00:00
parent 1bd072c92d
commit 7b931f0a5a
3 changed files with 5 additions and 3 deletions

View file

@ -212,13 +212,11 @@ static void draw_playlist_viewer_list(struct gui_wps *gwps,
struct mp3entry *pid3; struct mp3entry *pid3;
char buf[MAX_PATH*2], tempbuf[MAX_PATH]; char buf[MAX_PATH*2], tempbuf[MAX_PATH];
const char *filename; const char *filename;
bool ismusic = true;
#if CONFIG_TUNER #if CONFIG_TUNER
if (current_screen() == GO_TO_FM) if (current_screen() == GO_TO_FM)
{ {
cur_pos = radio_current_preset(); cur_pos = radio_current_preset();
count = radio_preset_count(); count = radio_preset_count();
ismusic = false;
} }
else else
#endif #endif

View file

@ -30,7 +30,9 @@
#include "settings.h" #include "settings.h"
#include "wps.h" #include "wps.h"
#include "file.h" #include "file.h"
#if CONFIG_TUNER
#include "radio.h" #include "radio.h"
#endif
#include "skin_engine/skin_engine.h" #include "skin_engine/skin_engine.h"
#include "skin_engine/skin_fonts.h" #include "skin_engine/skin_fonts.h"
#include "statusbar-skinned.h" #include "statusbar-skinned.h"

View file

@ -592,10 +592,12 @@ int radio_screen(void)
#if CONFIG_CODEC != SWCODEC #if CONFIG_CODEC != SWCODEC
bool have_recorded = false; bool have_recorded = false;
int timeout = current_tick + HZ/10; int timeout = current_tick + HZ/10;
unsigned int seconds = 0;
unsigned int last_seconds = 0; unsigned int last_seconds = 0;
int hours, minutes; int hours, minutes;
#ifndef SIMULATOR
unsigned int seconds = 0;
struct audio_recording_options rec_options; struct audio_recording_options rec_options;
#endif
#endif /* CONFIG_CODEC != SWCODEC */ #endif /* CONFIG_CODEC != SWCODEC */
#ifndef HAVE_NOISY_IDLE_MODE #ifndef HAVE_NOISY_IDLE_MODE
int button_timeout = current_tick + (2*HZ); int button_timeout = current_tick + (2*HZ);