diff options
| author | Amaury Pouly <amaury.pouly@gmail.com> | 2013-09-07 00:52:36 +0200 |
|---|---|---|
| committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-09-07 00:52:36 +0200 |
| commit | 070e27933c71c9dc58e411d365e25fabb29138fa (patch) | |
| tree | 949e139f629844cbe5940daf9ad02ae0ee3a52f5 /firmware/target | |
| parent | a1e557bbdd984c5f41dab9a25649c5ea92eaafc3 (diff) | |
| download | rockbox-070e27933c71c9dc58e411d365e25fabb29138fa.tar.gz rockbox-070e27933c71c9dc58e411d365e25fabb29138fa.zip | |
imx233: fix red when target cannot record
Change-Id: Ia5f6b290da2f645021ef8becdfbac7436407ec0b
Diffstat (limited to 'firmware/target')
| -rw-r--r-- | firmware/target/arm/imx233/audio-imx233.c | 6 | ||||
| -rw-r--r-- | firmware/target/arm/imx233/pcm-imx233.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/firmware/target/arm/imx233/audio-imx233.c b/firmware/target/arm/imx233/audio-imx233.c index b041450071..9e6082524f 100644 --- a/firmware/target/arm/imx233/audio-imx233.c +++ b/firmware/target/arm/imx233/audio-imx233.c @@ -75,8 +75,6 @@ static void select_audio_path(void) { #if defined(HAVE_RECORDING) const bool recording = input_flags & SRCF_RECORDING; -#else - const bool recording = false; #endif switch(input_source) @@ -87,7 +85,9 @@ static void select_audio_path(void) /* fallthrough */ case AUDIO_SRC_PLAYBACK: audiohw_set_monitor(false); +#if defined(HAVE_RECORDING) audiohw_disable_recording(); +#endif break; #if defined(HAVE_RECORDING) && (INPUT_SRC_CAPS & SRC_CAP_MIC) @@ -102,10 +102,12 @@ static void select_audio_path(void) /* recording and playback */ case AUDIO_SRC_FMRADIO: audiohw_set_monitor(true); +#if defined(HAVE_RECORDING) if(recording) audiohw_enable_recording(false); else audiohw_disable_recording(); +#endif break; #endif /* (INPUT_SRC_CAPS & SRC_CAP_FMRADIO) */ } diff --git a/firmware/target/arm/imx233/pcm-imx233.c b/firmware/target/arm/imx233/pcm-imx233.c index 07af090f38..9a5b136442 100644 --- a/firmware/target/arm/imx233/pcm-imx233.c +++ b/firmware/target/arm/imx233/pcm-imx233.c @@ -205,7 +205,7 @@ const void *pcm_play_dma_get_peak_buffer(int *count) * we can only let the tranfer finish on stop. However if the transfer is very * long it could take a while. We work around this by splitting big transfers * into small burst to make sure we can stop quickly. */ - +#ifdef HAVE_RECORDING static int adc_locked = 0; static struct pcm_dma_command_t adc_dma; @@ -322,3 +322,4 @@ const void *pcm_rec_dma_get_peak_buffer(void) struct imx233_dma_info_t info = imx233_dma_get_info(APB_AUDIO_ADC, DMA_INFO_BAR); return (void *)info.bar; } +#endif /* HAVE_RECORDING */ |