len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix further tabs

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24156 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2010-01-03 10:50:34 +00:00
parent bfc129a592
commit 05778b501d
14 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/gui/skin_engine/skin_buffer.c
View file

@ -66,7 +66,7 @@
#define SKIN_BUFFER_SIZE (MAIN_BUFFER + REMOTE_BUFFER) + \ #define SKIN_BUFFER_SIZE (MAIN_BUFFER + REMOTE_BUFFER) + \
(WPS_MAX_TOKENS * sizeof(struct wps_token)) (WPS_MAX_TOKENS * sizeof(struct wps_token))
#endif #endif
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS

4
apps/gui/skin_engine/skin_display.c
View file

@ -229,11 +229,11 @@ static void wps_display_images(struct gui_wps *gwps, struct viewport* vp)
#ifdef HAVE_ALBUMART #ifdef HAVE_ALBUMART
/* now draw the AA */ /* now draw the AA */
if (data->albumart && data->albumart->vp == vp 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), draw_album_art(gwps, playback_current_aa_hid(data->playback_aa_slot),
false); false);
data->albumart->draw = false; data->albumart->draw = false;
} }
#endif #endif

74
apps/gui/skin_engine/skin_tokens.c
View file

@ -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) static int pitch_speed_enum(int range, int32_t val, int32_t normval)
{ {
int center; int center;
int n; int n;
if (range < 3) if (range < 3)
return (val == normval) + 1; return (val == normval) + 1;
if (val == normval) if (val == normval)
return range; return range;
center = range / 2; center = range / 2;
n = (center * val) / normval + 1; n = (center * val) / normval + 1;
return (range <= n) ? (range - 1) : n; return (range <= n) ? (range - 1) : n;
} }
#endif #endif
@ -415,8 +415,8 @@ const char *get_token_value(struct gui_wps *gwps,
case WPS_TOKEN_ALBUMART_DISPLAY: case WPS_TOKEN_ALBUMART_DISPLAY:
if (!data->albumart) if (!data->albumart)
return NULL; return NULL;
if (!data->albumart->draw) if (!data->albumart->draw)
data->albumart->draw = true; data->albumart->draw = true;
return NULL; return NULL;
#endif #endif
@ -549,10 +549,10 @@ const char *get_token_value(struct gui_wps *gwps,
} }
#endif #endif
#ifdef HAVE_USB_POWER #ifdef HAVE_USB_POWER
case WPS_TOKEN_USB_POWERED: case WPS_TOKEN_USB_POWERED:
if (usb_powered()) if (usb_powered())
return "u"; return "u";
return NULL; return NULL;
#endif #endif
case WPS_TOKEN_BATTERY_SLEEPTIME: case WPS_TOKEN_BATTERY_SLEEPTIME:
{ {
@ -836,32 +836,32 @@ const char *get_token_value(struct gui_wps *gwps,
int32_t pitch = sound_get_pitch(); int32_t pitch = sound_get_pitch();
snprintf(buf, buf_size, "%ld.%ld", snprintf(buf, buf_size, "%ld.%ld",
pitch / PITCH_SPEED_PRECISION, pitch / PITCH_SPEED_PRECISION,
(pitch % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10)); (pitch % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10));
if (intval) if (intval)
*intval = pitch_speed_enum(limit, pitch, *intval = pitch_speed_enum(limit, pitch,
PITCH_SPEED_PRECISION * 100); PITCH_SPEED_PRECISION * 100);
return buf; return buf;
} }
#endif #endif
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC
case WPS_TOKEN_SOUND_SPEED: case WPS_TOKEN_SOUND_SPEED:
{ {
int32_t pitch = sound_get_pitch(); int32_t pitch = sound_get_pitch();
int32_t speed; int32_t speed;
if (dsp_timestretch_available()) if (dsp_timestretch_available())
speed = GET_SPEED(pitch, dsp_get_timestretch()); speed = GET_SPEED(pitch, dsp_get_timestretch());
else else
speed = pitch; speed = pitch;
snprintf(buf, buf_size, "%ld.%ld", snprintf(buf, buf_size, "%ld.%ld",
speed / PITCH_SPEED_PRECISION, speed / PITCH_SPEED_PRECISION,
(speed % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10)); (speed % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10));
if (intval) if (intval)
*intval = pitch_speed_enum(limit, speed, *intval = pitch_speed_enum(limit, speed,
PITCH_SPEED_PRECISION * 100); PITCH_SPEED_PRECISION * 100);
return buf; return buf;
} }
#endif #endif
case WPS_TOKEN_MAIN_HOLD: case WPS_TOKEN_MAIN_HOLD:
@ -1122,7 +1122,7 @@ const char *get_token_value(struct gui_wps *gwps,
break; break;
} }
#endif #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); snprintf(buf, buf_size, "%d", global_settings.mp3_enc_config.bitrate+1);
return buf; return buf;
@ -1136,9 +1136,9 @@ const char *get_token_value(struct gui_wps *gwps,
return buf; return buf;
#endif #endif
case WPS_TOKEN_REC_MONO: case WPS_TOKEN_REC_MONO:
if (!global_settings.rec_channels) if (!global_settings.rec_channels)
return "m"; return "m";
return NULL; return NULL;
#endif /* HAVE_RECORDING */ #endif /* HAVE_RECORDING */
case WPS_TOKEN_CURRENT_SCREEN: case WPS_TOKEN_CURRENT_SCREEN:

2
apps/gui/skin_engine/skin_tokens.h
View file

@ -226,7 +226,7 @@ struct wps_token {
union { union {
char c; char c;
unsigned short i; unsigned short i;
void* data; void* data;
} value; } value;
}; };

26
apps/gui/skin_engine/wps_debug.c
View file

@ -50,18 +50,18 @@ struct debug_token_table
#define X(name) name, #name #define X(name) name, #name
struct debug_token_table tokens[] = { struct debug_token_table tokens[] = {
{ X(TOKEN_MARKER_CONTROL_TOKENS) }, { X(TOKEN_MARKER_CONTROL_TOKENS) },
{ X(TOKEN_MARKER_BATTERY) }, { X(TOKEN_MARKER_BATTERY) },
{ X(TOKEN_MARKER_SOUND) }, { X(TOKEN_MARKER_SOUND) },
{ X(TOKEN_MARKER_RTC) }, { X(TOKEN_MARKER_RTC) },
{ X(TOKEN_MARKER_DATABASE) }, { X(TOKEN_MARKER_DATABASE) },
{ X(TOKEN_MARKER_FILE) }, { X(TOKEN_MARKER_FILE) },
{ X(TOKEN_MARKER_IMAGES) }, { X(TOKEN_MARKER_IMAGES) },
{ X(TOKEN_MARKER_METADATA) }, { X(TOKEN_MARKER_METADATA) },
{ X(TOKEN_MARKER_PLAYBACK_INFO) }, { X(TOKEN_MARKER_PLAYBACK_INFO) },
{ X(TOKEN_MARKER_PLAYLIST) }, { X(TOKEN_MARKER_PLAYLIST) },
{ X(TOKEN_MARKER_MISC) }, { X(TOKEN_MARKER_MISC) },
{ X(TOKEN_MARKER_RECORDING) }, { X(TOKEN_MARKER_RECORDING) },
{ X(TOKEN_MARKER_END) }, { X(TOKEN_MARKER_END) },
}; };
#undef X #undef X
@ -499,7 +499,7 @@ static char *get_token_desc(struct wps_token *token, char *buf,
if (token->type < tokens[i].start_marker) if (token->type < tokens[i].start_marker)
{ {
snprintf(buf, bufsize, "FIXME: %s + %d\n", tokens[i-1].desc, 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; break;
} }
} }

2
apps/gui/statusbar.h
View file

@ -70,7 +70,7 @@ struct gui_statusbar
struct status_info lastinfo; struct status_info lastinfo;
#if CONFIG_RTC #if CONFIG_RTC
struct tm *time; struct tm *time;
int last_tm_min; int last_tm_min;
#endif #endif
struct screen * display; struct screen * display;
}; };

2
apps/keymaps/keymap-ipod.c
View file

@ -187,7 +187,7 @@ const struct button_mapping button_context_recscreen[] = {
{ ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_LEFT, 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 LAST_ITEM_IN_LIST
}; /* button_context_recscreen */ }; /* button_context_recscreen */

2
apps/keymaps/keymap-mr500.c
View file

@ -56,7 +56,7 @@ static const struct button_mapping button_context_standard[] = {
}; /* button_context_standard */ }; /* button_context_standard */
static const struct button_mapping button_context_wps[] = { 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_STOP, BUTTON_RC_DOWN|BUTTON_REL, BUTTON_RC_DOWN },
{ ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF },

4
apps/metadata/rm.c
View file

@ -379,7 +379,7 @@ static int rm_parse_header(int fd, RMContext *rmctx, struct mp3entry *id3)
read_uint32be(fd,&rmctx->nb_packets); read_uint32be(fd,&rmctx->nb_packets);
skipped += 4; skipped += 4;
read_uint32be(fd,&next_data_off); read_uint32be(fd,&next_data_off);
skipped += 4; skipped += 4;
/*** /***
* nb_packets correction : * 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(" data_nb_packets = %ld\n",rmctx->nb_packets);
DEBUGF(" next DATA offset = %ld\n",next_data_off); DEBUGF(" next DATA offset = %ld\n",next_data_off);
header_end = 1; header_end = 1;
break; break;
} }
if(header_end) break; if(header_end) break;

2
apps/recorder/pcm_record.c
View file

@ -368,7 +368,7 @@ void pcm_rec_init(void)
pcmrec_thread_id = pcmrec_thread_id =
create_thread(pcmrec_thread, pcmrec_stack, sizeof(pcmrec_stack), create_thread(pcmrec_thread, pcmrec_stack, sizeof(pcmrec_stack),
0, pcmrec_thread_name IF_PRIO(, PRIORITY_RECORDING) 0, pcmrec_thread_name IF_PRIO(, PRIORITY_RECORDING)
IF_COP(, CPU)); IF_COP(, CPU));
queue_enable_queue_send(&pcmrec_queue, &pcmrec_queue_send, queue_enable_queue_send(&pcmrec_queue, &pcmrec_queue_send,
pcmrec_thread_id); pcmrec_thread_id);
} /* pcm_rec_init */ } /* pcm_rec_init */

2
firmware/bidi.c
View file

@ -159,7 +159,7 @@ unsigned short *bidi_l2v(const unsigned char *str, int orientation)
#ifdef BOOTLOADER #ifdef BOOTLOADER
(void)orientation; (void)orientation;
return utf16_buf; return utf16_buf;
#else /* !BOOTLOADER */ #else /* !BOOTLOADER */
if (target == utf16_buf) /* empty string */ if (target == utf16_buf) /* empty string */
return target; return target;

2
firmware/font.c
View file

@ -578,7 +578,7 @@ void font_init(void)
struct font* font_get(int font) struct font* font_get(int font)
{ {
(void)font; (void)font;
return &sysfont; return &sysfont;
} }
/* /*

2
firmware/kernel.c
View file

@ -260,7 +260,7 @@ void sleep(int ticks)
switch_thread(); switch_thread();
#elif defined(CREATIVE_ZVx) && defined(BOOTLOADER) #elif defined(CREATIVE_ZVx) && defined(BOOTLOADER)
/* hacky.. */ /* hacky.. */
long sleep_ticks = current_tick + ticks + 1; long sleep_ticks = current_tick + ticks + 1;
while (TIME_BEFORE(current_tick, sleep_ticks)) while (TIME_BEFORE(current_tick, sleep_ticks))
switch_thread(); switch_thread();
#else #else

2
firmware/sound.c
View file

@ -253,7 +253,7 @@ static void set_prescaled_volume(void)
|| defined(HAVE_AK4537) || defined(HAVE_UDA1341) || defined(HAVE_AK4537) || defined(HAVE_UDA1341)
audiohw_set_master_vol(tenthdb2master(l), tenthdb2master(r)); audiohw_set_master_vol(tenthdb2master(l), tenthdb2master(r));
#if defined(HAVE_WM8975) || defined(HAVE_WM8758) \ #if defined(HAVE_WM8975) || defined(HAVE_WM8758) \
|| (defined(HAVE_WM8751) && !defined(MROBE_100)) || defined(HAVE_WM8985) || (defined(HAVE_WM8751) && !defined(MROBE_100)) || defined(HAVE_WM8985)
audiohw_set_lineout_vol(tenthdb2master(0), tenthdb2master(0)); audiohw_set_lineout_vol(tenthdb2master(0), tenthdb2master(0));
#endif #endif