summaryrefslogtreecommitdiff
path: root/apps/menus
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-03-27 13:53:29 +0000
committerThomas Martitz <kugel@rockbox.org>2009-03-27 13:53:29 +0000
commit62f3e95945187a744043b5b0c7e393786843c9c8 (patch)
treed0cb3822f08657e6db3cd00a15a9d6034855f389 /apps/menus
parente95d33b35eec370c8a93c825a8c366ded8a8aa41 (diff)
downloadrockbox-62f3e95945187a744043b5b0c7e393786843c9c8.tar.gz
rockbox-62f3e95945187a744043b5b0c7e393786843c9c8.zip
FS#10014 - Separate tracklocking out of skip length, skip length prevented to skip tracks. This is a seperate setting now. tracks can still change during normal playback (i.e. a song ends).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20553 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus')
-rw-r--r--apps/menus/playback_menu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c
index 5d1421b966..02e29b1840 100644
--- a/apps/menus/playback_menu.c
+++ b/apps/menus/playback_menu.c
@@ -176,6 +176,7 @@ MAKE_MENU(unplug_menu, ID2P(LANG_HEADPHONE_UNPLUG), 0, Icon_NOICON,
176#endif 176#endif
177 177
178MENUITEM_SETTING(skip_length, &global_settings.skip_length, NULL); 178MENUITEM_SETTING(skip_length, &global_settings.skip_length, NULL);
179MENUITEM_SETTING(prevent_skip, &global_settings.prevent_skip, NULL);
179 180
180MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0, 181MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0,
181 Icon_Playback_menu, 182 Icon_Playback_menu,
@@ -197,7 +198,7 @@ MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0,
197#ifdef HAVE_HEADPHONE_DETECTION 198#ifdef HAVE_HEADPHONE_DETECTION
198 ,&unplug_menu 199 ,&unplug_menu
199#endif 200#endif
200 ,&skip_length 201 ,&skip_length, &prevent_skip,
201 ); 202 );
202 203
203static int playback_callback(int action,const struct menu_item_ex *this_item) 204static int playback_callback(int action,const struct menu_item_ex *this_item)