diff options
-rw-r--r-- | apps/lang/english.lang | 30 | ||||
-rw-r--r-- | apps/settings.c | 11 | ||||
-rw-r--r-- | apps/settings.h | 3 | ||||
-rw-r--r-- | apps/sound_menu.c | 18 | ||||
-rw-r--r-- | firmware/export/sound.h | 15 | ||||
-rw-r--r-- | firmware/sound.c | 158 |
6 files changed, 220 insertions, 15 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 40b84bbeab..502348def2 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -3466,3 +3466,33 @@ desc: in radio screen / menu | |||
3466 | eng: "Mode:" | 3466 | eng: "Mode:" |
3467 | voice: "" | 3467 | voice: "" |
3468 | new: | 3468 | new: |
3469 | |||
3470 | id: LANG_SCALING_MODE | ||
3471 | desc: in sound_settings. How to scale volume/bass to prevent clipping | ||
3472 | eng: "Prevent clipping" | ||
3473 | voice: "Prevent clipping" | ||
3474 | new: | ||
3475 | |||
3476 | id: LANG_SCALE_OFF | ||
3477 | desc: in sound_settings. Do not reduce volume/bass | ||
3478 | eng: "Off" | ||
3479 | voice: "Off" | ||
3480 | new: | ||
3481 | |||
3482 | id: LANG_SCALE_VOLUME | ||
3483 | desc: in sound_settings. Reduce volume | ||
3484 | eng: "Adjust volume" | ||
3485 | voice: "Adjust volume" | ||
3486 | new: | ||
3487 | |||
3488 | id: LANG_SCALE_BASS | ||
3489 | desc: in sound_settings. Reduce bass | ||
3490 | eng: "Adjust bass" | ||
3491 | voice: "Adjust bass" | ||
3492 | new: | ||
3493 | |||
3494 | id: LANG_SCALE_CURRENT | ||
3495 | desc: in sound_settings. Reduce other metric than currently modified | ||
3496 | eng: "Adjust current" | ||
3497 | voice: "Adjust current" | ||
3498 | new: | ||
diff --git a/apps/settings.c b/apps/settings.c index edcef4a271..302cf51e26 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -85,7 +85,7 @@ const char rec_base_directory[] = REC_BASE_DIR; | |||
85 | #include "dsp.h" | 85 | #include "dsp.h" |
86 | #endif | 86 | #endif |
87 | 87 | ||
88 | #define CONFIG_BLOCK_VERSION 33 | 88 | #define CONFIG_BLOCK_VERSION 34 |
89 | #define CONFIG_BLOCK_SIZE 512 | 89 | #define CONFIG_BLOCK_SIZE 512 |
90 | #define RTC_BLOCK_SIZE 44 | 90 | #define RTC_BLOCK_SIZE 44 |
91 | 91 | ||
@@ -210,6 +210,9 @@ static const struct bit_entry rtc_bits[] = | |||
210 | {3, S_O(channel_config), 0, "channels", | 210 | {3, S_O(channel_config), 0, "channels", |
211 | "stereo,mono,custom,mono left,mono right,karaoke" }, | 211 | "stereo,mono,custom,mono left,mono right,karaoke" }, |
212 | {8, S_O(stereo_width), 100, "stereo width", NULL}, | 212 | {8, S_O(stereo_width), 100, "stereo width", NULL}, |
213 | #ifdef HAVE_UDA1380 | ||
214 | {2, S_O(sound_scaling), SOUND_SCALE_VOLUME, "prevent clipping", "adjust volume,adjust bass,adjust current,off"}, | ||
215 | #endif | ||
213 | /* playback */ | 216 | /* playback */ |
214 | {1, S_O(resume), false, "resume", off_on }, | 217 | {1, S_O(resume), false, "resume", off_on }, |
215 | {1, S_O(playlist_shuffle), false, "shuffle", off_on }, | 218 | {1, S_O(playlist_shuffle), false, "shuffle", off_on }, |
@@ -836,6 +839,9 @@ void sound_settings_apply(void) | |||
836 | sound_set(SOUND_VOLUME, global_settings.volume); | 839 | sound_set(SOUND_VOLUME, global_settings.volume); |
837 | sound_set(SOUND_CHANNELS, global_settings.channel_config); | 840 | sound_set(SOUND_CHANNELS, global_settings.channel_config); |
838 | sound_set(SOUND_STEREO_WIDTH, global_settings.stereo_width); | 841 | sound_set(SOUND_STEREO_WIDTH, global_settings.stereo_width); |
842 | #ifdef HAVE_UDA1380 | ||
843 | sound_set(SOUND_SCALING, global_settings.sound_scaling); | ||
844 | #endif | ||
839 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 845 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
840 | sound_set(SOUND_LOUDNESS, global_settings.loudness); | 846 | sound_set(SOUND_LOUDNESS, global_settings.loudness); |
841 | sound_set(SOUND_AVC, global_settings.avc); | 847 | sound_set(SOUND_AVC, global_settings.avc); |
@@ -1415,6 +1421,9 @@ void settings_reset(void) { | |||
1415 | global_settings.treble = sound_default(SOUND_TREBLE); | 1421 | global_settings.treble = sound_default(SOUND_TREBLE); |
1416 | global_settings.channel_config = sound_default(SOUND_CHANNELS); | 1422 | global_settings.channel_config = sound_default(SOUND_CHANNELS); |
1417 | global_settings.stereo_width = sound_default(SOUND_STEREO_WIDTH); | 1423 | global_settings.stereo_width = sound_default(SOUND_STEREO_WIDTH); |
1424 | #ifdef HAVE_UDA1380 | ||
1425 | global_settings.sound_scaling = sound_default(SOUND_SCALING); | ||
1426 | #endif | ||
1418 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 1427 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
1419 | global_settings.loudness = sound_default(SOUND_LOUDNESS); | 1428 | global_settings.loudness = sound_default(SOUND_LOUDNESS); |
1420 | global_settings.avc = sound_default(SOUND_AVC); | 1429 | global_settings.avc = sound_default(SOUND_AVC); |
diff --git a/apps/settings.h b/apps/settings.h index 958703396d..9f9cc63602 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -157,6 +157,9 @@ struct user_settings | |||
157 | int avc; /* auto volume correct: 0=off, 1=20ms, 2=2s 3=4s 4=8s */ | 157 | int avc; /* auto volume correct: 0=off, 1=20ms, 2=2s 3=4s 4=8s */ |
158 | int channel_config; /* Stereo, Mono, Custom, Mono left, Mono right, Karaoke */ | 158 | int channel_config; /* Stereo, Mono, Custom, Mono left, Mono right, Karaoke */ |
159 | int stereo_width; /* 0-255% */ | 159 | int stereo_width; /* 0-255% */ |
160 | #ifdef HAVE_UDA1380 | ||
161 | int sound_scaling; /* Off, Volume, Bass, Current metric */ | ||
162 | #endif | ||
160 | int mdb_strength; /* 0-127dB */ | 163 | int mdb_strength; /* 0-127dB */ |
161 | int mdb_harmonics; /* 0-100% */ | 164 | int mdb_harmonics; /* 0-100% */ |
162 | int mdb_center; /* 20-300Hz */ | 165 | int mdb_center; /* 20-300Hz */ |
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index d8795ab8ae..06887cf9d3 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c | |||
@@ -349,6 +349,21 @@ static bool stereo_width(void) | |||
349 | SOUND_STEREO_WIDTH); | 349 | SOUND_STEREO_WIDTH); |
350 | } | 350 | } |
351 | 351 | ||
352 | #ifdef HAVE_UDA1380 | ||
353 | static bool sound_scaling(void) | ||
354 | { | ||
355 | static const struct opt_items names[] = { | ||
356 | { STR(LANG_SCALE_VOLUME) }, | ||
357 | { STR(LANG_SCALE_BASS) }, | ||
358 | { STR(LANG_SCALE_CURRENT)}, | ||
359 | { STR(LANG_SCALE_OFF) } | ||
360 | }; | ||
361 | |||
362 | return set_option(str(LANG_SCALING_MODE), &global_settings.sound_scaling, INT, | ||
363 | names, 4, sound_set_scaling); | ||
364 | } | ||
365 | #endif | ||
366 | |||
352 | bool sound_menu(void) | 367 | bool sound_menu(void) |
353 | { | 368 | { |
354 | int m; | 369 | int m; |
@@ -360,6 +375,9 @@ bool sound_menu(void) | |||
360 | { ID2P(LANG_BALANCE), balance }, | 375 | { ID2P(LANG_BALANCE), balance }, |
361 | { ID2P(LANG_CHANNEL_MENU), chanconf }, | 376 | { ID2P(LANG_CHANNEL_MENU), chanconf }, |
362 | { ID2P(LANG_STEREO_WIDTH), stereo_width }, | 377 | { ID2P(LANG_STEREO_WIDTH), stereo_width }, |
378 | #ifdef HAVE_UDA1380 | ||
379 | { ID2P(LANG_SCALING_MODE), sound_scaling }, | ||
380 | #endif | ||
363 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 381 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
364 | { ID2P(LANG_LOUDNESS), loudness }, | 382 | { ID2P(LANG_LOUDNESS), loudness }, |
365 | { ID2P(LANG_AUTOVOL), avc }, | 383 | { ID2P(LANG_AUTOVOL), avc }, |
diff --git a/firmware/export/sound.h b/firmware/export/sound.h index 2c002063db..3c7dec62b0 100644 --- a/firmware/export/sound.h +++ b/firmware/export/sound.h | |||
@@ -26,6 +26,9 @@ enum { | |||
26 | SOUND_BALANCE, | 26 | SOUND_BALANCE, |
27 | SOUND_CHANNELS, | 27 | SOUND_CHANNELS, |
28 | SOUND_STEREO_WIDTH, | 28 | SOUND_STEREO_WIDTH, |
29 | #ifdef HAVE_UDA1380 | ||
30 | SOUND_SCALING, | ||
31 | #endif | ||
29 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 32 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
30 | SOUND_LOUDNESS, | 33 | SOUND_LOUDNESS, |
31 | SOUND_AVC, | 34 | SOUND_AVC, |
@@ -56,6 +59,15 @@ enum { | |||
56 | SOUND_CHAN_KARAOKE, | 59 | SOUND_CHAN_KARAOKE, |
57 | }; | 60 | }; |
58 | 61 | ||
62 | #ifdef HAVE_UDA1380 | ||
63 | enum { | ||
64 | SOUND_SCALE_VOLUME = 0, | ||
65 | SOUND_SCALE_BASS, | ||
66 | SOUND_SCALE_CURRENT, | ||
67 | SOUND_SCALE_OFF | ||
68 | }; | ||
69 | #endif | ||
70 | |||
59 | typedef void sound_set_type(int value); | 71 | typedef void sound_set_type(int value); |
60 | 72 | ||
61 | const char *sound_unit(int setting); | 73 | const char *sound_unit(int setting); |
@@ -72,6 +84,9 @@ void sound_set_bass(int value); | |||
72 | void sound_set_treble(int value); | 84 | void sound_set_treble(int value); |
73 | void sound_set_channels(int value); | 85 | void sound_set_channels(int value); |
74 | void sound_set_stereo_width(int value); | 86 | void sound_set_stereo_width(int value); |
87 | #ifdef HAVE_UDA1380 | ||
88 | void sound_set_scaling(int value); | ||
89 | #endif | ||
75 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 90 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
76 | void sound_set_loudness(int value); | 91 | void sound_set_loudness(int value); |
77 | void sound_set_avc(int value); | 92 | void sound_set_avc(int value); |
diff --git a/firmware/sound.c b/firmware/sound.c index 9ab545f51d..0516987e26 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
@@ -63,6 +63,7 @@ static const struct sound_settings_info sound_settings_table[] = { | |||
63 | #elif defined(HAVE_UDA1380) | 63 | #elif defined(HAVE_UDA1380) |
64 | [SOUND_BASS] = {"dB", 0, 2, 0, 24, 0, sound_set_bass}, | 64 | [SOUND_BASS] = {"dB", 0, 2, 0, 24, 0, sound_set_bass}, |
65 | [SOUND_TREBLE] = {"dB", 0, 2, 0, 6, 0, sound_set_treble}, | 65 | [SOUND_TREBLE] = {"dB", 0, 2, 0, 6, 0, sound_set_treble}, |
66 | [SOUND_SCALING] = {"", 0, 1, 0, 1, 0, sound_set_scaling}, | ||
66 | #else /* MAS3507D */ | 67 | #else /* MAS3507D */ |
67 | [SOUND_BASS] = {"dB", 0, 1, -15, 15, 7, sound_set_bass}, | 68 | [SOUND_BASS] = {"dB", 0, 1, -15, 15, 7, sound_set_bass}, |
68 | [SOUND_TREBLE] = {"dB", 0, 1, -15, 15, 7, sound_set_treble}, | 69 | [SOUND_TREBLE] = {"dB", 0, 1, -15, 15, 7, sound_set_treble}, |
@@ -251,6 +252,20 @@ static int tenthdb2master(int db) { | |||
251 | else /* 0.25 dB steps */ | 252 | else /* 0.25 dB steps */ |
252 | return -db * 2 / 5; | 253 | return -db * 2 / 5; |
253 | } | 254 | } |
255 | |||
256 | static int tenthdb2mixer(int db) { | ||
257 | if (db < -720) | ||
258 | return 228; | ||
259 | else if (db < -660) | ||
260 | return 224; | ||
261 | else if (db < -600) | ||
262 | return 216; | ||
263 | else if (db < -470) | ||
264 | return (460 - db) / 5; | ||
265 | else | ||
266 | return -db * 2 / 5; | ||
267 | } | ||
268 | |||
254 | #endif | 269 | #endif |
255 | 270 | ||
256 | #if (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 | 271 | #if (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 |
@@ -263,6 +278,89 @@ int current_balance = 0; /* -960..+960 -840..+840 */ | |||
263 | int current_treble = 0; /* -150..+150 0.. +60 */ | 278 | int current_treble = 0; /* -150..+150 0.. +60 */ |
264 | int current_bass = 0; /* -150..+150 0..+240 */ | 279 | int current_bass = 0; /* -150..+150 0..+240 */ |
265 | 280 | ||
281 | #ifdef HAVE_UDA1380 | ||
282 | |||
283 | #define MODIFYING_VOLUME 0 | ||
284 | #define MODIFYING_BASS 1 | ||
285 | #define MODIFYING_BALANCE 2 | ||
286 | #define MODIFYING_NONE 3 | ||
287 | |||
288 | int current_scaling_mode = SOUND_SCALE_VOLUME; | ||
289 | int current_start_l_r = VOLUME_MAX; | ||
290 | |||
291 | static void set_prescaled_volume_and_bass(int scaling_mode, bool just_balance) | ||
292 | { | ||
293 | int l = VOLUME_MAX, r = VOLUME_MAX, prescale; | ||
294 | int new_bass = 0, new_volume = 0; | ||
295 | |||
296 | if(scaling_mode == SOUND_SCALE_OFF) | ||
297 | { | ||
298 | if (current_volume > VOLUME_MAX) | ||
299 | current_volume = VOLUME_MAX; | ||
300 | new_bass = (current_bass/10) >> 1; | ||
301 | new_volume = tenthdb2mixer(current_volume); | ||
302 | |||
303 | } | ||
304 | else if(scaling_mode == SOUND_SCALE_BASS) | ||
305 | { | ||
306 | if (current_volume > VOLUME_MAX) | ||
307 | current_volume = VOLUME_MAX; | ||
308 | |||
309 | prescale = ((VOLUME_MAX - current_volume) / 20); | ||
310 | |||
311 | if ((current_bass + current_volume) <= VOLUME_MAX) | ||
312 | new_bass = current_bass / 20; | ||
313 | else | ||
314 | new_bass = prescale; /* limit bass with volume */ | ||
315 | |||
316 | new_volume = tenthdb2mixer(current_volume); | ||
317 | |||
318 | } | ||
319 | else if(scaling_mode == SOUND_SCALE_VOLUME) | ||
320 | { | ||
321 | prescale = current_bass; | ||
322 | if (prescale < 0) | ||
323 | prescale = 0; | ||
324 | |||
325 | new_bass = (current_bass/10) >> 1; | ||
326 | new_volume = prescale*2/5; | ||
327 | |||
328 | if (current_volume + prescale > VOLUME_MAX) | ||
329 | prescale = VOLUME_MAX - current_volume; | ||
330 | |||
331 | l = r = current_volume + prescale; | ||
332 | } | ||
333 | else if(scaling_mode == SOUND_SCALE_CURRENT) | ||
334 | { | ||
335 | l = r = current_start_l_r; | ||
336 | |||
337 | } | ||
338 | |||
339 | if(!just_balance) | ||
340 | { | ||
341 | uda1380_set_bass(new_bass); | ||
342 | uda1380_set_mixer_vol(new_volume, new_volume); | ||
343 | } | ||
344 | |||
345 | current_start_l_r = l; | ||
346 | |||
347 | if (current_balance > 0) { | ||
348 | l -= current_balance; | ||
349 | if (l < VOLUME_MIN) | ||
350 | l = VOLUME_MIN; | ||
351 | } | ||
352 | if (current_balance < 0) { | ||
353 | r += current_balance; | ||
354 | if (r < VOLUME_MIN) | ||
355 | r = VOLUME_MIN; | ||
356 | } | ||
357 | |||
358 | uda1380_set_master_vol(tenthdb2master(l), tenthdb2master(r)); | ||
359 | } | ||
360 | |||
361 | #endif | ||
362 | |||
363 | #if CONFIG_CODEC == MAS3507D | ||
266 | static void set_prescaled_volume(void) | 364 | static void set_prescaled_volume(void) |
267 | { | 365 | { |
268 | int prescale; | 366 | int prescale; |
@@ -273,12 +371,7 @@ static void set_prescaled_volume(void) | |||
273 | prescale = 0; /* no need to prescale if we don't boost | 371 | prescale = 0; /* no need to prescale if we don't boost |
274 | bass or treble */ | 372 | bass or treble */ |
275 | 373 | ||
276 | #if CONFIG_CODEC == MAS3507D | ||
277 | mas_writereg(MAS_REG_KPRESCALE, prescale_table[prescale/10]); | 374 | mas_writereg(MAS_REG_KPRESCALE, prescale_table[prescale/10]); |
278 | #else /* UDA1380 */ | ||
279 | uda1380_set_mixer_vol(prescale*2/5, prescale*2/5); | ||
280 | /* The needed range of 0..-24 dB is fortunately linear */ | ||
281 | #endif | ||
282 | 375 | ||
283 | /* gain up the analog volume to compensate the prescale gain reduction, | 376 | /* gain up the analog volume to compensate the prescale gain reduction, |
284 | * but limit to the possible maximum */ | 377 | * but limit to the possible maximum */ |
@@ -299,12 +392,28 @@ static void set_prescaled_volume(void) | |||
299 | r = VOLUME_MIN; | 392 | r = VOLUME_MIN; |
300 | } | 393 | } |
301 | 394 | ||
302 | #if CONFIG_CODEC == MAS3507D | ||
303 | dac_volume(tenthdb2reg(l), tenthdb2reg(r), false); | 395 | dac_volume(tenthdb2reg(l), tenthdb2reg(r), false); |
304 | #else /* UDA1380 */ | 396 | } |
305 | uda1380_set_master_vol(tenthdb2master(l), tenthdb2master(r)); | ||
306 | #endif | 397 | #endif |
398 | |||
399 | #ifdef HAVE_UDA1380 | ||
400 | static void set_prescaled_volume(int modifying) | ||
401 | { | ||
402 | if (modifying == MODIFYING_BALANCE) | ||
403 | set_prescaled_volume_and_bass(current_scaling_mode,true); | ||
404 | else if (current_scaling_mode == SOUND_SCALE_OFF) | ||
405 | set_prescaled_volume_and_bass(current_scaling_mode,false); | ||
406 | else if(( (modifying == MODIFYING_BASS) | ||
407 | && (current_scaling_mode == SOUND_SCALE_CURRENT)) || | ||
408 | (current_scaling_mode == SOUND_SCALE_VOLUME)) | ||
409 | set_prescaled_volume_and_bass(SOUND_SCALE_VOLUME,false); | ||
410 | else if(( (modifying == MODIFYING_VOLUME) | ||
411 | && (current_scaling_mode == SOUND_SCALE_CURRENT)) || | ||
412 | (current_scaling_mode == SOUND_SCALE_BASS)) | ||
413 | set_prescaled_volume_and_bass(SOUND_SCALE_BASS,false); | ||
307 | } | 414 | } |
415 | #endif | ||
416 | |||
308 | #endif /* (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 */ | 417 | #endif /* (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 */ |
309 | #endif /* !SIMULATOR */ | 418 | #endif /* !SIMULATOR */ |
310 | 419 | ||
@@ -402,9 +511,12 @@ void sound_set_volume(int value) | |||
402 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 511 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
403 | int tmp = 0x7f00 * value / 100; | 512 | int tmp = 0x7f00 * value / 100; |
404 | mas_codec_writereg(0x10, tmp & 0xff00); | 513 | mas_codec_writereg(0x10, tmp & 0xff00); |
405 | #elif (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 | 514 | #elif (CONFIG_CODEC == MAS3507D) |
515 | current_volume = VOLUME_MIN + (value * VOLUME_RANGE / 100); | ||
516 | set_prescaled_volume(); /* tenth of dB */ | ||
517 | #elif defined HAVE_UDA1380 | ||
406 | current_volume = VOLUME_MIN + (value * VOLUME_RANGE / 100); | 518 | current_volume = VOLUME_MIN + (value * VOLUME_RANGE / 100); |
407 | set_prescaled_volume(); /* tenth of dB */ | 519 | set_prescaled_volume(MODIFYING_VOLUME); /* tenth of dB */ |
408 | #elif (CONFIG_CPU == PP5020) | 520 | #elif (CONFIG_CPU == PP5020) |
409 | /* TODO: Implement sound_set_volume() */ | 521 | /* TODO: Implement sound_set_volume() */ |
410 | (void)value; | 522 | (void)value; |
@@ -418,9 +530,12 @@ void sound_set_balance(int value) | |||
418 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 530 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
419 | int tmp = ((value * 127 / 100) & 0xff) << 8; | 531 | int tmp = ((value * 127 / 100) & 0xff) << 8; |
420 | mas_codec_writereg(0x11, tmp & 0xff00); | 532 | mas_codec_writereg(0x11, tmp & 0xff00); |
421 | #elif CONFIG_CODEC == MAS3507D || defined HAVE_UDA1380 | 533 | #elif CONFIG_CODEC == MAS3507D |
422 | current_balance = value * VOLUME_RANGE / 100; /* tenth of dB */ | 534 | current_balance = value * VOLUME_RANGE / 100; /* tenth of dB */ |
423 | set_prescaled_volume(); | 535 | set_prescaled_volume(); |
536 | #elif defined HAVE_UDA1380 | ||
537 | current_balance = value * VOLUME_RANGE / 100; /* tenth of dB */ | ||
538 | set_prescaled_volume(MODIFYING_BALANCE); | ||
424 | #elif (CONFIG_CPU == PP5020) | 539 | #elif (CONFIG_CPU == PP5020) |
425 | /* TODO: Implement sound_set_balance() */ | 540 | /* TODO: Implement sound_set_balance() */ |
426 | (void)value; | 541 | (void)value; |
@@ -439,9 +554,8 @@ void sound_set_bass(int value) | |||
439 | current_bass = value * 10; | 554 | current_bass = value * 10; |
440 | set_prescaled_volume(); | 555 | set_prescaled_volume(); |
441 | #elif defined(HAVE_UDA1380) | 556 | #elif defined(HAVE_UDA1380) |
442 | uda1380_set_bass(value >> 1); | ||
443 | current_bass = value * 10; | 557 | current_bass = value * 10; |
444 | set_prescaled_volume(); | 558 | set_prescaled_volume(MODIFYING_BASS); |
445 | #elif (CONFIG_CPU == PP5020) | 559 | #elif (CONFIG_CPU == PP5020) |
446 | /* TODO: Implement sound_set_bass() */ | 560 | /* TODO: Implement sound_set_bass() */ |
447 | (void)value; | 561 | (void)value; |
@@ -462,7 +576,6 @@ void sound_set_treble(int value) | |||
462 | #elif defined(HAVE_UDA1380) | 576 | #elif defined(HAVE_UDA1380) |
463 | uda1380_set_treble(value >> 1); | 577 | uda1380_set_treble(value >> 1); |
464 | current_treble = value * 10; | 578 | current_treble = value * 10; |
465 | set_prescaled_volume(); | ||
466 | #elif (CONFIG_CPU == PP5020) | 579 | #elif (CONFIG_CPU == PP5020) |
467 | /* TODO: Implement sound_set_treble() */ | 580 | /* TODO: Implement sound_set_treble() */ |
468 | (void)value; | 581 | (void)value; |
@@ -486,6 +599,16 @@ void sound_set_stereo_width(int value) | |||
486 | set_channel_config(); | 599 | set_channel_config(); |
487 | } | 600 | } |
488 | 601 | ||
602 | #ifdef HAVE_UDA1380 | ||
603 | void sound_set_scaling(int value) | ||
604 | { | ||
605 | current_scaling_mode = value; | ||
606 | if(!audio_is_initialized) | ||
607 | return; | ||
608 | set_prescaled_volume(MODIFYING_NONE); | ||
609 | } | ||
610 | #endif | ||
611 | |||
489 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 612 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
490 | void sound_set_loudness(int value) | 613 | void sound_set_loudness(int value) |
491 | { | 614 | { |
@@ -603,6 +726,13 @@ void sound_set_stereo_width(int value) | |||
603 | (void)value; | 726 | (void)value; |
604 | } | 727 | } |
605 | 728 | ||
729 | #ifdef HAVE_UDA1380 | ||
730 | void sound_set_scaling(int value) | ||
731 | { | ||
732 | (void)value; | ||
733 | } | ||
734 | #endif | ||
735 | |||
606 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 736 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
607 | void sound_set_loudness(int value) | 737 | void sound_set_loudness(int value) |
608 | { | 738 | { |