diff options
-rw-r--r-- | apps/settings.c | 12 | ||||
-rw-r--r-- | apps/sound_menu.c | 8 |
2 files changed, 14 insertions, 6 deletions
diff --git a/apps/settings.c b/apps/settings.c index acaeedcbd9..aa79946c85 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -502,7 +502,9 @@ static const struct bit_entry hd_bits[] = | |||
502 | "rec frequency", "44,48,32,22,24,16" }, | 502 | "rec frequency", "44,48,32,22,24,16" }, |
503 | {3, S_O(rec_quality), 5 /* 192 kBit/s max */, "rec quality", NULL }, | 503 | {3, S_O(rec_quality), 5 /* 192 kBit/s max */, "rec quality", NULL }, |
504 | {1, S_O(rec_editable), false, "editable recordings", off_on }, | 504 | {1, S_O(rec_editable), false, "editable recordings", off_on }, |
505 | #elif defined(HAVE_UDA1380) || defined(HAVE_TLV320) | 505 | #endif /* CONFIG_CODEC == MAS3587F */ |
506 | |||
507 | #if CONFIG_CODEC == SWCODEC && defined(HAVE_RECORDING) | ||
506 | #ifdef HAVE_UDA1380 | 508 | #ifdef HAVE_UDA1380 |
507 | {8|SIGNED, S_O(rec_mic_gain), 16 /* 8 dB */, "rec mic gain", NULL }, /* -128...+108 */ | 509 | {8|SIGNED, S_O(rec_mic_gain), 16 /* 8 dB */, "rec mic gain", NULL }, /* -128...+108 */ |
508 | #endif | 510 | #endif |
@@ -512,11 +514,17 @@ static const struct bit_entry hd_bits[] = | |||
512 | #endif | 514 | #endif |
513 | {8|SIGNED, S_O(rec_left_gain), 0, "rec left gain", NULL }, /* -128...+96 */ | 515 | {8|SIGNED, S_O(rec_left_gain), 0, "rec left gain", NULL }, /* -128...+96 */ |
514 | {8|SIGNED, S_O(rec_right_gain), 0, "rec right gain", NULL }, /* -128...+96 */ | 516 | {8|SIGNED, S_O(rec_right_gain), 0, "rec right gain", NULL }, /* -128...+96 */ |
517 | #if 0 /* Till samplerates are added for SWCODEC */ | ||
515 | {3, S_O(rec_frequency), 0, /* 0=44.1kHz */ | 518 | {3, S_O(rec_frequency), 0, /* 0=44.1kHz */ |
516 | "rec frequency", "44,48,32,22,24,16" }, | 519 | "rec frequency", "44,48,32,22,24,16" }, |
517 | {4, S_O(rec_quality), 4 /* MP3 L3 192 kBit/s */, "rec quality", NULL }, | 520 | #else |
521 | {3, S_O(rec_frequency), 0, /* 0=44.1kHz */ | ||
522 | "rec frequency", "44" }, | ||
518 | #endif | 523 | #endif |
519 | 524 | ||
525 | {4, S_O(rec_quality), 4 /* MP3 L3 192 kBit/s */, "rec quality", NULL }, | ||
526 | #endif /* CONFIG_CODEC == SWCODEC && defined(HAVE_RECORDING) */ | ||
527 | |||
520 | /* values for the trigger */ | 528 | /* values for the trigger */ |
521 | {8 | SIGNED, S_O(rec_start_thres), -35, "trigger start threshold", NULL}, | 529 | {8 | SIGNED, S_O(rec_start_thres), -35, "trigger start threshold", NULL}, |
522 | {8 | SIGNED, S_O(rec_stop_thres), -45, "trigger stop threshold", NULL}, | 530 | {8 | SIGNED, S_O(rec_stop_thres), -45, "trigger stop threshold", NULL}, |
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index 179951a17d..e61d397ea3 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c | |||
@@ -356,22 +356,23 @@ static bool receditable(void) | |||
356 | return set_bool(str(LANG_RECORDING_EDITABLE), | 356 | return set_bool(str(LANG_RECORDING_EDITABLE), |
357 | &global_settings.rec_editable); | 357 | &global_settings.rec_editable); |
358 | } | 358 | } |
359 | #endif | 359 | #endif /* CONFIG_CODEC == MAS3587F */ |
360 | 360 | ||
361 | #ifndef HAVE_UDA1380 | ||
362 | static bool recfrequency(void) | 361 | static bool recfrequency(void) |
363 | { | 362 | { |
364 | static const struct opt_items names[] = { | 363 | static const struct opt_items names[] = { |
365 | { "44.1kHz", TALK_ID(44, UNIT_KHZ) }, | 364 | { "44.1kHz", TALK_ID(44, UNIT_KHZ) }, |
365 | #if CONFIG_CODEC != SWCODEC /* This is temporary */ | ||
366 | { "48kHz", TALK_ID(48, UNIT_KHZ) }, | 366 | { "48kHz", TALK_ID(48, UNIT_KHZ) }, |
367 | { "32kHz", TALK_ID(32, UNIT_KHZ) }, | 367 | { "32kHz", TALK_ID(32, UNIT_KHZ) }, |
368 | { "22.05kHz", TALK_ID(22, UNIT_KHZ) }, | 368 | { "22.05kHz", TALK_ID(22, UNIT_KHZ) }, |
369 | { "24kHz", TALK_ID(24, UNIT_KHZ) }, | 369 | { "24kHz", TALK_ID(24, UNIT_KHZ) }, |
370 | { "16kHz", TALK_ID(16, UNIT_KHZ) } | 370 | { "16kHz", TALK_ID(16, UNIT_KHZ) } |
371 | #endif | ||
371 | }; | 372 | }; |
372 | return set_option(str(LANG_RECORDING_FREQUENCY), | 373 | return set_option(str(LANG_RECORDING_FREQUENCY), |
373 | &global_settings.rec_frequency, INT, | 374 | &global_settings.rec_frequency, INT, |
374 | names, 6, NULL ); | 375 | names, sizeof(names)/sizeof(*names), NULL ); |
375 | } | 376 | } |
376 | 377 | ||
377 | static bool recchannels(void) | 378 | static bool recchannels(void) |
@@ -384,7 +385,6 @@ static bool recchannels(void) | |||
384 | &global_settings.rec_channels, INT, | 385 | &global_settings.rec_channels, INT, |
385 | names, 2, NULL ); | 386 | names, 2, NULL ); |
386 | } | 387 | } |
387 | #endif | ||
388 | 388 | ||
389 | static bool rectimesplit(void) | 389 | static bool rectimesplit(void) |
390 | { | 390 | { |