summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Jahnke <tobias.jahnke@microchip.com>2017-12-20 11:33:25 +0100
committerTobias Jahnke <tobias.jahnke@microchip.com>2017-12-20 11:33:25 +0100
commit6d4cbab774c0fa632ccdf4add35b87d0828ac765 (patch)
tree9bea4bc06d7e34ebc5357f034f95b25409533cff
parent2417799a20cf4e40db0510c8ed256a64ff692c17 (diff)
Bug-AGL: SPEC-1203 The initial value for Master_Playback_Volume was not set correctly to 80% and the initial value for Master_Ramp was missing. Fixes both issues. Change-Id: I5bc3000ac864d4d7a156f59d276992375ce3fbe0 Signed-off-by: Tobias Jahnke <tobias.jahnke@microchip.com>
-rw-r--r--MOST_UNICENS/hal_most_unicens.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/MOST_UNICENS/hal_most_unicens.c b/MOST_UNICENS/hal_most_unicens.c
index 4bb9b45..d31082c 100644
--- a/MOST_UNICENS/hal_most_unicens.c
+++ b/MOST_UNICENS/hal_most_unicens.c
@@ -236,7 +236,7 @@ void unicens_pcm_vol_cb(halCtlsTagT tag, alsaHalCtlMapT *control, void* handle,
/* declare ALSA mixer controls */
STATIC alsaHalMapT alsaHalMap[]= {
{ .tag=Master_Playback_Volume, .cb={.callback=unicens_master_vol_cb, .handle=&master_volume}, .info="Sets master playback volume",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=100, .step=1, .value=50, .name="Master Playback Volume"}
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=100, .step=1, .value=80, .name="Master Playback Volume"}
},
/*{ .tag=Master_OnOff_Switch, .cb={.callback=unicens_master_switch_cb, .handle=&master_switch}, .info="Sets master playback switch",
.ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_BOOLEAN, .count=1, .minval=0, .maxval=1, .step=1, .value=1, .name="Master Playback Switch"}
@@ -246,8 +246,8 @@ STATIC alsaHalMapT alsaHalMap[]= {
},
// Sound card does not have hardware volume ramping
- { .tag=Master_Playback_Ramp , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="Master Playback Volume Ramp",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=100, .step=1, .name="Master_Ramp"}
+ { .tag=Master_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="RampUp Master Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Master_Ramp", .count=1, .minval=0, .maxval=100, .step=1, .value=80 }
},
// Implement Rampup Volume for Virtual Channels (0-100)