diff options
| author | Nils Wallménius <nils@rockbox.org> | 2012-05-08 16:34:26 +0200 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2012-05-09 14:32:38 +0200 |
| commit | d29a11b7a8f4ce230e9385a44f352a559bde753f (patch) | |
| tree | 6fb4dc1699be894e5495dd862941606442239bfc /apps/bookmark.c | |
| parent | d26a35d10b9e2f808b0e4880d5b5d1a2963258e9 (diff) | |
| download | rockbox-d29a11b7a8f4ce230e9385a44f352a559bde753f.zip rockbox-d29a11b7a8f4ce230e9385a44f352a559bde753f.tar.gz rockbox-d29a11b7a8f4ce230e9385a44f352a559bde753f.tar.bz2 rockbox-d29a11b7a8f4ce230e9385a44f352a559bde753f.tar.xz | |
Rename HAVE_PITCHSCREEN to HAVE_PITCHCONTROL
Also move the definition to config.h
Change-Id: I36bb5020c5e06b2344292bc05e8c13ccc7a6a1ff
Reviewed-on: http://gerrit.rockbox.org/234
Reviewed-by: Nils Wallménius <nils@rockbox.org>
Diffstat (limited to 'apps/bookmark.c')
| -rw-r--r-- | apps/bookmark.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c index a6e454f..12ec1ed 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c @@ -374,13 +374,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 && defined(HAVE_PITCHSCREEN) +#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL) ">%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 && defined(HAVE_PITCHSCREEN) +#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL) BM_PITCH | BM_SPEED, #else 0, @@ -392,7 +392,7 @@ static char* create_bookmark() global_settings.repeat_mode, global_settings.playlist_shuffle, /* ...and their values should go here */ -#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN) +#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL) (long)sound_get_pitch(), (long)dsp_get_timestretch(), #endif @@ -954,7 +954,7 @@ static void say_bookmark(const char* bookmark, /* ------------------------------------------------------------------------*/ static bool play_bookmark(const char* bookmark) { -#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN) +#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL) /* preset pitch and speed to 100% in case bookmark doesn't have info */ bm.pitch = sound_get_pitch(); bm.speed = dsp_get_timestretch(); @@ -964,7 +964,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 && defined(HAVE_PITCHSCREEN) +#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL) sound_set_pitch(bm.pitch); dsp_set_timestretch(bm.speed); #endif |