diff options
author | Nils Wallménius <nils@rockbox.org> | 2007-05-19 20:55:49 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2007-05-19 20:55:49 +0000 |
commit | f7a81a9d6aa358cd3767c30ac24c1a3efd5b967f (patch) | |
tree | 3c24452a909ce3fc41671aa23e36c5bdc7081d0c | |
parent | cd227acebc9e0a19e68c664260338e6b1acecdb2 (diff) | |
download | rockbox-f7a81a9d6aa358cd3767c30ac24c1a3efd5b967f.tar.gz rockbox-f7a81a9d6aa358cd3767c30ac24c1a3efd5b967f.zip |
More header and dead code cleanup.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13430 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/menus/display_menu.c | 1 | ||||
-rw-r--r-- | apps/menus/main_menu.c | 1 | ||||
-rw-r--r-- | apps/menus/playlist_menu.c | 4 | ||||
-rw-r--r-- | apps/menus/sound_menu.c | 6 | ||||
-rw-r--r-- | apps/player/keyboard.c | 1 | ||||
-rw-r--r-- | apps/playlist_menu.h | 1 | ||||
-rw-r--r-- | apps/settings_menu.h | 27 | ||||
-rw-r--r-- | apps/sound_menu.h | 1 |
8 files changed, 0 insertions, 42 deletions
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 @@ | |||
25 | #include "action.h" | 25 | #include "action.h" |
26 | #include "settings.h" | 26 | #include "settings.h" |
27 | #include "menu.h" | 27 | #include "menu.h" |
28 | #include "settings_menu.h" | ||
29 | #include "tree.h" | 28 | #include "tree.h" |
30 | #include "list.h" | 29 | #include "list.h" |
31 | #ifdef HAVE_LCD_BITMAP | 30 | #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 @@ | |||
28 | #include "powermgmt.h" | 28 | #include "powermgmt.h" |
29 | #include "menu.h" | 29 | #include "menu.h" |
30 | #include "misc.h" | 30 | #include "misc.h" |
31 | #include "settings_menu.h" | ||
32 | #include "exported_menus.h" | 31 | #include "exported_menus.h" |
33 | #include "tree.h" | 32 | #include "tree.h" |
34 | #ifdef HAVE_RECORDING | 33 | #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, | |||
82 | Icon_Playlist, | 82 | Icon_Playlist, |
83 | &create_playlist_item, &view_playlist, &save_playlist, &catalog); | 83 | &create_playlist_item, &view_playlist, &save_playlist, &catalog); |
84 | 84 | ||
85 | bool playlist_menu(void) | ||
86 | { | ||
87 | return do_menu(&playlist_options, NULL) == MENU_ATTACHED_USB; | ||
88 | } | ||
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, | |||
108 | ,&mdb_harmonics,&mdb_center,&mdb_shape | 108 | ,&mdb_harmonics,&mdb_center,&mdb_shape |
109 | #endif | 109 | #endif |
110 | ); | 110 | ); |
111 | /* SOUND MENU */ | ||
112 | /***********************************/ | ||
113 | 111 | ||
114 | bool sound_menu(void) | ||
115 | { | ||
116 | return do_menu(&sound_settings, 0) == MENU_ATTACHED_USB; | ||
117 | } | ||
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 @@ | |||
21 | #include "kernel.h" | 21 | #include "kernel.h" |
22 | #include "system.h" | 22 | #include "system.h" |
23 | #include "version.h" | 23 | #include "version.h" |
24 | #include "debug_menu.h" | ||
25 | #include "sprintf.h" | 24 | #include "sprintf.h" |
26 | #include <string.h> | 25 | #include <string.h> |
27 | #include "settings.h" | 26 | #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 @@ | |||
21 | 21 | ||
22 | #include "playlist.h" | 22 | #include "playlist.h" |
23 | 23 | ||
24 | bool playlist_menu(void); | ||
25 | int save_playlist_screen(struct playlist_info* playlist); | 24 | int save_playlist_screen(struct playlist_info* playlist); |
26 | 25 | ||
27 | #endif | 26 | #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 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2002 Robert Hak | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | #ifndef _SETTINGS_MENU_H | ||
20 | #define _SETTINGS_MENU_H | ||
21 | |||
22 | #include "menu.h" | ||
23 | |||
24 | bool settings_menu(void); | ||
25 | bool manage_settings_menu(void); | ||
26 | |||
27 | #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 @@ | |||
21 | 21 | ||
22 | #include "menu.h" | 22 | #include "menu.h" |
23 | 23 | ||
24 | bool sound_menu(void); | ||
25 | bool recording_menu(bool no_source); | 24 | bool recording_menu(bool no_source); |
26 | bool rectrigger(void); | 25 | bool rectrigger(void); |
27 | 26 | ||