From 8710f4aa979fff03ddd0c7b1da53ae6e5f198fac Mon Sep 17 00:00:00 2001 From: Fulup Ar Foll Date: Mon, 28 Aug 2017 00:59:28 +0200 Subject: Change default value for playback PCM was muted at init --- HAL-afb/HDA-intel/IntelHdaHAL.c | 2 +- HAL-afb/Jabra-Solemate/JabraUsbHAL.c | 8 ++++---- conf.d/project/json.d/onload-aaaa-sample.json | 6 +++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/HAL-afb/HDA-intel/IntelHdaHAL.c b/HAL-afb/HDA-intel/IntelHdaHAL.c index 4f79f60..d41b6ba 100644 --- a/HAL-afb/HDA-intel/IntelHdaHAL.c +++ b/HAL-afb/HDA-intel/IntelHdaHAL.c @@ -65,7 +65,7 @@ STATIC halVolRampT volRampEmergency= { STATIC alsaHalMapT alsaHalMap[]= { { .tag=Master_Playback_Volume, . ctl={.name="PCM Playback Volume", .value=50 } }, { .tag=PCM_Playback_Volume , .ctl={.name="PCM Playback Volume", .value=50 } }, - { .tag=PCM_Playback_Switch , .ctl={.name="PCM Playback Switch" } }, + { .tag=PCM_Playback_Switch , .ctl={.name="PCM Playback Switch", .value=01 } }, { .tag=Capture_Volume , .ctl={.name="Mic Capture Volume" } }, // Sound card does not have hardware volume ramping diff --git a/HAL-afb/Jabra-Solemate/JabraUsbHAL.c b/HAL-afb/Jabra-Solemate/JabraUsbHAL.c index d3ddcfc..a9c5c63 100644 --- a/HAL-afb/Jabra-Solemate/JabraUsbHAL.c +++ b/HAL-afb/Jabra-Solemate/JabraUsbHAL.c @@ -63,10 +63,10 @@ STATIC halVolRampT volRampEmergency= { // Map HAL hight sndctl with Alsa numid and optionally with a custom callback for non Alsa supported functionalities. STATIC alsaHalMapT alsaHalMap[]= { - { .tag=Master_Playback_Volume, . ctl={.name="PCM Playback Volume", .value=12 } }, - { .tag=PCM_Playback_Volume , .ctl={.name="PCM Playback Volume", .value=12 } }, - { .tag=PCM_Playback_Switch , .ctl={.name="PCM Playback Switch" } }, - { .tag=Capture_Volume , .ctl={.name="Mic Capture Volume" } }, + { .tag=Master_Playback_Volume, . ctl={.name="PCM Playback Volume", .value=12 }}, + { .tag=PCM_Playback_Volume , .ctl={.name="PCM Playback Volume", .value=12 }}, + { .tag=PCM_Playback_Switch , .ctl={.name="PCM Playback Switch", .value=01 }}, + { .tag=Capture_Volume , .ctl={.name="Mic Capture Volume" }}, // Sound card does not have hardware volume ramping { .tag=Master_Playback_Ramp , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="ramp volume linearly according to current ramp setting", diff --git a/conf.d/project/json.d/onload-aaaa-sample.json b/conf.d/project/json.d/onload-aaaa-sample.json index 8f05317..2b0ad7f 100644 --- a/conf.d/project/json.d/onload-aaaa-sample.json +++ b/conf.d/project/json.d/onload-aaaa-sample.json @@ -37,7 +37,11 @@ "permissions": "urn:AGL:permission:audio:public:multimedia", "actions": { "label": "authorize-multimedia", - "lua": "_Temporarily_Control" + "lua": "_Temporarily_Control", + "args": { + "ctl" : "Multimedia_Playback_Volume", + "val": 80 + } } }, { "label": "Navigation", -- cgit 1.2.3-korg