aboutsummaryrefslogtreecommitdiffstats
path: root/Jabra-Solemate/JabraUsbHAL.c
diff options
context:
space:
mode:
Diffstat (limited to 'Jabra-Solemate/JabraUsbHAL.c')
-rw-r--r--Jabra-Solemate/JabraUsbHAL.c103
1 files changed, 78 insertions, 25 deletions
diff --git a/Jabra-Solemate/JabraUsbHAL.c b/Jabra-Solemate/JabraUsbHAL.c
index fd1d47e..2ad3fb0 100644
--- a/Jabra-Solemate/JabraUsbHAL.c
+++ b/Jabra-Solemate/JabraUsbHAL.c
@@ -39,27 +39,64 @@ STATIC halVolRampT volRampMaster= {
.stepUp =1,
};
-STATIC halVolRampT volRampMultimedia= {
- .slave = PCM_Volume_Multimedia,
- .delay = 100*1000, // ramping delay in us
+//Solvol Ramping Value can be customize by Audio Role and Hardwar card
+STATIC halVolRampT volRampGuidance= {
+ .slave = Guidance_Playback_Volume,
+ .delay = 50*1000, // ramping delay in us
.stepDown= 2,
- .stepUp = 1,
+ .stepUp = 4,
};
-STATIC halVolRampT volRampNavigation= {
- .slave = PCM_Volume_Navigation,
+STATIC halVolRampT volRampCommunication= {
+ .slave = Communication_Playback_Volume,
+ .delay = 50*1000, // ramping delay in us
+ .stepDown= 6,
+ .stepUp = 4,
+};
+
+STATIC halVolRampT volRampEntertainment= {
+ .slave = Entertainment_Playback_Volume,
.delay = 100*1000, // ramping delay in us
.stepDown= 4,
.stepUp = 2,
};
-// Default Values for MasterVolume Ramping
-STATIC halVolRampT volRampEmergency= {
- .slave = PCM_Volume_Emergency,
+
+STATIC halVolRampT volRampNotification= {
+ .slave = Notification_Playback_Volume,
.delay = 50*1000, // ramping delay in us
.stepDown= 6,
- .stepUp = 3,
+ .stepUp = 4,
+};
+
+STATIC halVolRampT volRampWarning= {
+ .slave = Warning_Playback_Volume,
+ .delay = 10*1000, // ramping delay in us
+ .stepDown= 6,
+ .stepUp = 10,
+};
+
+STATIC halVolRampT volRampSystem= {
+ .slave = System_Playback_Volume,
+ .delay = 20*100, // ramping delay in us
+ .stepDown= 6,
+ .stepUp = 10,
+};
+
+STATIC halVolRampT volRampStartup= {
+ .slave = Startup_Playback_Volume,
+ .delay = 20*100, // ramping delay in us
+ .stepDown= 6,
+ .stepUp = 10,
+};
+
+STATIC halVolRampT volRampShutdown= {
+ .slave = Shutdown_Playback_Volume,
+ .delay = 20*100, // ramping delay in us
+ .stepDown= 6,
+ .stepUp = 10,
};
+
// 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 }},
@@ -72,32 +109,48 @@ STATIC alsaHalMapT alsaHalMap[]= {
.ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=100, .step=1, .name="Rampup Master"}
},
- // Implement Rampup Volume for Virtual Channels
- { .tag=Navigation_Playback_Volume, .cb={.callback=volumeRamp, .handle=&volRampNavigation}, .info="RampUp Navigation Volume",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Playback Navigation Ramp", .value=80 }
+ // Implement Rampup Volume for Virtual Channels (0-100)
+ { .tag=Guidance_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampGuidance}, .info="RampUp Guidance Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Guidance_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
},
- { .tag=Emergency_Playback_Volume, .cb={.callback=volumeRamp, .handle=&volRampEmergency}, .info="Rampup Emergency Volume",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Playback Emergency Ramp", .value=80 }
+ { .tag=Entertainment_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampEntertainment}, .info="Rampup Entertainment Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Entertainment_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
},
-
- // Sound Card does not support hardware channel volume mixer (note softvol default range 0-256)
- { .tag=Multimedia_Playback_Volume, .cb={.callback=volumeRamp, .handle=&volRampMultimedia}, .info="Ramp-up Multimedia Volume",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Playback Multimedia Ramp", .value=80 }
+ { .tag=Notification_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampNotification}, .info="Ramp-up Notification Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Notification_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
+ },
+ { .tag=Communication_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampCommunication}, .info="RampUp Communication Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Communication_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
},
- { .tag=PCM_Volume_Multimedia, .info="Playback Multimedia Softvol",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=2, .maxval=255, .value=200, .name="Playback Multimedia"}
+ { .tag=Warning_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampWarning}, .info="Ramp-up Warning Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Warning_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
},
- { .tag=PCM_Volume_Navigation, .info="Playback Navigation Softvol",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=2, .maxval=255,.value=200, .name="Playback Navigation"}
+
+ { .tag=System_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampSystem}, .info="Ramp-up System Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="System_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
+ },
+ { .tag=Startup_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampStartup}, .info="Ramp-up Startup Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Startup_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
},
- { .tag=PCM_Volume_Emergency, .info="Playback Emergency Softvol",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=2, .maxval=255, .value=200, .name="Playback Emergency"}
+ { .tag=Shutdown_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampShutdown}, .info="Ramp-up Shutdown Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Shutdown_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
},
+ // Bind with existing ones created by ALSA configuration (and linked to softvol) [0-255]
+ { .tag=Guidance_Playback_Volume , .ctl={.name="Guidance_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
+ { .tag=Entertainment_Playback_Volume , .ctl={.name="Entertainment_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
+ { .tag=Notification_Playback_Volume , .ctl={.name="Notification_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
+ { .tag=Communication_Playback_Volume , .ctl={.name="Communications_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
+ { .tag=Warning_Playback_Volume , .ctl={.name="Warning_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
+ { .tag=System_Playback_Volume , .ctl={.name="System_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
+ { .tag=Startup_Playback_Volume , .ctl={.name="Startup_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
+ { .tag=Shutdown_Playback_Volume , .ctl={.name="Shutdown_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
+ // Could have similar controls for input side
{ .tag=EndHalCrlTag} /* marker for end of the array */
} ;
+
// HAL sound card mapping info
STATIC alsaHalSndCardT alsaHalSndCard = {
.name = "Jabra SOLEMATE v1.34.0", // WARNING: name MUST match with 'aplay -l'