diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2013-07-12 12:03:20 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2013-07-12 21:39:06 -0400 |
commit | ffa8626b0c93f8a65e0e17190917f7f173160842 (patch) | |
tree | d6d9498cdaa0cfff06bc5e079a195f2c63dd1237 /apps/main.c | |
parent | d85f796890f496cc89e0dd2588f123432638ab64 (diff) | |
download | rockbox-ffa8626b0c93f8a65e0e17190917f7f173160842.tar.gz rockbox-ffa8626b0c93f8a65e0e17190917f7f173160842.zip |
Fix whitespace in files for following commit.
Change-Id: I4adb8a152e9b99fcd26d95da7334d7d0cbe2a036
Diffstat (limited to 'apps/main.c')
-rw-r--r-- | apps/main.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/apps/main.c b/apps/main.c index 57257aff66..7f44d89a6a 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -183,7 +183,7 @@ int main(void) | |||
183 | #ifdef AUTOROCK | 183 | #ifdef AUTOROCK |
184 | { | 184 | { |
185 | char filename[MAX_PATH]; | 185 | char filename[MAX_PATH]; |
186 | const char *file = | 186 | const char *file = |
187 | #ifdef APPLICATION | 187 | #ifdef APPLICATION |
188 | ROCKBOX_DIR | 188 | ROCKBOX_DIR |
189 | #else | 189 | #else |
@@ -210,15 +210,15 @@ static int init_dircache(bool preinit) | |||
210 | #ifdef HAVE_DIRCACHE | 210 | #ifdef HAVE_DIRCACHE |
211 | int result = 0; | 211 | int result = 0; |
212 | bool clear = false; | 212 | bool clear = false; |
213 | 213 | ||
214 | if (preinit) | 214 | if (preinit) |
215 | dircache_init(); | 215 | dircache_init(); |
216 | 216 | ||
217 | if (!global_settings.dircache) | 217 | if (!global_settings.dircache) |
218 | return 0; | 218 | return 0; |
219 | 219 | ||
220 | # ifdef HAVE_EEPROM_SETTINGS | 220 | # ifdef HAVE_EEPROM_SETTINGS |
221 | if (firmware_settings.initialized && firmware_settings.disk_clean | 221 | if (firmware_settings.initialized && firmware_settings.disk_clean |
222 | && preinit) | 222 | && preinit) |
223 | { | 223 | { |
224 | result = dircache_load(); | 224 | result = dircache_load(); |
@@ -233,7 +233,7 @@ static int init_dircache(bool preinit) | |||
233 | splash(0, str(LANG_SCANNING_DISK)); | 233 | splash(0, str(LANG_SCANNING_DISK)); |
234 | clear = true; | 234 | clear = true; |
235 | } | 235 | } |
236 | 236 | ||
237 | dircache_build(global_status.dircache_size); | 237 | dircache_build(global_status.dircache_size); |
238 | } | 238 | } |
239 | } | 239 | } |
@@ -242,7 +242,7 @@ static int init_dircache(bool preinit) | |||
242 | { | 242 | { |
243 | if (preinit) | 243 | if (preinit) |
244 | return -1; | 244 | return -1; |
245 | 245 | ||
246 | if (!dircache_is_enabled() | 246 | if (!dircache_is_enabled() |
247 | && !dircache_is_initializing()) | 247 | && !dircache_is_initializing()) |
248 | { | 248 | { |
@@ -253,7 +253,7 @@ static int init_dircache(bool preinit) | |||
253 | } | 253 | } |
254 | result = dircache_build(global_status.dircache_size); | 254 | result = dircache_build(global_status.dircache_size); |
255 | } | 255 | } |
256 | 256 | ||
257 | if (result < 0) | 257 | if (result < 0) |
258 | { | 258 | { |
259 | /* Initialization of dircache failed. Manual action is | 259 | /* Initialization of dircache failed. Manual action is |
@@ -263,7 +263,7 @@ static int init_dircache(bool preinit) | |||
263 | global_settings.dircache = false; | 263 | global_settings.dircache = false; |
264 | } | 264 | } |
265 | } | 265 | } |
266 | 266 | ||
267 | if (clear) | 267 | if (clear) |
268 | { | 268 | { |
269 | backlight_on(); | 269 | backlight_on(); |
@@ -271,7 +271,7 @@ static int init_dircache(bool preinit) | |||
271 | global_status.dircache_size = dircache_get_cache_size(); | 271 | global_status.dircache_size = dircache_get_cache_size(); |
272 | status_save(); | 272 | status_save(); |
273 | } | 273 | } |
274 | 274 | ||
275 | return result; | 275 | return result; |
276 | #else | 276 | #else |
277 | (void)preinit; | 277 | (void)preinit; |
@@ -288,7 +288,7 @@ static void init_tagcache(void) | |||
288 | long talked_tick = 0; | 288 | long talked_tick = 0; |
289 | #endif | 289 | #endif |
290 | tagcache_init(); | 290 | tagcache_init(); |
291 | 291 | ||
292 | while (!tagcache_is_initialized()) | 292 | while (!tagcache_is_initialized()) |
293 | { | 293 | { |
294 | int ret = tagcache_get_commit_step(); | 294 | int ret = tagcache_get_commit_step(); |
@@ -322,7 +322,7 @@ static void init_tagcache(void) | |||
322 | } | 322 | } |
323 | #else | 323 | #else |
324 | lcd_double_height(false); | 324 | lcd_double_height(false); |
325 | lcd_putsf(0, 1, " DB [%d/%d]", ret, | 325 | lcd_putsf(0, 1, " DB [%d/%d]", ret, |
326 | tagcache_get_max_commit_step()); | 326 | tagcache_get_max_commit_step()); |
327 | lcd_update(); | 327 | lcd_update(); |
328 | #endif | 328 | #endif |
@@ -370,7 +370,7 @@ static void init(void) | |||
370 | #if (CONFIG_PLATFORM & PLATFORM_ANDROID) | 370 | #if (CONFIG_PLATFORM & PLATFORM_ANDROID) |
371 | notification_init(); | 371 | notification_init(); |
372 | #endif | 372 | #endif |
373 | lang_init(core_language_builtin, language_strings, | 373 | lang_init(core_language_builtin, language_strings, |
374 | LANG_LAST_INDEX_IN_ARRAY); | 374 | LANG_LAST_INDEX_IN_ARRAY); |
375 | #ifdef DEBUG | 375 | #ifdef DEBUG |
376 | debug_init(); | 376 | debug_init(); |
@@ -452,7 +452,7 @@ static void init(void) | |||
452 | #endif | 452 | #endif |
453 | 453 | ||
454 | i2c_init(); | 454 | i2c_init(); |
455 | 455 | ||
456 | power_init(); | 456 | power_init(); |
457 | 457 | ||
458 | enable_irq(); | 458 | enable_irq(); |
@@ -471,13 +471,13 @@ static void init(void) | |||
471 | global_status.font_id[i] = FONT_SYSFIXED; | 471 | global_status.font_id[i] = FONT_SYSFIXED; |
472 | font_init(); | 472 | font_init(); |
473 | #endif | 473 | #endif |
474 | 474 | ||
475 | settings_reset(); | 475 | settings_reset(); |
476 | 476 | ||
477 | CHART(">show_logo"); | 477 | CHART(">show_logo"); |
478 | show_logo(); | 478 | show_logo(); |
479 | CHART("<show_logo"); | 479 | CHART("<show_logo"); |
480 | lang_init(core_language_builtin, language_strings, | 480 | lang_init(core_language_builtin, language_strings, |
481 | LANG_LAST_INDEX_IN_ARRAY); | 481 | LANG_LAST_INDEX_IN_ARRAY); |
482 | 482 | ||
483 | #ifdef DEBUG | 483 | #ifdef DEBUG |
@@ -676,7 +676,7 @@ static void init(void) | |||
676 | } | 676 | } |
677 | 677 | ||
678 | CHART(">settings_apply(true)"); | 678 | CHART(">settings_apply(true)"); |
679 | settings_apply(true); | 679 | settings_apply(true); |
680 | CHART("<settings_apply(true)"); | 680 | CHART("<settings_apply(true)"); |
681 | CHART(">init_dircache(false)"); | 681 | CHART(">init_dircache(false)"); |
682 | init_dircache(false); | 682 | init_dircache(false); |