From f7a81a9d6aa358cd3767c30ac24c1a3efd5b967f Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Sat, 19 May 2007 20:55:49 +0000 Subject: More header and dead code cleanup. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13430 a1c6a512-1295-4272-9138-f99709370657 --- apps/menus/display_menu.c | 1 - apps/menus/main_menu.c | 1 - apps/menus/playlist_menu.c | 4 ---- apps/menus/sound_menu.c | 6 ------ apps/player/keyboard.c | 1 - apps/playlist_menu.h | 1 - apps/settings_menu.h | 27 --------------------------- apps/sound_menu.h | 1 - 8 files changed, 42 deletions(-) delete mode 100644 apps/settings_menu.h diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index 18506e7304..3f5c6b3b54 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c @@ -25,7 +25,6 @@ #include "action.h" #include "settings.h" #include "menu.h" -#include "settings_menu.h" #include "tree.h" #include "list.h" #ifdef HAVE_LCD_BITMAP diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 780d35d321..c118dac444 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -28,7 +28,6 @@ #include "powermgmt.h" #include "menu.h" #include "misc.h" -#include "settings_menu.h" #include "exported_menus.h" #include "tree.h" #ifdef HAVE_RECORDING diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c index 4f4b7c9839..b942dab3ee 100644 --- a/apps/menus/playlist_menu.c +++ b/apps/menus/playlist_menu.c @@ -82,7 +82,3 @@ MAKE_MENU(playlist_options, ID2P(LANG_PLAYLIST_MENU), NULL, Icon_Playlist, &create_playlist_item, &view_playlist, &save_playlist, &catalog); -bool playlist_menu(void) -{ - return do_menu(&playlist_options, NULL) == MENU_ATTACHED_USB; -} diff --git a/apps/menus/sound_menu.c b/apps/menus/sound_menu.c index 92422ae3e3..704ceeb7f6 100644 --- a/apps/menus/sound_menu.c +++ b/apps/menus/sound_menu.c @@ -108,10 +108,4 @@ MAKE_MENU(sound_settings, ID2P(LANG_SOUND_SETTINGS), NULL, Icon_Audio, ,&mdb_harmonics,&mdb_center,&mdb_shape #endif ); -/* SOUND MENU */ -/***********************************/ -bool sound_menu(void) -{ - return do_menu(&sound_settings, 0) == MENU_ATTACHED_USB; -} diff --git a/apps/player/keyboard.c b/apps/player/keyboard.c index 5fdf7249a4..18880d0c47 100644 --- a/apps/player/keyboard.c +++ b/apps/player/keyboard.c @@ -21,7 +21,6 @@ #include "kernel.h" #include "system.h" #include "version.h" -#include "debug_menu.h" #include "sprintf.h" #include #include "settings.h" diff --git a/apps/playlist_menu.h b/apps/playlist_menu.h index db841c371d..1f60337273 100644 --- a/apps/playlist_menu.h +++ b/apps/playlist_menu.h @@ -21,7 +21,6 @@ #include "playlist.h" -bool playlist_menu(void); int save_playlist_screen(struct playlist_info* playlist); #endif diff --git a/apps/settings_menu.h b/apps/settings_menu.h deleted file mode 100644 index 619e17a894..0000000000 --- a/apps/settings_menu.h +++ /dev/null @@ -1,27 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 Robert Hak - * - * 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 _SETTINGS_MENU_H -#define _SETTINGS_MENU_H - -#include "menu.h" - -bool settings_menu(void); -bool manage_settings_menu(void); - -#endif diff --git a/apps/sound_menu.h b/apps/sound_menu.h index 4d295b0a70..aa858c91f2 100644 --- a/apps/sound_menu.h +++ b/apps/sound_menu.h @@ -21,7 +21,6 @@ #include "menu.h" -bool sound_menu(void); bool recording_menu(bool no_source); bool rectrigger(void); -- cgit v1.2.3