Use bitmasks to define which inputs are available. Makes it easier to remove old assumptions of which are available. Inspired by e200 being unique in having FM Radio and Mic but no Line. Doesn't remove the assumption that Mic is available or that one of Mic and/or Line is available just to avoid excessive #ifdef'ing until needed.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13448 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 4 insertions, 3 deletions

diff --git a/firmware/target/arm/audio-pp.c b/firmware/target/arm/audio-pp.c
index 603bbad5fe..82c5545a3f 100644
--- a/firmware/target/arm/audio-pp.c
+++ b/firmware/target/arm/audio-pp.c
@@ -40,7 +40,6 @@ void audio_set_source(int source, unsigned flags)
     {
         default:                        /* playback - no recording */
             source = AUDIO_SRC_PLAYBACK;
-#ifdef HAVE_RECORDING
         case AUDIO_SRC_PLAYBACK:
             if (source != last_source)
             {
@@ -48,6 +47,7 @@ void audio_set_source(int source, unsigned flags)
                 audiohw_set_monitor(false);
             }
         break;
+#ifdef HAVE_MIC_REC
         case AUDIO_SRC_MIC:             /* recording only */
             if (source != last_source)
             {
@@ -55,7 +55,8 @@ void audio_set_source(int source, unsigned flags)
                 audiohw_set_monitor(false);
             }
         break;
-
+#endif
+#ifdef HAVE_LINEIN_REC
         case AUDIO_SRC_LINEIN:          /* recording only */
             if (source != last_source)
             {
@@ -64,7 +65,7 @@ void audio_set_source(int source, unsigned flags)
             }
         break;
 #endif
-#if CONFIG_TUNER
+#ifdef HAVE_FMRADIO_REC
         case AUDIO_SRC_FMRADIO:         /* recording and playback */
             if (!recording)
                 audiohw_set_recvol(0, 0, AUDIO_GAIN_LINEIN);