devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Nano2G - remove HAVE_RECORDING from config-ipodnano2g.h as it's not implmented yet, and properly #ifdef audio-nano2g.c

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23095 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2009-10-11 09:17:12 +00:00
parent 6cba2061d6
commit 7f836fd869
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/export/config-ipodnano2g.h
View file

@ -11,7 +11,7 @@
#define MODEL_NAME "Apple iPod Nano 2g" #define MODEL_NAME "Apple iPod Nano 2g"
/* define this if you have recording possibility */ /* define this if you have recording possibility */
#define HAVE_RECORDING //#define HAVE_RECORDING
/* Define bitmask of input sources - recordable bitmask can be defined /* Define bitmask of input sources - recordable bitmask can be defined
explicitly if different */ explicitly if different */

6
firmware/target/arm/s5l8700/ipodnano2g/audio-nano2g.c
View file

@ -23,6 +23,7 @@
#include "audio.h" #include "audio.h"
#include "sound.h" #include "sound.h"
#if INPUT_SRC_CAPS != 0
void audio_set_output_source(int source) void audio_set_output_source(int source)
{ {
if ((unsigned)source >= AUDIO_NUM_SOURCES) if ((unsigned)source >= AUDIO_NUM_SOURCES)
@ -40,12 +41,15 @@ void audio_input_mux(int source, unsigned flags)
default: /* playback - no recording */ default: /* playback - no recording */
source = AUDIO_SRC_PLAYBACK; source = AUDIO_SRC_PLAYBACK;
case AUDIO_SRC_PLAYBACK: case AUDIO_SRC_PLAYBACK:
#ifdef HAVE_RECORDING
if (source != last_source) if (source != last_source)
{ {
audiohw_set_monitor(false); audiohw_set_monitor(false);
audiohw_disable_recording(); audiohw_disable_recording();
} }
#endif
break; break;
#ifdef HAVE_LINE_REC
case AUDIO_SRC_LINEIN: /* recording only */ case AUDIO_SRC_LINEIN: /* recording only */
if (source != last_source) if (source != last_source)
{ {
@ -53,7 +57,9 @@ void audio_input_mux(int source, unsigned flags)
audiohw_enable_recording(false); /* source line */ audiohw_enable_recording(false); /* source line */
} }
break; break;
#endif
} /* end switch */ } /* end switch */
last_source = source; last_source = source;
} /* audio_input_mux */ } /* audio_input_mux */
#endif /* INPUT_SRC_CAPS != 0 */