aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonan Le Martret <ronan.lemartret@iot.bzh>2017-11-24 18:50:33 +0100
committerRonan Le Martret <ronan.lemartret@iot.bzh>2017-11-24 18:53:34 +0100
commit8e709cd6c0767fc5ba231dd6d36155d28ecb9cdf (patch)
tree650edf00a358a9b105476413182ac445afd8dab2
parent0db6510eb932993358e7ecdcca12fa5c1f2be784 (diff)
Change 4A PCM Name
Bug-AGL: SPEC-1136 Change-Id: Iaead3758dfca07c4c1a7a539aecf488550ba1f63 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
-rw-r--r--hal-statics.c56
-rw-r--r--hal-statics.h57
2 files changed, 68 insertions, 45 deletions
diff --git a/hal-statics.c b/hal-statics.c
index a6a608e..75426a2 100644
--- a/hal-statics.c
+++ b/hal-statics.c
@@ -35,31 +35,43 @@ PUBLIC const char *halCtlsLabels[] = {
[Vol_Ramp_Set_Slave] = "Volume_Ramp_Slave",
// Application Virtual Channels
- [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",
+ [Emergency_Playback_Volume] = "Emergency_Volume",
+ [Emergency_Playback_Ramp] = "Emergency_Ramp",
+ [Emergency_Playback_Switch] = "Emergency_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",
-
+ [CustomHigh_Playback_Volume] = "CustomHigh_Volume",
+ [CustomHigh_Playback_Ramp] = "CustomHigh_Ramp",
+ [CustomHigh_Playback_Switch] = "CustomHigh_Switch",
+ [Phone_Playback_Volume] = "Phone_Volume",
+ [Phone_Playback_Ramp] = "Phone_Ramp",
+ [Phone_Playback_Switch] = "Phone_Switch",
+ [Navigation_Playback_Volume] = "Navigation_Volume",
+ [Navigation_Playback_Ramp] = "Navigation_Ramp",
+ [Navigation_Playback_Switch] = "Navigation_Switch",
+ [CustomMedium_Playback_Volume] = "CustomMedium_Volume",
+ [CustomMedium_Playback_Ramp] = "CustomMedium_Ramp",
+ [CustomMedium_Playback_Switch] = "CustomMedium_Switch",
+ [Video_Playback_Volume] = "Video_Volume",
+ [Video_Playback_Ramp] = "Video_Ramp",
+ [Video_Playback_Switch] = "Video_Switch",
+ [Streaming_Playback_Volume] = "Streaming_Volume",
+ [Streaming_Playback_Ramp] = "Streaming_Ramp",
+ [Streaming_Playback_Switch] = "Streaming_Switch",
+ [Multimedia_Playback_Volume] = "Multimedia_Volume",
+ [Multimedia_Playback_Ramp] = "Multimedia_Ramp",
+ [Multimedia_Playback_Switch] = "Multimedia_Switch",
+ [Radio_Playback_Volume] = "Radio_Volume",
+ [Radio_Playback_Ramp] = "Radio_Ramp",
+ [Radio_Playback_Switch] = "Radio_Switch",
+ [CustomLow_Playback_Volume] = "CustomLow_Volume",
+ [CustomLow_Playback_Ramp] = "CustomLow_Ramp",
+ [CustomLow_Playback_Switch] = "CustomLow_Switch",
+ [Fallback_Playback_Volume] = "Fallback_Volume",
+ [Fallback_Playback_Ramp] = "Fallback_Ramp",
+ [Fallback_Playback_Switch] = "Fallback_Switch",
+
// Do not remove EndHalCrlTag
[EndHalCrlTag] = NULL
};
diff --git a/hal-statics.h b/hal-statics.h
index 4ddea25..8efa567 100644
--- a/hal-statics.h
+++ b/hal-statics.h
@@ -72,32 +72,43 @@ typedef enum {
Capture_Volume,
Master_OnOff_Switch,
- // 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,
+ // HighLevel Audio Role Control List,
+ Emergency_Playback_Volume,
+ Emergency_Playback_Ramp,
+ Emergency_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,
-
+ CustomHigh_Playback_Volume,
+ CustomHigh_Playback_Ramp,
+ CustomHigh_Playback_Switch,
+ Phone_Playback_Volume,
+ Phone_Playback_Ramp,
+ Phone_Playback_Switch,
+ Navigation_Playback_Volume,
+ Navigation_Playback_Ramp,
+ Navigation_Playback_Switch,
+ CustomMedium_Playback_Volume,
+ CustomMedium_Playback_Ramp,
+ CustomMedium_Playback_Switch,
+ Video_Playback_Volume,
+ Video_Playback_Ramp,
+ Video_Playback_Switch,
+ Streaming_Playback_Volume,
+ Streaming_Playback_Ramp,
+ Streaming_Playback_Switch,
+ Multimedia_Playback_Volume,
+ Multimedia_Playback_Ramp,
+ Multimedia_Playback_Switch,
+ Radio_Playback_Volume,
+ Radio_Playback_Ramp,
+ Radio_Playback_Switch,
+ CustomLow_Playback_Volume,
+ CustomLow_Playback_Ramp,
+ CustomLow_Playback_Switch,
+ Fallback_Playback_Volume,
+ Fallback_Playback_Ramp,
+ Fallback_Playback_Switch,
EndHalCrlTag // used to compute number of ctls
} halCtlsTagT;