diff options
| author | Miika Pekkarinen <miipekk@ihme.org> | 2005-07-22 16:46:27 +0000 |
|---|---|---|
| committer | Miika Pekkarinen <miipekk@ihme.org> | 2005-07-22 16:46:27 +0000 |
| commit | 90161c92ddbccbdf9e28d43c75bb7e64ddfbecd0 (patch) | |
| tree | ac53454c122465d174ec6a47a56e72505d7b09b8 /firmware | |
| parent | 4f6375ca175b34623e5c737cd36dbd62aad58fd2 (diff) | |
| download | rockbox-90161c92ddbccbdf9e28d43c75bb7e64ddfbecd0.zip rockbox-90161c92ddbccbdf9e28d43c75bb7e64ddfbecd0.tar.gz rockbox-90161c92ddbccbdf9e28d43c75bb7e64ddfbecd0.tar.bz2 rockbox-90161c92ddbccbdf9e28d43c75bb7e64ddfbecd0.tar.xz | |
It's now possible to select the crossfading mode: "Off, Crossfade,
Mix". If set to mix, no fading is applied but tracks are mixed up.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7224 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/export/audio.h | 2 | ||||
| -rw-r--r-- | firmware/pcm_playback.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/firmware/export/audio.h b/firmware/export/audio.h index c8746c1..17de7f0 100644 --- a/firmware/export/audio.h +++ b/firmware/export/audio.h @@ -71,7 +71,7 @@ struct mp3entry* audio_current_track(void); struct mp3entry* audio_next_track(void); bool audio_has_changed_track(void); void audio_get_debugdata(struct audio_debug *dbgdata); -void audio_set_crossfade_amount(int seconds); +void audio_set_crossfade(int type); void audio_set_buffer_margin(int seconds); unsigned int audio_error(void); void audio_error_clear(void); diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c index bafbd8c..9bba88e 100644 --- a/firmware/pcm_playback.c +++ b/firmware/pcm_playback.c @@ -286,7 +286,7 @@ void DMA0(void) /* Stop on error */ if(res & 0x70) { - dma_stop(); + pcm_play_stop(); logf("DMA Error:0x%04x", res); } else @@ -302,7 +302,7 @@ void DMA0(void) else { /* Finished playing */ - dma_stop(); + pcm_play_stop(); logf("DMA No Data:0x%04x", res); } } |