From fb7748b333b42dca8d266d75da86f8812453c223 Mon Sep 17 00:00:00 2001 From: Tai Vuong Date: Sat, 4 Nov 2017 10:44:19 -0400 Subject: add audio role volume and ramp --- hal-statics.c | 33 ++++++++++++++++++++++++--------- hal-statics.h | 39 +++++++++++++++++++++++++++------------ 2 files changed, 51 insertions(+), 21 deletions(-) diff --git a/hal-statics.c b/hal-statics.c index d71c913..a6a608e 100644 --- a/hal-statics.c +++ b/hal-statics.c @@ -35,16 +35,31 @@ PUBLIC const char *halCtlsLabels[] = { [Vol_Ramp_Set_Slave] = "Volume_Ramp_Slave", // Application Virtual Channels - [Multimedia_Playback_Volume] = "Multimedia_Playback_Volume", - [Navigation_Playback_Volume] = "Navigation_Playback_Volume", - [Emergency_Playback_Volume] = "Emergency_Playback_Volume", - [Telephony_Playback_Volume] = "Telephony_Playback_Volume", + [Guidance_Playback_Volume] = "Guidance_Volume", + [Guidance_Playback_Ramp] = "Guidance_Ramp", + [Guidance_Playback_Switch] = "Guidance_Switch", + [Communication_Playback_Volume] = "Communication_Volume", + [Communication_Playback_Ramp] = "Communication_Ramp", + [Communication_Playback_Switch] = "Communication_Switch", + [Entertainment_Playback_Volume] = "Entertainment_Volume", + [Entertainment_Playback_Ramp] = "Entertainment_Ramp", + [Entertainment_Playback_Switch] = "Entertainment_Switch", + [Notification_Playback_Volume] = "Notification_Volume", + [Notification_Playback_Ramp] = "Notification_Ramp", + [Notification_Playback_Switch] = "Notification_Switch", + [Warning_Playback_Volume] = "Warning_Volume", + [Warning_Playback_Ramp] = "Warning_Ramp", + [Warning_Playback_Switch] = "Warning_Switch", + [System_Playback_Volume] = "System_Volume", + [System_Playback_Ramp] = "System_Ramp", + [System_Playback_Switch] = "System_Switch", + [Startup_Playback_Volume] = "Startup_Volume", + [Startup_Playback_Ramp] = "Startup_Ramp", + [Startup_Playback_Switch] = "Startup_Switch", + [Shutdown_Playback_Volume] = "Shutdown_Volume", + [Shutdown_Playback_Ramp] = "Shutdown_Ramp", + [Shutdown_Playback_Switch] = "Shutdown_Switch", - [Multimedia_Playback_Switch] = "Multimedia_Playback_Switch", - [Navigation_Playback_Switch] = "Navigation_Playback_Switch", - [Emergency_Playback_Switch] = "Emergency_Playback_Switch", - [Telephony_Playback_Switch] = "Telephony_Playback_Switch", - // Do not remove EndHalCrlTag [EndHalCrlTag] = NULL }; diff --git a/hal-statics.h b/hal-statics.h index 136d49a..4ddea25 100644 --- a/hal-statics.h +++ b/hal-statics.h @@ -64,24 +64,39 @@ typedef enum { Vol_Ramp_Set_Up, Vol_Ramp_Set_Slave, - // HighLevel Audio Control List, + // Hardware Audio Control List, Master_Playback_Volume, Master_Playback_Ramp, PCM_Playback_Volume, PCM_Playback_Switch, Capture_Volume, Master_OnOff_Switch, - Telephony_Playback_Volume, - Multimedia_Playback_Switch, - Navigation_Playback_Switch, - Emergency_Playback_Switch, - Telephony_Playback_Switch, - - - // Application Virtual Channels - Multimedia_Playback_Volume, - Navigation_Playback_Volume, - Emergency_Playback_Volume, + + // HighLevel Audio Role Control List, + Guidance_Playback_Volume, + Guidance_Playback_Ramp, + Guidance_Playback_Switch, //Mute to be implemented + Communication_Playback_Volume, + Communication_Playback_Ramp, + Communication_Playback_Switch, + Entertainment_Playback_Volume, + Entertainment_Playback_Ramp, + Entertainment_Playback_Switch, + Notification_Playback_Volume, + Notification_Playback_Ramp, + Notification_Playback_Switch, + Warning_Playback_Volume, + Warning_Playback_Ramp, + Warning_Playback_Switch, + System_Playback_Volume, + System_Playback_Ramp, + System_Playback_Switch, + Startup_Playback_Volume, + Startup_Playback_Ramp, + Startup_Playback_Switch, + Shutdown_Playback_Volume, + Shutdown_Playback_Ramp, + Shutdown_Playback_Switch, EndHalCrlTag // used to compute number of ctls } halCtlsTagT; -- cgit 1.2.3-korg