diff options
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/apps/settings.c b/apps/settings.c index 03b2dc5113..312a40e9f9 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -72,7 +72,9 @@ struct user_settings global_settings; | |||
72 | #ifdef HAVE_RECORDING | 72 | #ifdef HAVE_RECORDING |
73 | const char rec_base_directory[] = REC_BASE_DIR; | 73 | const char rec_base_directory[] = REC_BASE_DIR; |
74 | #endif | 74 | #endif |
75 | 75 | #if CONFIG_HWCODEC == MASNONE | |
76 | #include "pcm_playback.h" | ||
77 | #endif | ||
76 | 78 | ||
77 | #define CONFIG_BLOCK_VERSION 21 | 79 | #define CONFIG_BLOCK_VERSION 21 |
78 | #define CONFIG_BLOCK_SIZE 512 | 80 | #define CONFIG_BLOCK_SIZE 512 |
@@ -382,6 +384,10 @@ static const struct bit_entry hd_bits[] = | |||
382 | {4, S_O(rec_trigger_mode ), 1, "trigger mode", "off,no rearm,rearm"}, | 384 | {4, S_O(rec_trigger_mode ), 1, "trigger mode", "off,no rearm,rearm"}, |
383 | #endif | 385 | #endif |
384 | 386 | ||
387 | #if CONFIG_HWCODEC == MASNONE | ||
388 | {1, S_O(crossfade), false, "crossfade", off_on}, | ||
389 | #endif | ||
390 | |||
385 | /* new stuff to be added at the end */ | 391 | /* new stuff to be added at the end */ |
386 | 392 | ||
387 | /* Sum of all bit sizes must not grow beyond 0xB8*8 = 1472 */ | 393 | /* Sum of all bit sizes must not grow beyond 0xB8*8 = 1472 */ |
@@ -812,6 +818,10 @@ void settings_apply(void) | |||
812 | lang_load(buf); | 818 | lang_load(buf); |
813 | talk_init(); /* use voice of same language */ | 819 | talk_init(); /* use voice of same language */ |
814 | } | 820 | } |
821 | |||
822 | #if CONFIG_HWCODEC == MASNONE && !defined(SIMULATOR) | ||
823 | pcm_crossfade_enable(global_settings.crossfade); | ||
824 | #endif | ||
815 | } | 825 | } |
816 | 826 | ||
817 | 827 | ||