This is the bug/patch tracker for Rockbox. Click here for more information.
Quick links: Bugs · Patches · Rockbox frontpage
FS#9281 - Rename of splash functions and fix some gcc4.3.1 warnings
Attached to Project:
Rockbox
Opened by Nils Wallménius (nls) - Thursday, 14 August 2008, 23:34 GMT+2
Last edited by Nils Wallménius (nls) - Friday, 15 August 2008, 10:28 GMT+2
Opened by Nils Wallménius (nls) - Thursday, 14 August 2008, 23:34 GMT+2
Last edited by Nils Wallménius (nls) - Friday, 15 August 2008, 10:28 GMT+2
|
DetailsThis patch does the following:
1) Removes gui_splash() 2) Rename gui_syncsplash() to splashf() and removed its voice capabilities. 3) Rename the internal splash() to splash_internal() and introduce an externally visible splash() that handles simple printing without printf functionality e.g splash(HZ, ID2P(LANG_FOO)); or splash(HZ, "foo"); LANG_* id's will be voiced. 4) adjust all places that called gui_syncsplash() to use the correct version from above, and the same for plugins, and now also have naming consistency with the plugins. (Earlier rb->splash() was used to call gui_syncsplash()) Anyway, I have not yet committed this because I ran into a weird crash bug on my 64 bit sim, it does not crash on target or 32 bit sims. On my sim any call to splashf() will segfault after the splash is displayed, gdb tells me the crash is in strlen... I have discovered a couple of crazy things about the crash. placing DEBUGF("foo\n"); before the call to splashf makes it not crash. When I turned on optimization when compiling the sim it would only crash with a voicefile present, without optimization voicefile doesn't matter. I would really like some help trying to pin down this issue as I don't really know where to look next... 
splash_rename.diff
(81.4 KiB)
apps/codecs.c | 2 apps/playlist.c | 61 +++++++++++++--------------- apps/screens.c | 8 +-- apps/action.c | 6 +- apps/recorder/radio.c | 23 ++++------ apps/recorder/recording.c | 9 +--- apps/tree.c | 12 ++--- apps/settings.c | 6 +- apps/plugins/xobox.c | 2 apps/plugins/keybox.c | 4 - apps/plugins/random_folder_advance_config.c | 12 ++--- apps/plugins/wavview.c | 6 +- apps/plugins/zxbox/snapshot.c | 2 apps/plugins/zxbox/spmain.c | 2 apps/plugins/wavrecord.c | 2 apps/plugins/ppmviewer.c | 2 apps/plugins/mpegplayer/mpegplayer.c | 2 apps/plugins/mpegplayer/disk_buf.c | 2 apps/plugins/sort.c | 4 - apps/plugins/vbrfix.c | 2 apps/plugins/splitedit.c | 12 ++--- apps/plugins/md5sum.c | 4 - apps/plugins/shortcuts/shortcuts_append.c | 2 apps/plugins/shortcuts/shortcuts_common.c | 8 +-- apps/plugins/shortcuts/shortcuts_view.c | 4 - apps/plugins/minesweeper.c | 4 - apps/plugins/wavplay.c | 8 +-- apps/plugins/jpeg.c | 4 - apps/plugins/lib/overlay.c | 14 +++--- apps/plugins/sokoban.c | 6 +- apps/plugins/mazezam.c | 2 apps/plugins/iriverify.c | 4 - apps/plugins/jewels.c | 4 - apps/plugins/rockpaint.c | 8 +-- apps/plugins/text_editor.c | 4 - apps/plugins/pacbox/pacbox.c | 2 apps/plugins/properties.c | 2 apps/onplay.c | 26 +++++------ apps/gui/splash.c | 34 ++++++--------- apps/gui/splash.h | 13 ++--- apps/gui/gwps-common.c | 11 +---- apps/gui/option_select.c | 2 apps/gui/pitchscreen.c | 2 apps/gui/color_picker.c | 2 apps/menus/recording_menu.c | 4 - apps/menus/settings_menu.c | 6 +- apps/menus/main_menu.c | 2 apps/menus/playback_menu.c | 5 -- apps/alarm_menu.c | 6 +- apps/playlist_viewer.c | 8 +-- apps/filetree.c | 37 ++++++++-------- apps/playback.c | 12 ++--- apps/enc_config.c | 4 - apps/plugin.c | 23 +++++----- apps/plugin.h | 14 +++--- apps/filetypes.c | 6 +- apps/bookmark.c | 10 ++-- apps/root_menu.c | 12 ++--- apps/debug_menu.c | 16 +++---- apps/main.c | 10 ++-- apps/misc.c | 14 ++---- apps/playlist_catalog.c | 11 +---- apps/tagtree.c | 21 ++++----- 63 files changed, 271 insertions(+), 301 deletions(-) |
This task depends upon
Closed by Nils Wallménius (nls)
Friday, 15 August 2008, 10:28 GMT+2
Reason for closing: Accepted
Additional comments about closing: committed as r 18282
Friday, 15 August 2008, 10:28 GMT+2
Reason for closing: Accepted
Additional comments about closing: committed as r 18282
A couple of (minor, silly) questions:
1) In splashf, why cast to (unsigned char *)? Should it not be (const char *)?
2) Should "splash(1," ever be used? I'd think "aplash(HZ," or "splash(0,".
3) Maybe the splash timer should be standardised and the first parameter made into a bool wait (false meaning time=0, true meaning time = HZ*2)?
fixed the macros s/<=/</
1) it comes down to the constants VIRT_PTR and VIRT_SIZE being defined as unsigned char* so gcc complains about comparisons between different pointer types.
2) I don't see a reason for it either so i changed the two occurrences to splash(0 (screens.c and bubbles.c)
3) I think we would loose much flexibility by doing this but I agree that we should set a standard splash time to be used in most of the core, maybe a new define like
#define STD_DELAY HZ*2
and
splash(STD_DELAY, "foo");