aboutsummaryrefslogtreecommitdiffstats
path: root/HAL-afb/Scarlett-Focusrite
diff options
context:
space:
mode:
authorfulup <fulup.arfoll@iot.bzh>2017-07-30 21:11:00 +0200
committerfulup <fulup.arfoll@iot.bzh>2017-07-30 21:11:00 +0200
commit94a12b24d1712573607b78cd78f47e998a0323d4 (patch)
treee7407a2aca62fc25bfb95300f94db95664d4aeb0 /HAL-afb/Scarlett-Focusrite
parentda4f9b32ad32593aec2635da47077f0c05da71be (diff)
First Dev version with Volume Ramping
Diffstat (limited to 'HAL-afb/Scarlett-Focusrite')
-rw-r--r--HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c45
1 files changed, 31 insertions, 14 deletions
diff --git a/HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c b/HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c
index 10ef204..dd4499e 100644
--- a/HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c
+++ b/HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c
@@ -26,25 +26,41 @@
#include "hal-interface.h"
#include "audio-interface.h"
-STATIC struct json_object* MasterOnOff (alsaHalCtlMapT *control, void* handle, struct json_object *valJ) {
- struct json_object *reponseJ;
-
- AFB_INFO ("Power Set value=%s", json_object_get_string(valJ));
-
- reponseJ=json_object_new_object();
- json_object_object_add (reponseJ, "Callback", json_object_new_string("Hello From HAL"));
-
- return reponseJ;
-}
+// Default Values for MasterVolume Ramping
+STATIC halVolRampT volRampMaster= {
+ .mode = RAMP_VOL_NORMAL,
+ .slave = Master_Playback_Volume,
+ .delay = 100*1000, // ramping delay in us
+ .stepDown=1,
+ .stepUp =1,
+};
// 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={.numid=04 } },
- { .tag=PCM_Playback_Volume , .ctl={.numid=06 } },
+ { .tag=Master_Playback_Volume, . ctl={.name="Master Playback Volume" } },
+ { .tag=PCM_Playback_Volume , .ctl={.name="Master 1 (Monitor) Playback Volume" } },
{ .tag=PCM_Playback_Switch , .ctl={.numid=05 } },
{ .tag=Capture_Volume , .ctl={.numid=12 } },
- { .tag=Master_OnOff_Switch , .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_BOOLEAN, .count=1, .name="AGL-Power-Switch"}, .cb={.callback=MasterOnOff, .handle=NULL}},
- { .tag=Master_Playback_Ramp , .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=2, .name="AGL-Volume-Switch"}, .cb={.callback=MasterOnOff, .handle=NULL}},
+
+ { .tag=Vol_Ramp_Set_Mode , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="select volramp speed",
+ .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_ENUMERATED, .count=1, .value=RAMP_VOL_NORMAL, .name="Hal-VolRamp-Mode", .enums=halVolRampModes}
+ },
+ { .tag=Vol_Ramp_Set_Slave , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="set slave volume master numid",
+ .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .value=Master_Playback_Volume, .name="Hal-VolRamp-Slave", .enums=halVolRampModes}
+ },
+ { .tag=Vol_Ramp_Set_Delay , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="set ramp delay [default 250ms]",
+ .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=1000, .step=100, .value=250, .name="Hal-VolRamp-Step-Down"}
+ },
+ { .tag=Vol_Ramp_Set_Down , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="set linear step down ramp [default 10]",
+ .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=100, .step=1, .value=10, .name="Hal-VolRamp-Step-Down"}
+ },
+ { .tag=Vol_Ramp_Set_Up , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="set linear step up ramp [default 10]",
+ .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=100, .step=1, .value=10, .name="Hal-VolRamp-Step-Up"}
+ },
+ { .tag=Vol_Ramp , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="ramp volume linearly according to current ramp setting",
+ .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=100, .step=1, .name="Hal-VolRamp"}
+ },
+
{ .tag=EndHalCrlTag} /* marker for end of the array */
} ;
@@ -53,6 +69,7 @@ STATIC alsaHalSndCardT alsaHalSndCard = {
.name = "Scarlett 18i8 USB", // WARNING: name MUST match with 'aplay -l'
.info = "Hardware Abstraction Layer for Scarlett Focusrite USB professional music sound card",
.ctls = alsaHalMap,
+ .volumeCB = NULL, // use default volume normalisation function
};