summaryrefslogtreecommitdiff
path: root/apps/menus
diff options
context:
space:
mode:
authorThom Johansen <thomj@rockbox.org>2008-07-14 20:39:30 +0000
committerThom Johansen <thomj@rockbox.org>2008-07-14 20:39:30 +0000
commit4a7e0c79498f7b19179482c8069bb1d99b61b7ca (patch)
tree1164e12551715ba25ea587f6110c8f407091372f /apps/menus
parent1f6ee2b91319a6053e356a5eb22b881d0bacee52 (diff)
Rename and rework the "Study Mode" menu into the "Skip Length" setting. Update manual. Bump plugin API thanks to having changed global_settings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18041 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus')
-rw-r--r--apps/menus/playback_menu.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c
index 2d3f3d17b2..8d5c0eeee6 100644
--- a/apps/menus/playback_menu.c
+++ b/apps/menus/playback_menu.c
@@ -35,10 +35,10 @@
#include "dsp.h"
#include "scrobbler.h"
#include "audio.h"
-#include "cuesheet.h"
-#if CONFIG_CODEC == SWCODEC
-#include "playback.h"
-#endif
+#include "cuesheet.h"
+#if CONFIG_CODEC == SWCODEC
+#include "playback.h"
+#endif
#if CONFIG_CODEC == SWCODEC
@@ -176,10 +176,7 @@ MAKE_MENU(unplug_menu, ID2P(LANG_HEADPHONE_UNPLUG), 0, Icon_NOICON,
&unplug_mode, &unplug_rw, &unplug_autoresume);
#endif
-MENUITEM_SETTING(study_mode, &global_settings.study_mode, NULL);
-MENUITEM_SETTING(study_hop_step, &global_settings.study_hop_step, NULL);
-MAKE_MENU(study_mode_menu, ID2P(LANG_STUDY_MODE), 0, Icon_NOICON,
- &study_mode, &study_hop_step);
+MENUITEM_SETTING(skip_length, &global_settings.skip_length, NULL);
MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0,
Icon_Playback_menu,
@@ -201,7 +198,7 @@ MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0,
#ifdef HAVE_HEADPHONE_DETECTION
,&unplug_menu
#endif
- ,&study_mode_menu
+ ,&skip_length
);
static int playback_callback(int action,const struct menu_item_ex *this_item)