summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2018-05-31 16:36:03 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2018-10-08 15:51:00 +0200
commitc461cb867a97a6d49945210f2050ea3d9ec44ab3 (patch)
tree7cd75b160b7766fbb76cce06465f20f16c755f0b
parent9fb0b417256ad8e8d7a109b908c6b30a83191fa2 (diff)
Updates json controller configuration files
Change json configration files names to correpond to a real card. Updates 'halmixer' section to make it work with softmixer. Change-Id: I22c6b7dc661110be243544ea88abc1a7d34c6b53 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
-rw-r--r--4a-hal-references-boards-cfg/hal-4a-jon-home-usb-card.json (renamed from 4a-hal-references-boards-cfg/hal-4a-sample2.json)26
-rw-r--r--4a-hal-references-boards-cfg/hal-4a-jon-office-usb-headset.json (renamed from 4a-hal-references-boards-cfg/hal-4a-sample1.json)16
2 files changed, 20 insertions, 22 deletions
diff --git a/4a-hal-references-boards-cfg/hal-4a-sample2.json b/4a-hal-references-boards-cfg/hal-4a-jon-home-usb-card.json
index 3816d1b..688052d 100644
--- a/4a-hal-references-boards-cfg/hal-4a-sample2.json
+++ b/4a-hal-references-boards-cfg/hal-4a-jon-home-usb-card.json
@@ -3,9 +3,9 @@
"metadata": {
"uid": "/dev/snd/by-id/usb-C-Media_Electronics_Inc._USB_Audio_Device-00",
"version": "0.9",
- "api": "4a-hal-sample2",
- "require": [ "4a-softmixer" ],
- "info": "Basic Audio Policy Control for Audio-4a - Sample 2",
+ "api": "4a-hal-jon-home-usb-card",
+ "require": [ "softmixer" ],
+ "info": "Basic Audio Policy Control for Audio-4a - Jon's Office USB Card Audio",
"author": "Jonathan Aillet",
"date": "2018-05-18"
},
@@ -51,15 +51,15 @@
},
"action": {
"label": "ramp-slow",
- "callback": "api://4a-hal-sample1#master { ramp : 70 }"
+ "callback": "api://4a-hal-jon-home-usb-card#master { ramp : 70 }"
}
}
],
"halmixer": {
- "uid": "hal-4a-sample2-test-mixer",
- "mixerapi": "4a-softmixer",
+ "uid": "jon-home-usb-card-mixer",
+ "mixerapi": "softmixer",
"backend": {
- "uid": "Jon-Home-USB-Audio",
+ "uid": "Jon-Home-USB-Card-Audio",
"devpath": "/dev/snd/by-id/usb-C-Media_Electronics_Inc._USB_Audio_Device-00",
"sink": [
{
@@ -98,12 +98,10 @@
"down": 2
}
],
- "devices": [
- {
- "playback": 0,
- "capture": 1
- }
- ],
+ "devices": {
+ "playback": 0,
+ "capture": 1
+ },
"subdevs": [
{
"subdev": 0,
@@ -179,4 +177,4 @@
}
]
}
-} \ No newline at end of file
+}
diff --git a/4a-hal-references-boards-cfg/hal-4a-sample1.json b/4a-hal-references-boards-cfg/hal-4a-jon-office-usb-headset.json
index 86e14d7..31db610 100644
--- a/4a-hal-references-boards-cfg/hal-4a-sample1.json
+++ b/4a-hal-references-boards-cfg/hal-4a-jon-office-usb-headset.json
@@ -3,9 +3,9 @@
"metadata": {
"uid": "/dev/snd/by-id/usb-Plantronics_Plantronics_.Audio_655_DSP-00",
"version": "0.9",
- "api": "4a-hal-sample1",
- "require": [ "4a-softmixer" ],
- "info": "Basic Audio Policy Control for Audio-4a - Sample 1",
+ "api": "4a-hal-jon-office-usb-headset",
+ "require": [ "softmixer" ],
+ "info": "Basic Audio Policy Control for Audio-4a - Jon's Office USB Headset Audio",
"author": "Jonathan Aillet",
"date": "2018-05-18"
},
@@ -51,15 +51,15 @@
},
"action": {
"label": "ramp-slow",
- "callback": "api://4a-hal-sample1#master { ramp : 70 }"
+ "callback": "api://4a-hal-jon-office-usb-headset#master { ramp : 70 }"
}
}
],
"halmixer": {
- "uid": "hal-4a-sample1-test-mixer",
- "mixerapi": "4a-softmixer",
+ "uid": "jon-office-usb-headset-mixer",
+ "mixerapi": "softmixer",
"backend": {
- "uid": "Jon-Office-HeadsetUSB-Audio",
+ "uid": "Jon-Office-USB-Headset-Audio",
"devpath": "/dev/snd/by-id/usb-Plantronics_Plantronics_.Audio_655_DSP-00",
"sink": [
{
@@ -179,4 +179,4 @@
}
]
}
-} \ No newline at end of file
+}