diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2008-05-20 20:55:14 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2008-05-20 20:55:14 +0000 |
commit | 29c45a66ce485e859762814e06d62297919d8d93 (patch) | |
tree | 1a27cd6b8e78a96d3976cd71f7fb66722780dafb | |
parent | 9244259f082b5acc4b8940789ea299dad2519a7c (diff) | |
download | rockbox-29c45a66ce485e859762814e06d62297919d8d93.tar.gz rockbox-29c45a66ce485e859762814e06d62297919d8d93.zip |
Make local functions static and rename STOP_AUTOSCROLL to lowercase.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17588 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/credits.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/apps/plugins/credits.c b/apps/plugins/credits.c index dc19e0ebff..1b85a8378f 100644 --- a/apps/plugins/credits.c +++ b/apps/plugins/credits.c | |||
@@ -23,11 +23,11 @@ PLUGIN_HEADER | |||
23 | 23 | ||
24 | static const struct plugin_api* rb; | 24 | static const struct plugin_api* rb; |
25 | 25 | ||
26 | const char* const credits[] = { | 26 | static const char* const credits[] = { |
27 | #include "credits.raw" /* generated list of names from docs/CREDITS */ | 27 | #include "credits.raw" /* generated list of names from docs/CREDITS */ |
28 | }; | 28 | }; |
29 | 29 | ||
30 | bool STOP_AUTOSCROLL(int action) | 30 | static bool stop_autoscroll(int action) |
31 | { | 31 | { |
32 | switch (action) | 32 | switch (action) |
33 | { | 33 | { |
@@ -46,7 +46,7 @@ bool STOP_AUTOSCROLL(int action) | |||
46 | 46 | ||
47 | #ifdef HAVE_LCD_CHARCELLS | 47 | #ifdef HAVE_LCD_CHARCELLS |
48 | 48 | ||
49 | void roll_credits(void) | 49 | static void roll_credits(void) |
50 | { | 50 | { |
51 | int numnames = sizeof(credits)/sizeof(char*); | 51 | int numnames = sizeof(credits)/sizeof(char*); |
52 | int curr_name = 0; | 52 | int curr_name = 0; |
@@ -107,7 +107,7 @@ void roll_credits(void) | |||
107 | 107 | ||
108 | #else | 108 | #else |
109 | 109 | ||
110 | int update_rowpos(int action, int cur_pos, int rows_per_screen, int tot_rows) | 110 | static int update_rowpos(int action, int cur_pos, int rows_per_screen, int tot_rows) |
111 | { | 111 | { |
112 | switch(action) | 112 | switch(action) |
113 | { | 113 | { |
@@ -129,7 +129,7 @@ int update_rowpos(int action, int cur_pos, int rows_per_screen, int tot_rows) | |||
129 | return cur_pos; | 129 | return cur_pos; |
130 | } | 130 | } |
131 | 131 | ||
132 | void roll_credits(void) | 132 | static void roll_credits(void) |
133 | { | 133 | { |
134 | /* to do: use target defines iso keypads to set animation timings */ | 134 | /* to do: use target defines iso keypads to set animation timings */ |
135 | #if (CONFIG_KEYPAD == RECORDER_PAD) | 135 | #if (CONFIG_KEYPAD == RECORDER_PAD) |
@@ -210,17 +210,17 @@ void roll_credits(void) | |||
210 | 210 | ||
211 | /* exit on abort, switch to manual on up/down */ | 211 | /* exit on abort, switch to manual on up/down */ |
212 | action = rb->get_action(CONTEXT_LIST, HZ/ANIM_SPEED); | 212 | action = rb->get_action(CONTEXT_LIST, HZ/ANIM_SPEED); |
213 | if(STOP_AUTOSCROLL(action)) | 213 | if(stop_autoscroll(action)) |
214 | break; | 214 | break; |
215 | } | 215 | } |
216 | if(STOP_AUTOSCROLL(action)) | 216 | if(stop_autoscroll(action)) |
217 | break; | 217 | break; |
218 | } | 218 | } |
219 | 219 | ||
220 | /* process user actions (if any) */ | 220 | /* process user actions (if any) */ |
221 | if(ACTION_STD_CANCEL == action) | 221 | if(ACTION_STD_CANCEL == action) |
222 | return; | 222 | return; |
223 | if(STOP_AUTOSCROLL(action)) | 223 | if(stop_autoscroll(action)) |
224 | manual_scroll = true; /* up/down - abort was catched above */ | 224 | manual_scroll = true; /* up/down - abort was catched above */ |
225 | 225 | ||
226 | if(!manual_scroll) | 226 | if(!manual_scroll) |
@@ -231,7 +231,7 @@ void roll_credits(void) | |||
231 | action = rb->get_action(CONTEXT_LIST, HZ*PAUSE_TIME); | 231 | action = rb->get_action(CONTEXT_LIST, HZ*PAUSE_TIME); |
232 | if(ACTION_STD_CANCEL == action) | 232 | if(ACTION_STD_CANCEL == action) |
233 | return; | 233 | return; |
234 | if(STOP_AUTOSCROLL(action)) | 234 | if(stop_autoscroll(action)) |
235 | manual_scroll = true; | 235 | manual_scroll = true; |
236 | } | 236 | } |
237 | 237 | ||
@@ -262,13 +262,13 @@ void roll_credits(void) | |||
262 | 262 | ||
263 | /* exit on keypress, react to scrolling */ | 263 | /* exit on keypress, react to scrolling */ |
264 | action = rb->get_action(CONTEXT_LIST, HZ/ANIM_SPEED); | 264 | action = rb->get_action(CONTEXT_LIST, HZ/ANIM_SPEED); |
265 | if(STOP_AUTOSCROLL(action)) | 265 | if(stop_autoscroll(action)) |
266 | break; | 266 | break; |
267 | 267 | ||
268 | namepos += offset_dummy; | 268 | namepos += offset_dummy; |
269 | offset_dummy++; | 269 | offset_dummy++; |
270 | } /* while(namepos<LCD_WIDTH+offset_dummy) */ | 270 | } /* while(namepos<LCD_WIDTH+offset_dummy) */ |
271 | if(STOP_AUTOSCROLL(action)) | 271 | if(stop_autoscroll(action)) |
272 | break; | 272 | break; |
273 | 273 | ||
274 | rb->snprintf(name, sizeof(name), "%s", credits[j+i]); | 274 | rb->snprintf(name, sizeof(name), "%s", credits[j+i]); |
@@ -293,18 +293,18 @@ void roll_credits(void) | |||
293 | 293 | ||
294 | /* stop on keypress */ | 294 | /* stop on keypress */ |
295 | action = rb->get_action(CONTEXT_LIST, HZ/ANIM_SPEED); | 295 | action = rb->get_action(CONTEXT_LIST, HZ/ANIM_SPEED); |
296 | if(STOP_AUTOSCROLL(action)) | 296 | if(stop_autoscroll(action)) |
297 | break; | 297 | break; |
298 | } | 298 | } |
299 | if(STOP_AUTOSCROLL(action)) | 299 | if(stop_autoscroll(action)) |
300 | break; | 300 | break; |
301 | namepos = name_targetpos; | 301 | namepos = name_targetpos; |
302 | } /* for(i=0; i<NUM_VISIBLE_LINES; i++) */ | 302 | } /* for(i=0; i<NUM_VISIBLE_LINES; i++) */ |
303 | if(STOP_AUTOSCROLL(action)) | 303 | if(stop_autoscroll(action)) |
304 | break; | 304 | break; |
305 | 305 | ||
306 | action = rb->get_action(CONTEXT_LIST, HZ*PAUSE_TIME); | 306 | action = rb->get_action(CONTEXT_LIST, HZ*PAUSE_TIME); |
307 | if(STOP_AUTOSCROLL(action)) | 307 | if(stop_autoscroll(action)) |
308 | break; | 308 | break; |
309 | 309 | ||
310 | j+=i; /* no user intervention, draw the next screen-full */ | 310 | j+=i; /* no user intervention, draw the next screen-full */ |
@@ -313,7 +313,7 @@ void roll_credits(void) | |||
313 | /* handle the keypress that we intercepted during autoscroll */ | 313 | /* handle the keypress that we intercepted during autoscroll */ |
314 | if(ACTION_STD_CANCEL == action) | 314 | if(ACTION_STD_CANCEL == action) |
315 | return; | 315 | return; |
316 | if(STOP_AUTOSCROLL(action)) | 316 | if(stop_autoscroll(action)) |
317 | manual_scroll = true; | 317 | manual_scroll = true; |
318 | } /* if(!manual_scroll) */ | 318 | } /* if(!manual_scroll) */ |
319 | 319 | ||