diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2011-06-29 06:37:04 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2011-06-29 06:37:04 +0000 |
commit | a2b6703a369f6cdbfec1f150c408dadc877631fb (patch) | |
tree | 3145a8c1372c44711d38feefeba39c7d4098f139 /firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c | |
parent | 8411614b8a068a4f274c3841aa55aab1df1bc246 (diff) | |
download | rockbox-a2b6703a369f6cdbfec1f150c408dadc877631fb.tar.gz rockbox-a2b6703a369f6cdbfec1f150c408dadc877631fb.zip |
Commit FS#12150 - Fully-functional audio mixer - and finally whip old limitations about playback of voice and other sounds when paused. Channels are independent in state and amplitude. Fade on stop/pause is handled by the channel's volume control rather than global volume which means it now works from anywhere. Opens up the possibility of plugin sounds during music playback by merely adding an additional channel enum. If any PCM drivers were not properly modified, see one of the last comments in the task for a description of the simple change that is expected. Some params are tunable in firmware/export/pcm-mixer.h as well.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30097 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c')
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c index c8c1283d12..1f6eef435a 100644 --- a/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/pcm-gigabeat-s.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include "ccm-imx31.h" | 26 | #include "ccm-imx31.h" |
27 | #include "sdma-imx31.h" | 27 | #include "sdma-imx31.h" |
28 | #include "mmu-imx31.h" | 28 | #include "mmu-imx31.h" |
29 | #include "pcm-internal.h" | ||
29 | 30 | ||
30 | #define DMA_PLAY_CH_NUM 2 | 31 | #define DMA_PLAY_CH_NUM 2 |
31 | #define DMA_REC_CH_NUM 1 | 32 | #define DMA_REC_CH_NUM 1 |
@@ -105,6 +106,8 @@ static void play_dma_callback(void) | |||
105 | dma_play_bd.mode.command = TRANSFER_16BIT; | 106 | dma_play_bd.mode.command = TRANSFER_16BIT; |
106 | dma_play_bd.mode.status = BD_DONE | BD_WRAP | BD_INTR; | 107 | dma_play_bd.mode.status = BD_DONE | BD_WRAP | BD_INTR; |
107 | sdma_channel_run(DMA_PLAY_CH_NUM); | 108 | sdma_channel_run(DMA_PLAY_CH_NUM); |
109 | |||
110 | pcm_play_dma_started_callback(); | ||
108 | } | 111 | } |
109 | 112 | ||
110 | void pcm_play_lock(void) | 113 | void pcm_play_lock(void) |