summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2009-07-11 21:21:33 +0000
committerJens Arnold <amiconn@rockbox.org>2009-07-11 21:21:33 +0000
commit4c75ece14a0fb610214466a63470fba8a1971c55 (patch)
tree1b302e56ba07f666f83db9b3e8c0315431e2de5a
parent1a49df92be8d90ecb01badcf40dec8558f4341f6 (diff)
downloadrockbox-4c75ece14a0fb610214466a63470fba8a1971c55.tar.gz
rockbox-4c75ece14a0fb610214466a63470fba8a1971c55.zip
Properly ifdef the pitchscreen settings as well (aka fix red Player build).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21789 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/settings.h2
-rw-r--r--apps/settings_list.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/settings.h b/apps/settings.h
index 8cf9bcffdf..3d05e29c64 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -739,11 +739,13 @@ struct user_settings
739 struct touchscreen_parameter ts_calibration_data; 739 struct touchscreen_parameter ts_calibration_data;
740#endif 740#endif
741 741
742#ifdef HAVE_PITCHSCREEN
742 /* pitch screen settings */ 743 /* pitch screen settings */
743 bool pitch_mode_semitone; 744 bool pitch_mode_semitone;
744#if CONFIG_CODEC == SWCODEC 745#if CONFIG_CODEC == SWCODEC
745 bool pitch_mode_timestretch; 746 bool pitch_mode_timestretch;
746#endif 747#endif
748#endif
747 /* If values are just added to the end, no need to bump plugin API 749 /* If values are just added to the end, no need to bump plugin API
748 version. */ 750 version. */
749 /* new stuff to be added at the end */ 751 /* new stuff to be added at the end */
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 78d1fc8700..61874787b9 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1528,12 +1528,14 @@ const struct settings_list settings[] = {
1528#endif 1528#endif
1529 OFFON_SETTING(0, prevent_skip, LANG_PREVENT_SKIPPING, false, "prevent track skip", NULL), 1529 OFFON_SETTING(0, prevent_skip, LANG_PREVENT_SKIPPING, false, "prevent track skip", NULL),
1530 1530
1531 OFFON_SETTING(0, pitch_mode_semitone, LANG_SEMITONE, false, 1531#ifdef HAVE_PITCHSCREEN
1532 OFFON_SETTING(0, pitch_mode_semitone, LANG_SEMITONE, false,
1532 "Semitone pitch change", NULL), 1533 "Semitone pitch change", NULL),
1533#if CONFIG_CODEC == SWCODEC 1534#if CONFIG_CODEC == SWCODEC
1534 OFFON_SETTING(0, pitch_mode_timestretch, LANG_TIMESTRETCH, false, 1535 OFFON_SETTING(0, pitch_mode_timestretch, LANG_TIMESTRETCH, false,
1535 "Timestretch mode", NULL), 1536 "Timestretch mode", NULL),
1536#endif 1537#endif
1538#endif
1537 1539
1538}; 1540};
1539 1541