diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2010-09-17 20:28:47 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2010-09-17 20:28:47 +0000 |
commit | f366090562dcdc1c4c0efbd87476ef6c068b7db5 (patch) | |
tree | 17bf868c61d677ce7969bcc5312e5a69abeda428 /apps/gui | |
parent | bd43690170ea9441226557bf58907654338b6029 (diff) | |
download | rockbox-f366090562dcdc1c4c0efbd87476ef6c068b7db5.tar.gz rockbox-f366090562dcdc1c4c0efbd87476ef6c068b7db5.zip |
Make disabling HAVE_PITCHSCREEN actually work without breaking the build
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28102 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index bf024c7e2e..1bfc861624 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c | |||
@@ -120,7 +120,7 @@ char* get_dir(char* buf, int buf_size, const char* path, int level) | |||
120 | return buf; | 120 | return buf; |
121 | } | 121 | } |
122 | 122 | ||
123 | #if (CONFIG_CODEC != MAS3507D) | 123 | #if (CONFIG_CODEC != MAS3507D) && defined (HAVE_PITCHSCREEN) |
124 | /* A helper to determine the enum value for pitch/speed. | 124 | /* A helper to determine the enum value for pitch/speed. |
125 | 125 | ||
126 | When there are two choices (i.e. boolean), return 1 if the value is | 126 | When there are two choices (i.e. boolean), return 1 if the value is |
@@ -1141,7 +1141,7 @@ const char *get_token_value(struct gui_wps *gwps, | |||
1141 | } | 1141 | } |
1142 | #endif /* (CONFIG_CODEC == SWCODEC) */ | 1142 | #endif /* (CONFIG_CODEC == SWCODEC) */ |
1143 | 1143 | ||
1144 | #if (CONFIG_CODEC != MAS3507D) | 1144 | #if (CONFIG_CODEC != MAS3507D) && defined (HAVE_PITCHSCREEN) |
1145 | case SKIN_TOKEN_SOUND_PITCH: | 1145 | case SKIN_TOKEN_SOUND_PITCH: |
1146 | { | 1146 | { |
1147 | int32_t pitch = sound_get_pitch(); | 1147 | int32_t pitch = sound_get_pitch(); |
@@ -1156,7 +1156,7 @@ const char *get_token_value(struct gui_wps *gwps, | |||
1156 | } | 1156 | } |
1157 | #endif | 1157 | #endif |
1158 | 1158 | ||
1159 | #if CONFIG_CODEC == SWCODEC | 1159 | #if (CONFIG_CODEC == SWCODEC) && defined (HAVE_PITCHSCREEN) |
1160 | case SKIN_TOKEN_SOUND_SPEED: | 1160 | case SKIN_TOKEN_SOUND_SPEED: |
1161 | { | 1161 | { |
1162 | int32_t pitch = sound_get_pitch(); | 1162 | int32_t pitch = sound_get_pitch(); |