? wps ? build ? wps-sb-tag.patch ? quick_screen.patch ? missing_headers.patch ? tools/iaudio ? tools/rdf2binary ? tools/mkboot ? tools/ipod_fw Index: apps/gui/gwps-common.c =================================================================== RCS file: /cvsroot/rockbox/apps/gui/gwps-common.c,v retrieving revision 1.1 diff -u -r1.1 gwps-common.c --- apps/gui/gwps-common.c 17 Nov 2005 20:20:01 -0000 1.1 +++ apps/gui/gwps-common.c 17 Nov 2005 22:45:20 -0000 @@ -1,3 +1,21 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id: gwps-common.c,v 1.141 2005/11/16 01:24:52 christi Exp $ + * + * Copyright (C) 2002 Björn Stenberg + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ #include "gwps-common.h" #include "gwps.h" #include "font.h" @@ -774,9 +792,9 @@ case '?': fmt++; - value = get_tag(gwps->data, id3, nid3, fmt, temp_buf, sizeof(temp_buf), - &tag_length, subline_time_mult, flags, - &intval); + value = get_tag(gwps->data, id3, nid3, fmt, temp_buf, + sizeof(temp_buf),&tag_length, subline_time_mult, + flags, &intval); while (*fmt && ('<' != *fmt)) fmt++; @@ -796,9 +814,9 @@ break; default: - value = get_tag(gwps->data, id3, nid3, fmt, temp_buf, sizeof(temp_buf), - &tag_length, subline_time_mult, flags, - &intval); + value = get_tag(gwps->data, id3, nid3, fmt, temp_buf, + sizeof(temp_buf), &tag_length, subline_time_mult, + flags,&intval); fmt += tag_length; if (value) @@ -1263,13 +1298,15 @@ { #define PROGRESS_BAR_HEIGHT 6 /* this should probably be defined elsewhere; config-*.h perhaps? */ int sby = i*h + offset + (h > 7 ? (h - 6) / 2 : 1); - gui_scrollbar_draw(display, 0, sby, display->width, PROGRESS_BAR_HEIGHT, - state->id3->length?state->id3->length:1, 0, - state->id3->length?state->id3->elapsed + state->ff_rewind_count:0, - HORIZONTAL); + gui_scrollbar_draw(display, 0, sby, display->width, + PROGRESS_BAR_HEIGHT, + state->id3->length?state->id3->length:1, 0, + state->id3->length?state->id3->elapsed + state->ff_rewind_count:0, + HORIZONTAL); #ifdef AB_REPEAT_ENABLE if ( ab_repeat_mode_enabled() ) - ab_draw_markers(state->id3->length, 0, sby, LCD_WIDTH, PROGRESS_BAR_HEIGHT); + ab_draw_markers(state->id3->length, 0, sby, LCD_WIDTH, + PROGRESS_BAR_HEIGHT); #endif update_line = true; } @@ -1553,6 +1590,7 @@ int songpos = 0; int i,j; struct wps_state *state = gwps->state; + struct screen *display = gwps->display; if (!state->id3) return false; @@ -1579,7 +1617,7 @@ player_progressbar[i] += binline[i*5+j]; } } - gwps->display->define_pattern(gwps->data->wps_progress_pat[0], player_progressbar); + display->define_pattern(gwps->data->wps_progress_pat[0], player_progressbar); return true; } @@ -1622,6 +1660,8 @@ char timestr[7]; struct wps_state *state = gwps->state; + struct screen *display = gwps->display; + struct wps_data *data = gwps->data; for (i=0; i < buf_size; i++) buf[i] = ' '; @@ -1683,8 +1723,9 @@ } } - gwps->display->define_pattern(gwps->data->wps_progress_pat[lcd_char_pos+1],player_progressbar); - buf[lcd_char_pos]=gwps->data->wps_progress_pat[lcd_char_pos+1]; + display->define_pattern(data->wps_progress_pat[lcd_char_pos+1], + player_progressbar); + buf[lcd_char_pos]=data->wps_progress_pat[lcd_char_pos+1]; } @@ -1714,9 +1755,9 @@ } } - gwps->display->define_pattern(gwps->data->wps_progress_pat[7],player_progressbar); + display->define_pattern(data->wps_progress_pat[7],player_progressbar); - buf[songpos/5]=gwps->data->wps_progress_pat[7]; + buf[songpos/5]=data->wps_progress_pat[7]; } } #endif @@ -1779,15 +1830,15 @@ if (direction == 1) { /* fast forwarding, calc max step relative to end */ - max_step = - (wps_state.id3->length - (wps_state.id3->elapsed + ff_rewind_count)) * - FF_REWIND_MAX_PERCENT / 100; + max_step = (wps_state.id3->length - + (wps_state.id3->elapsed + ff_rewind_count)) * + FF_REWIND_MAX_PERCENT / 100; } else { /* rewinding, calc max step relative to start */ max_step = (wps_state.id3->elapsed + ff_rewind_count) * - FF_REWIND_MAX_PERCENT / 100; + FF_REWIND_MAX_PERCENT / 100; } max_step = MAX(max_step, MIN_FF_REWIND_STEP); Index: apps/gui/gwps-common.h =================================================================== RCS file: /cvsroot/rockbox/apps/gui/gwps-common.h,v retrieving revision 1.1 diff -u -r1.1 gwps-common.h --- apps/gui/gwps-common.h 17 Nov 2005 20:20:01 -0000 1.1 +++ apps/gui/gwps-common.h 17 Nov 2005 22:45:20 -0000 @@ -1,3 +1,21 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id: gwps-common.h,v 1.15 2005/07/05 22:27:54 christi Exp $ + * + * Copyright (C) 2002 Björn Stenberg + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ #ifndef _GWPS_COMMON_ #define _GWPS_COMMON_ #include Index: apps/gui/gwps.c =================================================================== RCS file: /cvsroot/rockbox/apps/gui/gwps.c,v retrieving revision 1.1 diff -u -r1.1 gwps.c --- apps/gui/gwps.c 17 Nov 2005 20:20:01 -0000 1.1 +++ apps/gui/gwps.c 17 Nov 2005 22:45:21 -0000 @@ -1,3 +1,21 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id: gwps.c,v 1.261 2005/11/10 22:31:47 len0x Exp $ + * + * Copyright (C) 2002 Jerome Kuptz + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ #include #include #include @@ -137,7 +158,8 @@ if (TIME_AFTER(current_tick, next_refresh)) { FOR_NB_SCREENS(i) - gui_wps_refresh(&gui_syncwps.gui_wps[i], 0, WPS_REFRESH_PEAK_METER); + gui_wps_refresh(&gui_syncwps.gui_wps[i], 0, + WPS_REFRESH_PEAK_METER); next_refresh += HZ / PEAK_METER_FPS; } } @@ -333,7 +367,8 @@ #ifdef AB_REPEAT_ENABLE /* if we're in A/B repeat mode and the current position is past the A marker, jump back to the A marker... */ - if ( ab_repeat_mode_enabled() && ab_after_A_marker(wps_state.id3->elapsed) ) + if ( ab_repeat_mode_enabled() + && ab_after_A_marker(wps_state.id3->elapsed) ) { ab_jump_to_A_marker(); break; @@ -391,7 +426,8 @@ #ifdef AB_REPEAT_ENABLE /* if we're in A/B repeat mode and the current position is before the A marker, jump to the A marker... */ - if ( ab_repeat_mode_enabled() && ab_before_A_marker(wps_state.id3->elapsed) ) + if ( ab_repeat_mode_enabled() + && ab_before_A_marker(wps_state.id3->elapsed) ) { ab_jump_to_A_marker(); break; @@ -617,7 +656,8 @@ if (wps_state.id3){ FOR_NB_SCREENS(i) - gui_wps_refresh(&gui_syncwps.gui_wps[i], 0, WPS_REFRESH_NON_STATIC); + gui_wps_refresh(&gui_syncwps.gui_wps[i], 0, + WPS_REFRESH_NON_STATIC); } } if (button != BUTTON_NONE) @@ -674,7 +716,10 @@ /* to setup up the wps-data from a format-buffer (isfile = false) from a (wps-)file (isfile = true)*/ -bool wps_data_load(struct wps_data *wps_data, const char *buf, bool isfile, bool display) +bool wps_data_load(struct wps_data *wps_data, + const char *buf, + bool isfile, + bool display) { int i, s; int fd; @@ -706,7 +751,8 @@ if (fd >= 0) { - int numread = read(fd, wps_data->format_buffer, sizeof(wps_data->format_buffer) - 1); + int numread = read(fd, wps_data->format_buffer, + sizeof(wps_data->format_buffer) - 1); if (numread > 0) { Index: apps/gui/gwps.h =================================================================== RCS file: /cvsroot/rockbox/apps/gui/gwps.h,v retrieving revision 1.1 diff -u -r1.1 gwps.h --- apps/gui/gwps.h 17 Nov 2005 20:20:01 -0000 1.1 +++ apps/gui/gwps.h 17 Nov 2005 22:45:22 -0000 @@ -253,6 +253,8 @@ #ifdef HAVE_LCD_BITMAP struct gui_img img[MAX_IMAGES]; unsigned char img_buf[IMG_BUFSIZE]; + bool wps_sb_tag; + bool show_sb_on_wps; #endif #ifdef HAVE_LCD_CHARCELLS unsigned char wps_progress_pat[8]; @@ -274,7 +276,10 @@ /* to setup up the wps-data from a format-buffer (isfile = false) from a (wps-)file (isfile = true)*/ -bool wps_data_load(struct wps_data *wps_data, const char *buf, bool isfile, bool display); +bool wps_data_load(struct wps_data *wps_data, + const char *buf, + bool isfile, + bool display); /* wps_data end */