From 7f836fd8692c445a49dca7078ed4eb81bb7a3d8e Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Sun, 11 Oct 2009 09:17:12 +0000 Subject: [PATCH] Nano2G - remove HAVE_RECORDING from config-ipodnano2g.h as it's not implmented yet, and properly #ifdef audio-nano2g.c git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23095 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config-ipodnano2g.h | 2 +- firmware/target/arm/s5l8700/ipodnano2g/audio-nano2g.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/firmware/export/config-ipodnano2g.h b/firmware/export/config-ipodnano2g.h index e8f2c1935d..1b72292e61 100644 --- a/firmware/export/config-ipodnano2g.h +++ b/firmware/export/config-ipodnano2g.h @@ -11,7 +11,7 @@ #define MODEL_NAME "Apple iPod Nano 2g" /* define this if you have recording possibility */ -#define HAVE_RECORDING +//#define HAVE_RECORDING /* Define bitmask of input sources - recordable bitmask can be defined explicitly if different */ diff --git a/firmware/target/arm/s5l8700/ipodnano2g/audio-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/audio-nano2g.c index fb37cf2378..402a60661e 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/audio-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/audio-nano2g.c @@ -23,6 +23,7 @@ #include "audio.h" #include "sound.h" +#if INPUT_SRC_CAPS != 0 void audio_set_output_source(int source) { if ((unsigned)source >= AUDIO_NUM_SOURCES) @@ -40,12 +41,15 @@ void audio_input_mux(int source, unsigned flags) default: /* playback - no recording */ source = AUDIO_SRC_PLAYBACK; case AUDIO_SRC_PLAYBACK: +#ifdef HAVE_RECORDING if (source != last_source) { audiohw_set_monitor(false); audiohw_disable_recording(); } +#endif break; +#ifdef HAVE_LINE_REC case AUDIO_SRC_LINEIN: /* recording only */ if (source != last_source) { @@ -53,7 +57,9 @@ void audio_input_mux(int source, unsigned flags) audiohw_enable_recording(false); /* source line */ } break; +#endif } /* end switch */ last_source = source; } /* audio_input_mux */ +#endif /* INPUT_SRC_CAPS != 0 */