Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor clean up, move common define to a header file and use TIME_AFTER macro

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18783 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2008-10-12 16:47:59 +00:00
parent da8bff107e
commit 2ca30a0c74
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/playlist.c
View file

@ -136,8 +136,6 @@
#define PLAYLIST_QUEUED 0x20000000 #define PLAYLIST_QUEUED 0x20000000
#define PLAYLIST_SKIPPED 0x10000000 #define PLAYLIST_SKIPPED 0x10000000
#define PLAYLIST_DISPLAY_COUNT 10
struct directory_search_context { struct directory_search_context {
struct playlist_info* playlist; struct playlist_info* playlist;
int position; int position;
@ -2040,7 +2038,7 @@ int playlist_resume(void)
for(count=0; count<nread && !exit_loop && !useraborted; count++,p++) for(count=0; count<nread && !exit_loop && !useraborted; count++,p++)
{ {
/* So a splash while we are loading. */ /* So a splash while we are loading. */
if (current_tick - last_tick > HZ/4) if (TIME_AFTER(current_tick, last_tick + HZ/4))
{ {
splashf(0, str(LANG_LOADING_PERCENT), splashf(0, str(LANG_LOADING_PERCENT),
(total_read+count)*100/control_file_size, (total_read+count)*100/control_file_size,

2
apps/playlist.h
View file

@ -32,6 +32,8 @@
#define PLAYLIST_ATTR_SKIPPED 0x04 #define PLAYLIST_ATTR_SKIPPED 0x04
#define PLAYLIST_MAX_CACHE 16 #define PLAYLIST_MAX_CACHE 16
#define PLAYLIST_DISPLAY_COUNT 10
#define DEFAULT_DYNAMIC_PLAYLIST_NAME "/dynamic.m3u8" #define DEFAULT_DYNAMIC_PLAYLIST_NAME "/dynamic.m3u8"
enum playlist_command { enum playlist_command {

1
apps/playlist_catalog.c
View file

@ -46,7 +46,6 @@
#include "talk.h" #include "talk.h"
#define MAX_PLAYLISTS 400 #define MAX_PLAYLISTS 400
#define PLAYLIST_DISPLAY_COUNT 10
/* Use for recursive directory search */ /* Use for recursive directory search */
struct add_track_context { struct add_track_context {