diff options
Diffstat (limited to 'firmware/export')
| -rw-r--r-- | firmware/export/audio.h | 3 | ||||
| -rw-r--r-- | firmware/export/audiohw.h | 3 | ||||
| -rw-r--r-- | firmware/export/config-e200.h | 15 | ||||
| -rw-r--r-- | firmware/export/pcm_sampr.h | 15 |
4 files changed, 23 insertions, 13 deletions
diff --git a/firmware/export/audio.h b/firmware/export/audio.h index a0da846215..a79a734e29 100644 --- a/firmware/export/audio.h +++ b/firmware/export/audio.h @@ -139,6 +139,9 @@ enum audio_sources AUDIO_SRC_DEFAULT = AUDIO_SRC_PLAYBACK }; +extern int audio_channels; +extern int audio_output_source; + #ifdef HAVE_RECORDING /* Recordable source implies it has the input as well */ diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h index 3838b007d0..65a2466dfc 100644 --- a/firmware/export/audiohw.h +++ b/firmware/export/audiohw.h @@ -58,7 +58,8 @@ enum { SOUND_SUPERBASS, #endif #if CONFIG_CODEC == MAS3587F || defined(HAVE_UDA1380) || defined(HAVE_TLV320)\ - || defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8731) + || defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8731) \ + || defined(HAVE_AS3514) SOUND_LEFT_GAIN, SOUND_RIGHT_GAIN, SOUND_MIC_GAIN, diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h index 9d4fb1ccef..001c89b7d7 100644 --- a/firmware/export/config-e200.h +++ b/firmware/export/config-e200.h @@ -7,11 +7,22 @@ #define MODEL_NUMBER 16 #define MODEL_NAME "Sandisk Sansa e200" +#define HW_SAMPR_CAPS (SAMPR_CAP_44) + /* define this if you have recording possibility */ -/*#define HAVE_RECORDING*/ /* TODO: add support for this */ +#define HAVE_RECORDING + +#define DEFAULT_REC_MIC_GAIN 23 +#define DEFAULT_REC_LEFT_GAIN 23 +#define DEFAULT_REC_RIGHT_GAIN 23 + +#define REC_SAMPR_CAPS (SAMPR_CAP_22) +#define REC_FREQ_DEFAULT REC_FREQ_22 /* Default is not 44.1kHz */ +#define REC_SAMPR_DEFAULT SAMPR_22 + /* Define bitmask of input sources - recordable bitmask can be defined explicitly if different */ -/* #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) */ +#define INPUT_SRC_CAPS (SRC_CAP_MIC) /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/pcm_sampr.h b/firmware/export/pcm_sampr.h index 27a300d645..b27050ec60 100644 --- a/firmware/export/pcm_sampr.h +++ b/firmware/export/pcm_sampr.h @@ -292,18 +292,13 @@ enum rec_freq_indexes #define REC_HAVE_8_(...) #endif REC_NUM_FREQ, - /* This should always come out I reckon */ - REC_FREQ_DEFAULT = REC_FREQ_44, - /* Get the minimum bitcount needed to save the range of values */ - REC_FREQ_CFG_NUM_BITS = (REC_NUM_FREQ > 8 ? - 4 : (REC_NUM_FREQ > 4 ? - 3 : (REC_NUM_FREQ > 2 ? - 2 : 1 - ) - ) - ), }; /* enum rec_freq_indexes */ +/* Default to 44.1kHz if not otherwise specified */ +#ifndef REC_FREQ_DEFAULT +#define REC_FREQ_DEFAULT REC_FREQ_44 +#endif + #define REC_FREQ_CFG_VAL_LIST &REC_HAVE_96_(",96") REC_HAVE_88_(",88") \ REC_HAVE_64_(",64") REC_HAVE_48_(",48") \ REC_HAVE_44_(",44") REC_HAVE_32_(",32") \ |