From f31e123133060e2c093967d3442c7a767a1baaaa Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Sat, 19 May 2007 19:54:11 +0000 Subject: Remove unused function and unused header git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13424 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/gwps.c | 1 - apps/main_menu.h | 26 -------------------------- apps/menu.c | 7 +------ apps/onplay.c | 1 - apps/playback.c | 1 - apps/root_menu.c | 1 - apps/tree.c | 1 - 7 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 apps/main_menu.h diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index d8b2751847..c0fe24f04c 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c @@ -37,7 +37,6 @@ #include "audio.h" #include "usb.h" #include "status.h" -#include "main_menu.h" #include "ata.h" #include "screens.h" #include "playlist.h" diff --git a/apps/main_menu.h b/apps/main_menu.h deleted file mode 100644 index 769c6d86de..0000000000 --- a/apps/main_menu.h +++ /dev/null @@ -1,26 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * 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 _MAIN_MENU_H -#define _MAIN_MENU_H - -#include "menu.h" - -extern int main_menu(void); - -#endif diff --git a/apps/menu.c b/apps/menu.c index 04ccaf4366..474c1b6886 100644 --- a/apps/menu.c +++ b/apps/menu.c @@ -65,7 +65,7 @@ static struct menu_item_ex *current_submenus_menu; static int current_subitems[MAX_MENU_SUBITEMS]; static int current_subitems_count = 0; -void get_menu_callback(const struct menu_item_ex *m, +static void get_menu_callback(const struct menu_item_ex *m, menu_callback_type *menu_callback) { if (m->flags&(MENU_HAS_DESC|MENU_DYNAMIC_DESC)) @@ -604,8 +604,3 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected) return ret; } -int main_menu(void) -{ - return do_menu(NULL, 0) == MENU_ATTACHED_USB; -} - diff --git a/apps/onplay.c b/apps/onplay.c index 0c8afd9a0b..ef8ca9f157 100644 --- a/apps/onplay.c +++ b/apps/onplay.c @@ -54,7 +54,6 @@ #ifdef HAVE_LCD_BITMAP #include "icons.h" #endif -#include "main_menu.h" #include "sound_menu.h" #if CONFIG_CODEC == SWCODEC #include "menus/eq_menu.h" diff --git a/apps/playback.c b/apps/playback.c index e317c853fe..abc2e9ef30 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -50,7 +50,6 @@ #include "mp3_playback.h" #include "usb.h" #include "status.h" -#include "main_menu.h" #include "ata.h" #include "screens.h" #include "playlist.h" diff --git a/apps/root_menu.c b/apps/root_menu.c index 5f16a0ecb8..9858fed35d 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c @@ -49,7 +49,6 @@ #include "action.h" #include "yesno.h" -#include "main_menu.h" #include "tree.h" #if CONFIG_TUNER #include "radio.h" diff --git a/apps/tree.c b/apps/tree.c index 03683dbce7..8875cb9c27 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -31,7 +31,6 @@ #include "kernel.h" #include "usb.h" #include "tree.h" -#include "main_menu.h" #include "sprintf.h" #include "audio.h" #include "playlist.h" -- cgit v1.2.3