forked from len0rd/rockbox
Enable crossfade for simulator.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7151 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
006f7045be
commit
05012ac9f7
3 changed files with 6 additions and 4 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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. */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue