From 1e0ae1be63dbf3a0a666e1a488980ad4a9272d56 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Sun, 8 Apr 2007 05:30:03 +0000 Subject: [PATCH] Remove dead code git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13067 a1c6a512-1295-4272-9138-f99709370657 --- apps/SOURCES | 1 - apps/main_menu.c | 184 ----------------------------------------------- apps/main_menu.h | 1 - 3 files changed, 186 deletions(-) delete mode 100644 apps/main_menu.c diff --git a/apps/SOURCES b/apps/SOURCES index 7e6f84b03d..ca640ab05e 100644 --- a/apps/SOURCES +++ b/apps/SOURCES @@ -9,7 +9,6 @@ debug_menu.c filetypes.c language.c main.c -main_menu.c menu.c menus/display_menu.c #if CONFIG_CODEC == SWCODEC diff --git a/apps/main_menu.c b/apps/main_menu.c deleted file mode 100644 index 9d702cbb4a..0000000000 --- a/apps/main_menu.c +++ /dev/null @@ -1,184 +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. - * - ****************************************************************************/ -#include -#include "config.h" -#include "menu.h" -#include "tree.h" -#include "lcd.h" -#include "font.h" -#include "action.h" -#include "kernel.h" -#include "main_menu.h" -#include "debug_menu.h" -#include "sprintf.h" -#include -#include "settings.h" -#include "settings_menu.h" -#include "power.h" -#include "powermgmt.h" -#include "sound_menu.h" -#include "status.h" -#include "fat.h" -#include "bookmark.h" -#include "buffer.h" -#include "screens.h" -#include "playlist_menu.h" -#include "talk.h" -#if CONFIG_TUNER -#include "radio.h" -#endif -#include "misc.h" -#include "lang.h" -#include "logfdisp.h" -#include "plugin.h" -#include "filetypes.h" -#include "splash.h" - -#ifdef HAVE_RECORDING -#include "recording.h" -#endif - -#ifdef HAVE_RECORDING - -static bool rec_menu_recording_screen(void) -{ - return recording_screen(false); -} - -static bool recording_settings(void) -{ - bool ret; -#ifdef HAVE_FMRADIO_IN - int rec_source = global_settings.rec_source; -#endif - - ret = recording_menu(false); - -#ifdef HAVE_FMRADIO_IN - if (rec_source != global_settings.rec_source) - { - if (rec_source == AUDIO_SRC_FMRADIO) - radio_stop(); - /* If AUDIO_SRC_FMRADIO was selected from something else, - the recording screen will start the radio */ - } -#endif - - return ret; -} - -bool rec_menu(void) -{ - int m; - bool result; - - /* recording menu */ - static const struct menu_item items[] = { - { ID2P(LANG_RECORDING_MENU), rec_menu_recording_screen }, - { ID2P(LANG_RECORDING_SETTINGS), recording_settings}, - }; - - m=menu_init( items, sizeof(items) / sizeof(*items), NULL, - NULL, NULL, NULL); - result = menu_run(m); - menu_exit(m); - - return result; -} -#endif - - -#if 0 -#ifdef HAVE_LCD_CHARCELLS -static bool do_shutdown(void) -{ - sys_poweroff(); - return false; -} -#endif -bool main_menu(void) -{ - int m; - bool result; - int i = 0; - static bool inside_menu = false; - - - /* main menu */ - struct menu_item items[11]; - - if(inside_menu) return false; - inside_menu = true; - - items[i].desc = ID2P(LANG_SOUND_SETTINGS); - items[i++].function = sound_menu; - - items[i].desc = ID2P(LANG_GENERAL_SETTINGS); - items[i++].function = settings_menu; - - items[i].desc = ID2P(LANG_MANAGE_MENU); - items[i++].function = manage_settings_menu; - - items[i].desc = ID2P(LANG_CUSTOM_THEME); - items[i++].function = custom_theme_browse; - -#if CONFIG_TUNER - if(radio_hardware_present()) { - items[i].desc = ID2P(LANG_FM_RADIO); - items[i++].function = radio_screen; - } -#endif - -#ifdef HAVE_RECORDING - items[i].desc = ID2P(LANG_RECORDING); - items[i++].function = rec_menu; -#endif - - items[i].desc = ID2P(LANG_PLAYLIST_MENU); - items[i++].function = playlist_menu; - - items[i].desc = ID2P(LANG_PLUGINS); - items[i++].function = plugin_browse; - - items[i].desc = ID2P(LANG_INFO); - items[i++].function = info_menu; - -#ifdef HAVE_LCD_CHARCELLS - items[i].desc = ID2P(LANG_SHUTDOWN); - items[i++].function = do_shutdown; -#endif - - m=menu_init( items, i, NULL, NULL, NULL, NULL ); -#ifdef HAVE_LCD_CHARCELLS - status_set_param(true); -#endif - result = menu_run(m); -#ifdef HAVE_LCD_CHARCELLS - status_set_param(false); -#endif - menu_exit(m); - - inside_menu = false; - - return result; -} -#endif -/* ----------------------------------------------------------------- - * vim: et sw=4 ts=8 sts=4 tw=78 - */ diff --git a/apps/main_menu.h b/apps/main_menu.h index c70640fd77..769c6d86de 100644 --- a/apps/main_menu.h +++ b/apps/main_menu.h @@ -22,6 +22,5 @@ #include "menu.h" extern int main_menu(void); -extern bool rec_menu(void); #endif