summaryrefslogtreecommitdiffstats
path: root/apps/bookmark.c
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2010-09-17 20:28:47 +0000
committerFrank Gevaerts <frank@gevaerts.be>2010-09-17 20:28:47 +0000
commitf366090562dcdc1c4c0efbd87476ef6c068b7db5 (patch)
tree17bf868c61d677ce7969bcc5312e5a69abeda428 /apps/bookmark.c
parentbd43690170ea9441226557bf58907654338b6029 (diff)
downloadrockbox-f366090562dcdc1c4c0efbd87476ef6c068b7db5.tar.gz
rockbox-f366090562dcdc1c4c0efbd87476ef6c068b7db5.tar.bz2
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/bookmark.c')
-rw-r--r--apps/bookmark.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c
index dc6a09de10..efc43c6270 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -348,13 +348,13 @@ static char* create_bookmark()
snprintf(global_bookmark, sizeof(global_bookmark),
/* new optional bookmark token descriptors should be inserted
just before the "%s;%s" in this line... */
-#if CONFIG_CODEC == SWCODEC
+#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN)
">%d;%d;%ld;%d;%ld;%d;%d;%ld;%ld;%s;%s",
#else
">%d;%d;%ld;%d;%ld;%d;%d;%s;%s",
#endif
/* ... their flags should go here ... */
-#if CONFIG_CODEC == SWCODEC
+#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN)
BM_PITCH | BM_SPEED,
#else
0,
@@ -366,7 +366,7 @@ static char* create_bookmark()
global_settings.repeat_mode,
global_settings.playlist_shuffle,
/* ...and their values should go here */
-#if CONFIG_CODEC == SWCODEC
+#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN)
(long)sound_get_pitch(),
(long)dsp_get_timestretch(),
#endif
@@ -913,7 +913,7 @@ static void say_bookmark(const char* bookmark,
/* ------------------------------------------------------------------------*/
static bool play_bookmark(const char* bookmark)
{
-#if CONFIG_CODEC == SWCODEC
+#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN)
/* preset pitch and speed to 100% in case bookmark doesn't have info */
bm.pitch = sound_get_pitch();
bm.speed = dsp_get_timestretch();
@@ -923,7 +923,7 @@ static bool play_bookmark(const char* bookmark)
{
global_settings.repeat_mode = bm.repeat_mode;
global_settings.playlist_shuffle = bm.shuffle;
-#if CONFIG_CODEC == SWCODEC
+#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN)
sound_set_pitch(bm.pitch);
dsp_set_timestretch(bm.speed);
#endif