summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/gwps.c1
-rw-r--r--apps/main_menu.h26
-rw-r--r--apps/menu.c7
-rw-r--r--apps/onplay.c1
-rw-r--r--apps/playback.c1
-rw-r--r--apps/root_menu.c1
-rw-r--r--apps/tree.c1
7 files changed, 1 insertions, 37 deletions
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 @@
37#include "audio.h" 37#include "audio.h"
38#include "usb.h" 38#include "usb.h"
39#include "status.h" 39#include "status.h"
40#include "main_menu.h"
41#include "ata.h" 40#include "ata.h"
42#include "screens.h" 41#include "screens.h"
43#include "playlist.h" 42#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 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2002 Björn Stenberg
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 _MAIN_MENU_H
20#define _MAIN_MENU_H
21
22#include "menu.h"
23
24extern int main_menu(void);
25
26#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;
65static int current_subitems[MAX_MENU_SUBITEMS]; 65static int current_subitems[MAX_MENU_SUBITEMS];
66static int current_subitems_count = 0; 66static int current_subitems_count = 0;
67 67
68void get_menu_callback(const struct menu_item_ex *m, 68static void get_menu_callback(const struct menu_item_ex *m,
69 menu_callback_type *menu_callback) 69 menu_callback_type *menu_callback)
70{ 70{
71 if (m->flags&(MENU_HAS_DESC|MENU_DYNAMIC_DESC)) 71 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)
604 return ret; 604 return ret;
605} 605}
606 606
607int main_menu(void)
608{
609 return do_menu(NULL, 0) == MENU_ATTACHED_USB;
610}
611
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 @@
54#ifdef HAVE_LCD_BITMAP 54#ifdef HAVE_LCD_BITMAP
55#include "icons.h" 55#include "icons.h"
56#endif 56#endif
57#include "main_menu.h"
58#include "sound_menu.h" 57#include "sound_menu.h"
59#if CONFIG_CODEC == SWCODEC 58#if CONFIG_CODEC == SWCODEC
60#include "menus/eq_menu.h" 59#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 @@
50#include "mp3_playback.h" 50#include "mp3_playback.h"
51#include "usb.h" 51#include "usb.h"
52#include "status.h" 52#include "status.h"
53#include "main_menu.h"
54#include "ata.h" 53#include "ata.h"
55#include "screens.h" 54#include "screens.h"
56#include "playlist.h" 55#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 @@
49#include "action.h" 49#include "action.h"
50#include "yesno.h" 50#include "yesno.h"
51 51
52#include "main_menu.h"
53#include "tree.h" 52#include "tree.h"
54#if CONFIG_TUNER 53#if CONFIG_TUNER
55#include "radio.h" 54#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 @@
31#include "kernel.h" 31#include "kernel.h"
32#include "usb.h" 32#include "usb.h"
33#include "tree.h" 33#include "tree.h"
34#include "main_menu.h"
35#include "sprintf.h" 34#include "sprintf.h"
36#include "audio.h" 35#include "audio.h"
37#include "playlist.h" 36#include "playlist.h"