diff options
| author | Miika Pekkarinen <miipekk@ihme.org> | 2005-07-15 07:15:39 +0000 |
|---|---|---|
| committer | Miika Pekkarinen <miipekk@ihme.org> | 2005-07-15 07:15:39 +0000 |
| commit | 05012ac9f7b531e789aebcd24a02828e78bc810e (patch) | |
| tree | 68aedf7b41663c34125b11a11f5f7c5e6ebedfbc | |
| parent | 006f7045be0982f9109f78eb07b35fc2b5544a4a (diff) | |
| download | rockbox-05012ac9f7b531e789aebcd24a02828e78bc810e.tar.gz rockbox-05012ac9f7b531e789aebcd24a02828e78bc810e.tar.bz2 rockbox-05012ac9f7b531e789aebcd24a02828e78bc810e.zip | |
Enable crossfade for simulator.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7151 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/settings.c | 2 | ||||
| -rw-r--r-- | apps/settings_menu.c | 3 | ||||
| -rw-r--r-- | uisimulator/common/stubs.c | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/apps/settings.c b/apps/settings.c index 940c0d8bbe..524dfcd190 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -845,7 +845,7 @@ void settings_apply(void) talk_init(); /* use voice of same language */ } -#if CONFIG_HWCODEC == MASNONE && !defined(SIMULATOR) +#if CONFIG_HWCODEC == MASNONE pcmbuf_crossfade_enable(global_settings.crossfade); #endif diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 90ad191d1c..a94dda8b51 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c @@ -1107,9 +1107,8 @@ static bool id3_order(void) static bool crossfade(void) { bool rc = set_bool( str(LANG_CROSSFADE), &global_settings.crossfade ); -#ifndef SIMULATOR pcmbuf_crossfade_enable(global_settings.crossfade); -#endif + return rc; } #endif diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c index ae876a54fd..9643937684 100644 --- a/uisimulator/common/stubs.c +++ b/uisimulator/common/stubs.c @@ -32,11 +32,12 @@ #include "ata.h" /* for volume definitions */ extern char having_new_lcd; +static bool playing = false; /* Stubs for PCM audio playback. */ bool pcm_is_playing(void) { - return false; + return playing; } void pcm_play_pause(bool state) @@ -51,6 +52,7 @@ bool pcm_is_paused(void) void pcm_play_stop(void) { + playing = false; } void pcm_init(void) @@ -61,6 +63,7 @@ void (*sound_get_pcm)(unsigned char** start, long* size); void pcm_play_data(void (*get_more)(unsigned char** start, long* size)) { sound_get_pcm = get_more; + playing = true; } /* Generic firmware stubs. */ |