summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2010-01-03 10:50:34 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2010-01-03 10:50:34 +0000
commit05778b501d7dfa0d6e55d779a577db9581774e2d (patch)
treeeaf9d4e5eda0a9fc72eb82b1a262c0422e38e51b /apps
parentbfc129a5928072edb736b0a682b91bbaaf69f7f7 (diff)
downloadrockbox-05778b501d7dfa0d6e55d779a577db9581774e2d.tar.gz
rockbox-05778b501d7dfa0d6e55d779a577db9581774e2d.tar.bz2
rockbox-05778b501d7dfa0d6e55d779a577db9581774e2d.zip
Fix further tabs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24156 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/skin_engine/skin_buffer.c2
-rw-r--r--apps/gui/skin_engine/skin_display.c4
-rw-r--r--apps/gui/skin_engine/skin_tokens.c76
-rw-r--r--apps/gui/skin_engine/skin_tokens.h2
-rw-r--r--apps/gui/skin_engine/wps_debug.c26
-rw-r--r--apps/gui/statusbar.h2
-rw-r--r--apps/keymaps/keymap-ipod.c2
-rw-r--r--apps/keymaps/keymap-mr500.c2
-rw-r--r--apps/metadata/rm.c4
-rw-r--r--apps/recorder/pcm_record.c2
10 files changed, 61 insertions, 61 deletions
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;
};
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 9b3323bb82..d49f95b66c 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -187,7 +187,7 @@ const struct button_mapping button_context_recscreen[] = {
{ ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
- { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
LAST_ITEM_IN_LIST
}; /* button_context_recscreen */
diff --git a/apps/keymaps/keymap-mr500.c b/apps/keymaps/keymap-mr500.c
index 0b1dc767f2..11e1e60d61 100644
--- a/apps/keymaps/keymap-mr500.c
+++ b/apps/keymaps/keymap-mr500.c
@@ -56,7 +56,7 @@ static const struct button_mapping button_context_standard[] = {
}; /* button_context_standard */
static const struct button_mapping button_context_wps[] = {
- { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY },
+ { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY },
{ ACTION_WPS_STOP, BUTTON_RC_DOWN|BUTTON_REL, BUTTON_RC_DOWN },
{ ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF },
diff --git a/apps/metadata/rm.c b/apps/metadata/rm.c
index 4b52c34d02..5740616042 100644
--- a/apps/metadata/rm.c
+++ b/apps/metadata/rm.c
@@ -379,7 +379,7 @@ static int rm_parse_header(int fd, RMContext *rmctx, struct mp3entry *id3)
read_uint32be(fd,&rmctx->nb_packets);
skipped += 4;
read_uint32be(fd,&next_data_off);
- skipped += 4;
+ skipped += 4;
/***
* nb_packets correction :
@@ -393,7 +393,7 @@ static int rm_parse_header(int fd, RMContext *rmctx, struct mp3entry *id3)
DEBUGF(" data_nb_packets = %ld\n",rmctx->nb_packets);
DEBUGF(" next DATA offset = %ld\n",next_data_off);
- header_end = 1;
+ header_end = 1;
break;
}
if(header_end) break;
diff --git a/apps/recorder/pcm_record.c b/apps/recorder/pcm_record.c
index d1dc03113d..217d276669 100644
--- a/apps/recorder/pcm_record.c
+++ b/apps/recorder/pcm_record.c
@@ -368,7 +368,7 @@ void pcm_rec_init(void)
pcmrec_thread_id =
create_thread(pcmrec_thread, pcmrec_stack, sizeof(pcmrec_stack),
0, pcmrec_thread_name IF_PRIO(, PRIORITY_RECORDING)
- IF_COP(, CPU));
+ IF_COP(, CPU));
queue_enable_queue_send(&pcmrec_queue, &pcmrec_queue_send,
pcmrec_thread_id);
} /* pcm_rec_init */