diff options
author | Dave Chapman <dave@dchapman.com> | 2009-10-11 09:17:12 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2009-10-11 09:17:12 +0000 |
commit | 7f836fd8692c445a49dca7078ed4eb81bb7a3d8e (patch) | |
tree | 4c0155156550f1a0b66833c245fbc19618f772d5 /firmware | |
parent | 6cba2061d63e45922d12fd90f42f2501f6606440 (diff) | |
download | rockbox-7f836fd8692c445a49dca7078ed4eb81bb7a3d8e.tar.gz rockbox-7f836fd8692c445a49dca7078ed4eb81bb7a3d8e.zip |
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
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/config-ipodnano2g.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/audio-nano2g.c | 6 |
2 files changed, 7 insertions, 1 deletions
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 @@ | |||
11 | #define MODEL_NAME "Apple iPod Nano 2g" | 11 | #define MODEL_NAME "Apple iPod Nano 2g" |
12 | 12 | ||
13 | /* define this if you have recording possibility */ | 13 | /* define this if you have recording possibility */ |
14 | #define HAVE_RECORDING | 14 | //#define HAVE_RECORDING |
15 | 15 | ||
16 | /* Define bitmask of input sources - recordable bitmask can be defined | 16 | /* Define bitmask of input sources - recordable bitmask can be defined |
17 | explicitly if different */ | 17 | 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 @@ | |||
23 | #include "audio.h" | 23 | #include "audio.h" |
24 | #include "sound.h" | 24 | #include "sound.h" |
25 | 25 | ||
26 | #if INPUT_SRC_CAPS != 0 | ||
26 | void audio_set_output_source(int source) | 27 | void audio_set_output_source(int source) |
27 | { | 28 | { |
28 | if ((unsigned)source >= AUDIO_NUM_SOURCES) | 29 | if ((unsigned)source >= AUDIO_NUM_SOURCES) |
@@ -40,12 +41,15 @@ void audio_input_mux(int source, unsigned flags) | |||
40 | default: /* playback - no recording */ | 41 | default: /* playback - no recording */ |
41 | source = AUDIO_SRC_PLAYBACK; | 42 | source = AUDIO_SRC_PLAYBACK; |
42 | case AUDIO_SRC_PLAYBACK: | 43 | case AUDIO_SRC_PLAYBACK: |
44 | #ifdef HAVE_RECORDING | ||
43 | if (source != last_source) | 45 | if (source != last_source) |
44 | { | 46 | { |
45 | audiohw_set_monitor(false); | 47 | audiohw_set_monitor(false); |
46 | audiohw_disable_recording(); | 48 | audiohw_disable_recording(); |
47 | } | 49 | } |
50 | #endif | ||
48 | break; | 51 | break; |
52 | #ifdef HAVE_LINE_REC | ||
49 | case AUDIO_SRC_LINEIN: /* recording only */ | 53 | case AUDIO_SRC_LINEIN: /* recording only */ |
50 | if (source != last_source) | 54 | if (source != last_source) |
51 | { | 55 | { |
@@ -53,7 +57,9 @@ void audio_input_mux(int source, unsigned flags) | |||
53 | audiohw_enable_recording(false); /* source line */ | 57 | audiohw_enable_recording(false); /* source line */ |
54 | } | 58 | } |
55 | break; | 59 | break; |
60 | #endif | ||
56 | } /* end switch */ | 61 | } /* end switch */ |
57 | 62 | ||
58 | last_source = source; | 63 | last_source = source; |
59 | } /* audio_input_mux */ | 64 | } /* audio_input_mux */ |
65 | #endif /* INPUT_SRC_CAPS != 0 */ | ||