From 05778b501d7dfa0d6e55d779a577db9581774e2d Mon Sep 17 00:00:00 2001 From: Andree Buschmann Date: Sun, 3 Jan 2010 10:50:34 +0000 Subject: Fix further tabs git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24156 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_buffer.c | 2 +- apps/gui/skin_engine/skin_display.c | 4 +- apps/gui/skin_engine/skin_tokens.c | 76 ++++++++++++++++++------------------- apps/gui/skin_engine/skin_tokens.h | 2 +- apps/gui/skin_engine/wps_debug.c | 26 ++++++------- apps/gui/statusbar.h | 2 +- 6 files changed, 56 insertions(+), 56 deletions(-) (limited to 'apps/gui') diff --git a/apps/gui/skin_engine/skin_buffer.c b/apps/gui/skin_engine/skin_buffer.c index 3ad2efc634..eb33cbe293 100644 --- a/apps/gui/skin_engine/skin_buffer.c +++ b/apps/gui/skin_engine/skin_buffer.c @@ -66,7 +66,7 @@ #define SKIN_BUFFER_SIZE (MAIN_BUFFER + REMOTE_BUFFER) + \ - (WPS_MAX_TOKENS * sizeof(struct wps_token)) + (WPS_MAX_TOKENS * sizeof(struct wps_token)) #endif #ifdef HAVE_LCD_CHARCELLS diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index 79690cb715..ea2c794272 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c @@ -229,11 +229,11 @@ static void wps_display_images(struct gui_wps *gwps, struct viewport* vp) #ifdef HAVE_ALBUMART /* now draw the AA */ if (data->albumart && data->albumart->vp == vp - && data->albumart->draw) + && data->albumart->draw) { draw_album_art(gwps, playback_current_aa_hid(data->playback_aa_slot), false); - data->albumart->draw = false; + data->albumart->draw = false; } #endif diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index eff972858d..794d7f4456 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -135,16 +135,16 @@ static char* get_dir(char* buf, int buf_size, const char* path, int level) */ static int pitch_speed_enum(int range, int32_t val, int32_t normval) { - int center; - int n; - - if (range < 3) - return (val == normval) + 1; - if (val == normval) - return range; - center = range / 2; - n = (center * val) / normval + 1; - return (range <= n) ? (range - 1) : n; + int center; + int n; + + if (range < 3) + return (val == normval) + 1; + if (val == normval) + return range; + center = range / 2; + n = (center * val) / normval + 1; + return (range <= n) ? (range - 1) : n; } #endif @@ -415,8 +415,8 @@ const char *get_token_value(struct gui_wps *gwps, case WPS_TOKEN_ALBUMART_DISPLAY: if (!data->albumart) return NULL; - if (!data->albumart->draw) - data->albumart->draw = true; + if (!data->albumart->draw) + data->albumart->draw = true; return NULL; #endif @@ -549,10 +549,10 @@ const char *get_token_value(struct gui_wps *gwps, } #endif #ifdef HAVE_USB_POWER - case WPS_TOKEN_USB_POWERED: - if (usb_powered()) - return "u"; - return NULL; + case WPS_TOKEN_USB_POWERED: + if (usb_powered()) + return "u"; + return NULL; #endif case WPS_TOKEN_BATTERY_SLEEPTIME: { @@ -836,32 +836,32 @@ const char *get_token_value(struct gui_wps *gwps, int32_t pitch = sound_get_pitch(); snprintf(buf, buf_size, "%ld.%ld", pitch / PITCH_SPEED_PRECISION, - (pitch % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10)); + (pitch % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10)); - if (intval) - *intval = pitch_speed_enum(limit, pitch, - PITCH_SPEED_PRECISION * 100); + if (intval) + *intval = pitch_speed_enum(limit, pitch, + PITCH_SPEED_PRECISION * 100); return buf; } #endif #if CONFIG_CODEC == SWCODEC - case WPS_TOKEN_SOUND_SPEED: - { - int32_t pitch = sound_get_pitch(); - int32_t speed; - if (dsp_timestretch_available()) - speed = GET_SPEED(pitch, dsp_get_timestretch()); - else - speed = pitch; - snprintf(buf, buf_size, "%ld.%ld", + case WPS_TOKEN_SOUND_SPEED: + { + int32_t pitch = sound_get_pitch(); + int32_t speed; + if (dsp_timestretch_available()) + speed = GET_SPEED(pitch, dsp_get_timestretch()); + else + speed = pitch; + snprintf(buf, buf_size, "%ld.%ld", speed / PITCH_SPEED_PRECISION, - (speed % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10)); - if (intval) - *intval = pitch_speed_enum(limit, speed, - PITCH_SPEED_PRECISION * 100); + (speed % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10)); + if (intval) + *intval = pitch_speed_enum(limit, speed, + PITCH_SPEED_PRECISION * 100); return buf; - } + } #endif case WPS_TOKEN_MAIN_HOLD: @@ -1122,7 +1122,7 @@ const char *get_token_value(struct gui_wps *gwps, break; } #endif - *intval = global_settings.mp3_enc_config.bitrate+1; + *intval = global_settings.mp3_enc_config.bitrate+1; } snprintf(buf, buf_size, "%d", global_settings.mp3_enc_config.bitrate+1); return buf; @@ -1136,9 +1136,9 @@ const char *get_token_value(struct gui_wps *gwps, return buf; #endif case WPS_TOKEN_REC_MONO: - if (!global_settings.rec_channels) - return "m"; - return NULL; + if (!global_settings.rec_channels) + return "m"; + return NULL; #endif /* HAVE_RECORDING */ case WPS_TOKEN_CURRENT_SCREEN: diff --git a/apps/gui/skin_engine/skin_tokens.h b/apps/gui/skin_engine/skin_tokens.h index 68a3fde944..481078bd6d 100644 --- a/apps/gui/skin_engine/skin_tokens.h +++ b/apps/gui/skin_engine/skin_tokens.h @@ -226,7 +226,7 @@ struct wps_token { union { char c; unsigned short i; - void* data; + void* data; } value; }; diff --git a/apps/gui/skin_engine/wps_debug.c b/apps/gui/skin_engine/wps_debug.c index 7232848005..e7277e847c 100644 --- a/apps/gui/skin_engine/wps_debug.c +++ b/apps/gui/skin_engine/wps_debug.c @@ -50,18 +50,18 @@ struct debug_token_table #define X(name) name, #name struct debug_token_table tokens[] = { { X(TOKEN_MARKER_CONTROL_TOKENS) }, - { X(TOKEN_MARKER_BATTERY) }, - { X(TOKEN_MARKER_SOUND) }, - { X(TOKEN_MARKER_RTC) }, - { X(TOKEN_MARKER_DATABASE) }, - { X(TOKEN_MARKER_FILE) }, - { X(TOKEN_MARKER_IMAGES) }, - { X(TOKEN_MARKER_METADATA) }, - { X(TOKEN_MARKER_PLAYBACK_INFO) }, - { X(TOKEN_MARKER_PLAYLIST) }, - { X(TOKEN_MARKER_MISC) }, - { X(TOKEN_MARKER_RECORDING) }, - { X(TOKEN_MARKER_END) }, + { X(TOKEN_MARKER_BATTERY) }, + { X(TOKEN_MARKER_SOUND) }, + { X(TOKEN_MARKER_RTC) }, + { X(TOKEN_MARKER_DATABASE) }, + { X(TOKEN_MARKER_FILE) }, + { X(TOKEN_MARKER_IMAGES) }, + { X(TOKEN_MARKER_METADATA) }, + { X(TOKEN_MARKER_PLAYBACK_INFO) }, + { X(TOKEN_MARKER_PLAYLIST) }, + { X(TOKEN_MARKER_MISC) }, + { X(TOKEN_MARKER_RECORDING) }, + { X(TOKEN_MARKER_END) }, }; #undef X @@ -499,7 +499,7 @@ static char *get_token_desc(struct wps_token *token, char *buf, if (token->type < tokens[i].start_marker) { snprintf(buf, bufsize, "FIXME: %s + %d\n", tokens[i-1].desc, - token->type - tokens[i-1].start_marker); + token->type - tokens[i-1].start_marker); break; } } diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h index 28c81053e0..7c3086ed3b 100644 --- a/apps/gui/statusbar.h +++ b/apps/gui/statusbar.h @@ -70,7 +70,7 @@ struct gui_statusbar struct status_info lastinfo; #if CONFIG_RTC struct tm *time; - int last_tm_min; + int last_tm_min; #endif struct screen * display; }; -- cgit v1.2.3