devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Declaration of 'pause' from chessclock is redeclared as different kind of symbol by android-ndk-r5

Browse source 
Flyspray: FS#11900
Author: Benjamin Brown

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29112 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2011-01-22 16:55:59 +00:00
parent 3ff2fb37c9
commit aed6205831
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/plugins/chessclock.c
View file

@ -372,7 +372,7 @@ static int chessclock_set_int(char* string,
static char * show_time(int secs); static char * show_time(int secs);
static bool pause; static bool chesspause;
#define MAX_TIME 7200 #define MAX_TIME 7200
@ -436,7 +436,7 @@ enum plugin_status plugin_start(const void* parameter)
timer_holder[i].hidden=false; timer_holder[i].hidden=false;
} }
pause=true; /* We start paused */ chesspause=true; /* We start paused */
nr=0; nr=0;
do { do {
@ -511,7 +511,7 @@ static int run_timer(int nr)
long ticks=0; long ticks=0;
bool round_time=false; bool round_time=false;
show_pause_mode(pause); show_pause_mode(chesspause);
if (settings.round_time*HZ<max_ticks) { if (settings.round_time*HZ<max_ticks) {
max_ticks=settings.round_time*HZ; max_ticks=settings.round_time*HZ;
@ -533,7 +533,7 @@ static int run_timer(int nr)
ticks = max_ticks; ticks = max_ticks;
} else { } else {
now=*rb->current_tick; now=*rb->current_tick;
if (!pause) { if (!chesspause) {
ticks+=now-last_tick; ticks+=now-last_tick;
if ((max_ticks-ticks)/HZ == 10) { if ((max_ticks-ticks)/HZ == 10) {
/* Backlight on if 10 seconds remain */ /* Backlight on if 10 seconds remain */
@ -565,8 +565,8 @@ static int run_timer(int nr)
/* PLAY = Stop/Start toggle */ /* PLAY = Stop/Start toggle */
case CHC_STARTSTOP: case CHC_STARTSTOP:
pause=!pause; chesspause=!chesspause;
show_pause_mode(pause); show_pause_mode(chesspause);
break; break;
/* LEFT = Reset timer */ /* LEFT = Reset timer */
@ -633,7 +633,7 @@ static int run_timer(int nr)
break; break;
} }
rb->lcd_clear_display(); rb->lcd_clear_display();
show_pause_mode(pause); show_pause_mode(chesspause);
rb->lcd_puts(0, FIRST_LINE, (unsigned char *)player_info); rb->lcd_puts(0, FIRST_LINE, (unsigned char *)player_info);
} }
break; break;

1
docs/CREDITS
View file

@ -581,6 +581,7 @@ Will Sowerbutts
Gabriel Maia Gabriel Maia
Robert Horn Robert Horn
Ante Maretic Ante Maretic
Benjamin Brown
The libmad team The libmad team
The wavpack team The wavpack team