From 87be9daee783c15219f960afb092fecb755ab5fc Mon Sep 17 00:00:00 2001
From: Loïc Collignon <loic.collignon@iot.bzh>
Date: Fri, 14 Dec 2018 14:42:45 +0100
Subject: WIP: adding a master volume
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Create a master volume that binds to the master volume of the real
hardware, as set up in the corresponding HAL.

Change-Id: I18b02327bb42177c21ed8d9db9f7a7b8adbd87d0
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
---
 conf.d/project/etc/policy-4a-sample1.json | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'conf.d')

diff --git a/conf.d/project/etc/policy-4a-sample1.json b/conf.d/project/etc/policy-4a-sample1.json
index 673caa7..2cc44a6 100644
--- a/conf.d/project/etc/policy-4a-sample1.json
+++ b/conf.d/project/etc/policy-4a-sample1.json
@@ -13,23 +13,37 @@
     "controls": [],
     "events": [],
     "roles":[
+            {
+                "uid": "master-control",
+                "description": "Master volume using control",
+                "priority": 0,
+                "resource": "agl-master-playback-volume",
+                "type": "control"
+            },
+            {
+                "uid": "master-playback",
+                "description": "Master volume using playback",
+                "priority": 0,
+                "resource": "playback",
+                "type": "playback"
+            },
             {
                 "uid": "radio",
                 "description": "Radio (tuner)",
                 "priority": 0,
-                "stream": "radio_stream"
+                "resource": "radio_stream"
             },
             {
                 "uid": "multimedia",
                 "description": "Multimedia content (e.g. media player, etc.)",
                 "priority": 0,
-                "stream": "multimedia"
+                "resource": "multimedia"
             },
             {
                 "uid": "emergency",
                 "description": "Safety-relevant or critical alerts/alarms",
                 "priority": 100,
-                "stream": "emergency",
+                "resource": "emergency",
                 "interrupts":[
                     {"type": "ramp", "args": { "uid": "ramp-slow", "volume": 30} }
                 ]
@@ -39,7 +53,7 @@
                 "name": "navigation",
                 "description": "Navigation instructions (GPS, turn directions, etc...)",
                 "priority": 25,
-                "stream": "navigation",
+                "resource": "navigation",
                 "interrupts":[
                     {"type": "ramp", "args": { "uid": "ramp-slow", "volume": 30} }
                 ]
-- 
cgit 1.2.3-korg