Index: apps/playlist_viewer.c =================================================================== --- apps/playlist_viewer.c (revision 30944) +++ apps/playlist_viewer.c (working copy) @@ -437,9 +437,6 @@ return true; } -MENUITEM_FUNCTION(save_playlist_item, 0, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), - save_playlist_func, 0, NULL, Icon_NOICON); - /* Menu of playlist commands. Invoked via ON+PLAY on main viewer screen. Returns -1 if USB attached, 0 if no playlist change, and 1 if playlist changed. */ @@ -521,13 +518,6 @@ return ret; } -/* Save playlist to disk */ -static int save_playlist_func(void) -{ - save_playlist_screen(viewer.playlist); - return 0; -} - /* View current playlist */ enum playlist_viewer_result playlist_viewer(void) { Index: apps/radio/radio_skin.c =================================================================== --- apps/radio/radio_skin.c (revision 30944) +++ apps/radio/radio_skin.c (working copy) @@ -125,7 +125,3 @@ return button; } -struct gui_wps *fms_get(enum screen_type screen) -{ - return skin_get_gwps(FM_SCREEN, screen); -} Index: apps/radio/radio.h =================================================================== --- apps/radio/radio.h (revision 30944) +++ apps/radio/radio.h (working copy) @@ -79,7 +79,6 @@ /* only radio.c should be using these! */ int fms_do_button_loop(bool update_screen); -struct gui_wps *fms_get(enum screen_type screen); void fms_fix_displays(enum fms_exiting toggle_state); #endif /* CONFIG_TUNER */ Index: apps/tree.c =================================================================== --- apps/tree.c (revision 30944) +++ apps/tree.c (working copy) @@ -307,16 +307,6 @@ } -/* drawer function for the GUI_EVENT_REDRAW callback */ -void tree_drawlists(void) -{ - /* band-aid to fix the bar/list redrawing properly after leaving a plugin */ - send_event(GUI_EVENT_THEME_CHANGED, NULL); - /* end bandaid */ - gui_synclist_draw(&tree_lists); -} - - struct tree_context* tree_get_context(void) { return &tc; Index: apps/gui/list.c =================================================================== --- apps/gui/list.c (revision 30944) +++ apps/gui/list.c (working copy) @@ -778,13 +778,6 @@ return gui_synclist_do_button(lists, action, wrap); } -bool gui_synclist_item_is_onscreen(struct gui_synclist *lists, - enum screen_type screen, int item) -{ - int nb_lines = list_get_nb_lines(lists, screen); - return (unsigned)(item - lists->start_item[screen]) < (unsigned) nb_lines; -} - /* Simple use list implementation */ static int simplelist_line_count = 0; static char simplelist_text[SIMPLELIST_MAX_LINES][SIMPLELIST_MAX_LINELENGTH]; Index: apps/gui/list.h =================================================================== --- apps/gui/list.h (revision 30944) +++ apps/gui/list.h (working copy) @@ -165,8 +165,6 @@ enum themable_icons icon); extern void gui_synclist_hide_selection_marker(struct gui_synclist *lists, bool hide); -extern bool gui_synclist_item_is_onscreen(struct gui_synclist *lists, - enum screen_type screen, int item); /* * Do the action implied by the given button, * returns true if the action was handled. Index: apps/gui/skin_engine/skin_engine.h =================================================================== --- apps/gui/skin_engine/skin_engine.h (revision 30944) +++ apps/gui/skin_engine/skin_engine.h (working copy) @@ -71,9 +71,6 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data, const char *buf, bool isfile); -/* call this in statusbar toggle handlers if needed */ -void skin_statusbar_changed(struct gui_wps*); - bool skin_has_sbs(enum screen_type screen, struct wps_data *data); Index: apps/gui/skin_engine/skin_display.c =================================================================== --- apps/gui/skin_engine/skin_display.c (revision 30944) +++ apps/gui/skin_engine/skin_display.c (working copy) @@ -95,39 +95,6 @@ #ifdef HAVE_LCD_BITMAP -void skin_statusbar_changed(struct gui_wps *skin) -{ - if (!skin) - return; - struct wps_data *data = skin->data; - const struct screen *display = skin->display; - const int screen = display->screen_type; - struct skin_viewport *svp = skin_find_item(VP_DEFAULT_LABEL, SKIN_FIND_VP, data); - - struct viewport *vp = &svp->vp; - viewport_set_defaults(vp, screen); - - if (data->wps_sb_tag) - { /* fix up the default viewport */ - if (data->show_sb_on_wps) - { - if (statusbar_position(screen) != STATUSBAR_OFF) - return; /* vp is fixed already */ - - vp->y = STATUSBAR_HEIGHT; - vp->height = display->lcdheight - STATUSBAR_HEIGHT; - } - else - { - if (statusbar_position(screen) == STATUSBAR_OFF) - return; /* vp is fixed already */ - vp->y = vp->x = 0; - vp->height = display->lcdheight; - vp->width = display->lcdwidth; - } - } -} - void draw_progressbar(struct gui_wps *gwps, int line, struct progressbar *pb) { struct screen *display = gwps->display; Index: apps/tree.h =================================================================== --- apps/tree.h (revision 30944) +++ apps/tree.h (working copy) @@ -103,7 +103,6 @@ * Call one of the two below after yields since the entrys may move inbetween */ struct entry* tree_get_entries(struct tree_context *t); struct entry* tree_get_entry_at(struct tree_context *t, int index); -void tree_drawlists(void); void tree_mem_init(void) INIT_ATTR; void tree_gui_init(void) INIT_ATTR; char* get_current_file(char* buffer, size_t buffer_len); Index: apps/tagcache.c =================================================================== --- apps/tagcache.c (revision 30944) +++ apps/tagcache.c (working copy) @@ -1309,11 +1309,6 @@ return true; } -bool tagcache_is_busy(void) -{ - return read_lock || write_lock; -} - bool tagcache_search(struct tagcache_search *tcs, int tag) { struct tagcache_header tag_hdr; @@ -3303,16 +3298,6 @@ } #endif /* !__PCTOOL__ */ -long tagcache_get_serial(void) -{ - return current_tcmh.serial; -} - -long tagcache_get_commitid(void) -{ - return current_tcmh.commitid; -} - static bool write_tag(int fd, const char *tagstr, const char *datastr) { char buf[512]; @@ -4796,13 +4781,6 @@ queue_post(&tagcache_queue, Q_STOP_SCAN, 0); } -#ifdef HAVE_TC_RAMCACHE -bool tagcache_is_ramcache(void) -{ - return tc_stat.ramcache; -} -#endif - #endif /* !__PCTOOL__ */ Index: apps/tagcache.h =================================================================== --- apps/tagcache.h (revision 30944) +++ apps/tagcache.h (working copy) @@ -214,7 +214,6 @@ bool tagcache_find_index(struct tagcache_search *tcs, const char *filename); bool tagcache_check_clauses(struct tagcache_search *tcs, struct tagcache_search_clause **clause, int count); -bool tagcache_is_busy(void); bool tagcache_search(struct tagcache_search *tcs, int tag); void tagcache_search_set_uniqbuf(struct tagcache_search *tcs, void *buffer, long length); @@ -228,7 +227,6 @@ void tagcache_search_finish(struct tagcache_search *tcs); long tagcache_get_numeric(const struct tagcache_search *tcs, int tag); long tagcache_increase_serial(void); -long tagcache_get_serial(void); bool tagcache_import_changelog(void); bool tagcache_create_changelog(struct tagcache_search *tcs); void tagcache_update_numeric(int idx_id, int tag, long data); @@ -244,7 +242,6 @@ void tagcache_screensync_enable(bool state); #ifdef HAVE_TC_RAMCACHE -bool tagcache_is_ramcache(void); #ifdef HAVE_DIRCACHE bool tagcache_fill_tags(struct mp3entry *id3, const char *filename); #endif Index: apps/playback.c =================================================================== --- apps/playback.c (revision 30944) +++ apps/playback.c (working copy) @@ -3618,13 +3618,7 @@ } } -/* Has the playback buffer been completely claimed? */ -bool audio_buffer_state_trashed(void) -{ - return buffer_state == AUDIOBUF_STATE_TRASHED; -} - /** --- Miscellaneous public interfaces --- **/ #ifdef HAVE_ALBUMART Index: apps/playback.h =================================================================== --- apps/playback.h (revision 30944) +++ apps/playback.h (working copy) @@ -87,7 +87,6 @@ }; bool audio_restore_playback(int type); /* Restores the audio buffer to handle the requested playback */ size_t audio_get_filebuflen(void); -bool audio_buffer_state_trashed(void); /* Automatic transition? Only valid to call during the track change events, otherwise the result is undefined. */ Index: firmware/enc_base.c =================================================================== --- firmware/enc_base.c (revision 30944) +++ firmware/enc_base.c (working copy) @@ -25,17 +25,6 @@ /** mp3_enc.codec **/ -/* These are in descending order rather than in MPEG frequency index - order */ -const unsigned long mp3_enc_sampr[MP3_ENC_NUM_SAMPR] = -{ - 48000, 44100, 32000, /* MPEG 1 */ - 24000, 22050, 16000, /* MPEG 2 */ -#if 0 - 12000, 11025, 8000, /* MPEG 2.5 */ -#endif -}; - /* All bitrates used in the MPA L3 standard */ const unsigned long mp3_enc_bitr[MP3_ENC_NUM_BITR] = { Index: firmware/target/sh/archos/audio-archos.c =================================================================== --- firmware/target/sh/archos/audio-archos.c (revision 30944) +++ firmware/target/sh/archos/audio-archos.c (working copy) @@ -536,14 +536,6 @@ #endif } -long mp3_get_playtime(void) -{ - if (paused) - return cumulative_ticks; - else - return cumulative_ticks + current_tick - playstart_tick; -} - void mp3_reset_playtime(void) { cumulative_ticks = 0; Index: firmware/target/sh/archos/mascodec-archos.c =================================================================== --- firmware/target/sh/archos/mascodec-archos.c (revision 30944) +++ firmware/target/sh/archos/mascodec-archos.c (working copy) @@ -30,39 +30,6 @@ static int mas_devread(unsigned long *dest, int len); -int mas_default_read(unsigned short *buf) -{ - unsigned char *dest = (unsigned char *)buf; - int ret = 0; - - i2c_begin(); - - i2c_start(); - i2c_outb(MAS_DEV_WRITE); - if (i2c_getack()) { - i2c_outb(MAS_DATA_READ); - if (i2c_getack()) { - i2c_start(); - i2c_outb(MAS_DEV_READ); - if (i2c_getack()) { - dest[0] = i2c_inb(0); - dest[1] = i2c_inb(1); - } - else - ret = -3; - } - else - ret = -2; - } - else - ret = -1; - - i2c_stop(); - - i2c_end(); - return ret; -} - int mas_run(unsigned short address) { int ret = 0; @@ -307,40 +274,6 @@ } #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) -int mas_direct_config_read(unsigned char reg) -{ - int ret = 0; - unsigned char tmp[2]; - - i2c_begin(); - - i2c_start(); - i2c_outb(MAS_DEV_WRITE); - if (i2c_getack()) { - i2c_outb(reg); - if (i2c_getack()) { - i2c_start(); - i2c_outb(MAS_DEV_READ); - if (i2c_getack()) { - tmp[0] = i2c_inb(0); - tmp[1] = i2c_inb(1); /* NAK the last byte */ - ret = (tmp[0] << 8) | tmp[1]; - } - else - ret = -3; - } - else - ret = -2; - } - else - ret = -1; - - i2c_stop(); - - i2c_end(); - return ret; -} - int mas_direct_config_write(unsigned char reg, unsigned int val) { int ret = 0; Index: firmware/export/mascodec.h =================================================================== --- firmware/export/mascodec.h (revision 30944) +++ firmware/export/mascodec.h (working copy) @@ -21,14 +21,12 @@ #ifndef _MASCODEC_H_ #define _MASCODEC_H_ -int mas_default_read(unsigned short *buf); int mas_run(unsigned short address); int mas_readmem(int bank, int addr, unsigned long* dest, int len); int mas_writemem(int bank, int addr, const unsigned long* src, int len); int mas_readreg(int reg); int mas_writereg(int reg, unsigned int val); void mas_reset(void); -int mas_direct_config_read(unsigned char reg); int mas_direct_config_write(unsigned char reg, unsigned int val); int mas_codec_writereg(int reg, unsigned int val); int mas_codec_readreg(int reg); Index: firmware/export/mp3_playback.h =================================================================== --- firmware/export/mp3_playback.h (revision 30944) +++ firmware/export/mp3_playback.h (working copy) @@ -46,7 +46,6 @@ void mp3_play_pause(bool play); bool mp3_pause_done(void); void mp3_play_stop(void); -long mp3_get_playtime(void); void mp3_reset_playtime(void); bool mp3_is_playing(void); unsigned char* mp3_get_pos(void); Index: firmware/export/enc_base.h =================================================================== --- firmware/export/enc_base.h (revision 30944) +++ firmware/export/enc_base.h (working copy) @@ -94,10 +94,6 @@ #define MP3_ENC_SAMPR_CAPS (MPEG1_SAMPR_CAPS | MPEG2_SAMPR_CAPS) -/* This number is count of full encoder set */ -#define MP3_ENC_NUM_SAMPR 6 - -extern const unsigned long mp3_enc_sampr[MP3_ENC_NUM_SAMPR]; extern const unsigned long mp3_enc_bitr[MP3_ENC_NUM_BITR]; struct mp3_enc_config Index: firmware/export/usb.h =================================================================== --- firmware/export/usb.h (revision 30944) +++ firmware/export/usb.h (working copy) @@ -132,7 +132,6 @@ struct usb_transfer_completion_event_data *event_data); bool usb_driver_enabled(int driver); bool usb_exclusive_storage(void); /* storage is available for usb */ -void usb_storage_try_release_storage(void); #endif int usb_release_exclusive_storage(void); Index: firmware/usbstack/usb_storage.c =================================================================== --- firmware/usbstack/usb_storage.c (revision 30944) +++ firmware/usbstack/usb_storage.c (working copy) @@ -364,24 +364,6 @@ #endif } -void usb_storage_try_release_storage(void) -{ - /* Check if there is a connected drive left. If not, - release excusive access */ - bool canrelease=true; - int i; - for(i=0;i