From b080c08d2ac82f7c38aace9587703b9182377c33 Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Wed, 26 Jun 2019 17:36:54 +0200 Subject: Remove obsolete references to mixer controls Remove obsolete references to controls in 'halmixer' section. Also, clean some minor format issues in json files. BUG-AGL: SPEC-2329 Change-Id: Ie3120dcfbc3144906bfc731e57614508a33222b2 Signed-off-by: Jonathan Aillet --- community-boards/hal-4a-2ch-generic-usb.json | 21 +----- community-boards/hal-4a-csl-cm106-8ch-usb.json | 21 +----- community-boards/hal-4a-ensoniq.json | 20 +----- community-boards/hal-4a-intel.json | 19 +----- community-boards/hal-4a-jabra.json | 17 ----- community-boards/hal-4a-raspberry-pi-3.json | 9 --- devices/hal-4a-greenbox.json | 72 ++++++++++---------- devices/hal-4a-unicens-coax.json | 36 +++++----- devices/hal-4a-unicens-utp.json | 36 +++++----- reference-boards/hal-4a-intel-minnow.json | 2 +- reference-boards/hal-4a-intel-qemu.json | 17 ----- reference-boards/hal-4a-rcar-m3.json | 19 +----- reference-boards/hal-4a-rcar-m3kf.json | 91 +++++++++++--------------- 13 files changed, 117 insertions(+), 263 deletions(-) diff --git a/community-boards/hal-4a-2ch-generic-usb.json b/community-boards/hal-4a-2ch-generic-usb.json index 6a19f9a..d4e1c6a 100644 --- a/community-boards/hal-4a-2ch-generic-usb.json +++ b/community-boards/hal-4a-2ch-generic-usb.json @@ -111,16 +111,7 @@ "params": { "rate": 48000 }, - "sink": { - "controls": { - "volume": { - "name": "Speaker Playback Volume", - "value": 80 - }, - "mute": { - "name": "Speaker Playback Switch" - } - }, + "sink" : { "channels": [ { "uid": "front-right", @@ -139,15 +130,7 @@ "params": { "rate": 48000 }, - "source": { - "controls": { - "volume": { - "name": "Capture Volume" - }, - "mute": { - "name": "Capture Switch" - } - }, + "source" : { "channels": [ { "uid": "mic-right", diff --git a/community-boards/hal-4a-csl-cm106-8ch-usb.json b/community-boards/hal-4a-csl-cm106-8ch-usb.json index 9646a22..a0e32c5 100644 --- a/community-boards/hal-4a-csl-cm106-8ch-usb.json +++ b/community-boards/hal-4a-csl-cm106-8ch-usb.json @@ -102,16 +102,7 @@ "params": { "rate": 48000 }, - "sink": { - "controls": { - "volume": { - "name": "Speaker Playback Volume", - "value": 80 - }, - "mute": { - "name": "Speaker Playback Switch" - } - }, + "sink" : { "channels": [ { "uid": "front-right", @@ -154,15 +145,7 @@ "params": { "rate": 48000 }, - "source": { - "controls": { - "volume": { - "name": "Capture Volume" - }, - "mute": { - "name": "Capture Switch" - } - }, + "source" : { "channels": [ { "uid": "mic-right", diff --git a/community-boards/hal-4a-ensoniq.json b/community-boards/hal-4a-ensoniq.json index b1ff56a..964ac2d 100644 --- a/community-boards/hal-4a-ensoniq.json +++ b/community-boards/hal-4a-ensoniq.json @@ -10,7 +10,7 @@ "date": "2018-06-13" }, "resources": [ - { + { "uid": "hal-bluealsa", "info": "Bluealsa hal plugin", "params": { @@ -111,15 +111,6 @@ "rate": 48000 }, "sink": { - "controls": { - "volume": { - "name": "Speaker Playback Volume", - "value": 80 - }, - "mute": { - "name": "Speaker Playback Switch" - } - }, "channels": [ { "uid": "front-right", @@ -139,14 +130,6 @@ "rate": 48000 }, "source": { - "controls": { - "volume": { - "name": "Capture Volume" - }, - "mute": { - "name": "Capture Switch" - } - }, "channels": [ { "uid": "mic-right", @@ -228,7 +211,6 @@ "rate" : 48000 } } - ] } } diff --git a/community-boards/hal-4a-intel.json b/community-boards/hal-4a-intel.json index 0e32df0..db2588c 100644 --- a/community-boards/hal-4a-intel.json +++ b/community-boards/hal-4a-intel.json @@ -10,7 +10,7 @@ "date": "2018-06-13" }, "resources": [ - { + { "uid": "hal-bluealsa", "info": "Bluealsa hal plugin", "params": { @@ -111,15 +111,6 @@ "rate": 48000 }, "sink": { - "controls": { - "volume": { - "name": "Master Playback Volume", - "value": 80 - }, - "mute": { - "name": "Master Playback Switch" - } - }, "channels": [ { "uid": "front-right", @@ -139,14 +130,6 @@ "rate": 48000 }, "source": { - "controls": { - "volume": { - "name": "Capture Volume" - }, - "mute": { - "name": "Capture Switch" - } - }, "channels": [ { "uid": "mic-right", diff --git a/community-boards/hal-4a-jabra.json b/community-boards/hal-4a-jabra.json index fcdb4c1..ab05ac9 100644 --- a/community-boards/hal-4a-jabra.json +++ b/community-boards/hal-4a-jabra.json @@ -111,15 +111,6 @@ "rate": 48000 }, "sink": { - "controls": { - "volume": { - "name": "Speaker Playback Volume", - "value": 80 - }, - "mute": { - "name": "Speaker Playback Switch" - } - }, "channels": [ { "uid": "front-right", @@ -139,14 +130,6 @@ "rate": 48000 }, "source": { - "controls": { - "volume": { - "name": "Capture Volume" - }, - "mute": { - "name": "Capture Switch" - } - }, "channels": [ { "uid": "mic-right", diff --git a/community-boards/hal-4a-raspberry-pi-3.json b/community-boards/hal-4a-raspberry-pi-3.json index e33c38f..b9202c9 100644 --- a/community-boards/hal-4a-raspberry-pi-3.json +++ b/community-boards/hal-4a-raspberry-pi-3.json @@ -113,15 +113,6 @@ "rate": 48000 }, "sink": { - "controls": { - "volume": { - "name": "PCM Playback Volume", - "value": 100 - }, - "mute": { - "name": "PCM Playback Switch" - } - }, "channels": [ { "uid": "front-right", diff --git a/devices/hal-4a-greenbox.json b/devices/hal-4a-greenbox.json index 03cd78b..333fd0e 100644 --- a/devices/hal-4a-greenbox.json +++ b/devices/hal-4a-greenbox.json @@ -149,44 +149,44 @@ } }, "captures": [ - { - "uid": "MOST_MIC_EP822CH", - "cardid": "hw:ep822ch", - "params": { - "rate": 48000 - }, - "source": { - "channels": [ - { - "uid": "mic-right", - "port": 0 - }, - { - "uid": "mic-left", - "port": 1 - } - ] - } - } , - { - "uid": "radio", - "cardid": "hw:radio", - "params": { - "rate": 48000 + { + "uid": "MOST_MIC_EP822CH", + "cardid": "hw:ep822ch", + "params": { + "rate": 48000 + }, + "source": { + "channels": [ + { + "uid": "mic-right", + "port": 0 + }, + { + "uid": "mic-left", + "port": 1 + } + ] + } }, - "source": { - "channels": [ - { - "uid": "radio-right", - "port": 0 - }, - { - "uid": "radio-left", - "port": 1 - } - ] + { + "uid": "radio", + "cardid": "hw:radio", + "params": { + "rate": 48000 + }, + "source": { + "channels": [ + { + "uid": "radio-right", + "port": 0 + }, + { + "uid": "radio-left", + "port": 1 + } + ] + } } - } ], "zones": [ { diff --git a/devices/hal-4a-unicens-coax.json b/devices/hal-4a-unicens-coax.json index 01918d9..454a018 100644 --- a/devices/hal-4a-unicens-coax.json +++ b/devices/hal-4a-unicens-coax.json @@ -133,25 +133,25 @@ } }, "captures": [ - { - "uid": "MOST_MIC_EP822CH", - "cardid": "hw:ep822ch", - "params": { - "rate": 48000 - }, - "source": { - "channels": [ - { - "uid": "mic-right", - "port": 0 - }, - { - "uid": "mic-left", - "port": 1 - } - ] + { + "uid": "MOST_MIC_EP822CH", + "cardid": "hw:ep822ch", + "params": { + "rate": 48000 + }, + "source": { + "channels": [ + { + "uid": "mic-right", + "port": 0 + }, + { + "uid": "mic-left", + "port": 1 + } + ] + } } - } ], "zones": [ { diff --git a/devices/hal-4a-unicens-utp.json b/devices/hal-4a-unicens-utp.json index cfc154f..477ea9d 100644 --- a/devices/hal-4a-unicens-utp.json +++ b/devices/hal-4a-unicens-utp.json @@ -133,25 +133,25 @@ } }, "captures": [ - { - "uid": "MOST_MIC_EP822CH", - "cardid": "hw:ep822ch", - "params": { - "rate": 48000 - }, - "source": { - "channels": [ - { - "uid": "mic-right", - "port": 0 - }, - { - "uid": "mic-left", - "port": 1 - } - ] + { + "uid": "MOST_MIC_EP822CH", + "cardid": "hw:ep822ch", + "params": { + "rate": 48000 + }, + "source": { + "channels": [ + { + "uid": "mic-right", + "port": 0 + }, + { + "uid": "mic-left", + "port": 1 + } + ] + } } - } ], "zones": [ { diff --git a/reference-boards/hal-4a-intel-minnow.json b/reference-boards/hal-4a-intel-minnow.json index 4305aef..0b9e72f 100644 --- a/reference-boards/hal-4a-intel-minnow.json +++ b/reference-boards/hal-4a-intel-minnow.json @@ -162,7 +162,7 @@ "volume": 1.0 } ] - }, + } ], "streams": [ { diff --git a/reference-boards/hal-4a-intel-qemu.json b/reference-boards/hal-4a-intel-qemu.json index 05edaac..3e819b7 100644 --- a/reference-boards/hal-4a-intel-qemu.json +++ b/reference-boards/hal-4a-intel-qemu.json @@ -104,15 +104,6 @@ "rate": 48000 }, "sink": { - "controls": { - "volume": { - "name": "Master Playback Volume", - "value": 80 - }, - "mute": { - "name": "Master Playback Switch" - } - }, "channels": [ { "uid": "front-right", @@ -132,14 +123,6 @@ "rate": 48000 }, "source": { - "controls": { - "volume": { - "name": "Capture Volume" - }, - "mute": { - "name": "Capture Switch" - } - }, "channels": [ { "uid": "mic-right", diff --git a/reference-boards/hal-4a-rcar-m3.json b/reference-boards/hal-4a-rcar-m3.json index 5438376..9a243aa 100644 --- a/reference-boards/hal-4a-rcar-m3.json +++ b/reference-boards/hal-4a-rcar-m3.json @@ -10,7 +10,7 @@ "date": "2018-06-13" }, "resources": [ - { + { "uid": "hal-bluealsa", "info": "Bluealsa hal plugin", "params": { @@ -112,15 +112,6 @@ "format": "S24_LE" }, "sink": { - "controls": { - "volume": { - "name": "DVC Out Playback Volume", - "value": 80 - }, - "mute": { - "name": "SRC Out Rate Switch" - } - }, "channels": [ { "uid": "front-right", @@ -140,14 +131,6 @@ "rate": 48000 }, "source": { - "controls": { - "volume": { - "name": "DVC In Capture Volume" - }, - "mute": { - "name": "DVC In Mute Switch" - } - }, "channels": [ { "uid": "mic-right", diff --git a/reference-boards/hal-4a-rcar-m3kf.json b/reference-boards/hal-4a-rcar-m3kf.json index 2e7b341..8581d2b 100644 --- a/reference-boards/hal-4a-rcar-m3kf.json +++ b/reference-boards/hal-4a-rcar-m3kf.json @@ -10,7 +10,7 @@ "date": "2018-06-15" }, "resources": [ - { + { "uid": "hal-bluealsa", "info": "Bluealsa hal plugin", "params": { @@ -112,15 +112,6 @@ "format": "S24_LE" }, "sink": { - "controls": { - "volume": { - "name": "DVC Out Playback Volume", - "value": 80 - }, - "mute": { - "name": "SRC Out Rate Switch" - } - }, "channels": [ { "uid": "front-right", @@ -134,53 +125,45 @@ } }, "captures": [ - { - "uid": "RCAR-M3", - "path": "/dev/snd/by-path/platform-sound@1", - "params": { - "rate": 48000 - }, - "source": { - "controls": { - "volume": { - "name": "DVC In Capture Volume" - }, - "mute": { - "name": "DVC In Mute Switch" - } + { + "uid": "RCAR-M3", + "path": "/dev/snd/by-path/platform-sound@1", + "params": { + "rate": 48000 }, - "channels": [ - { - "uid": "mic-right", - "port": 0 - }, - { - "uid": "mic-left", - "port": 1 - } - ] - } - } , - { - "uid": "radio", - "path": "/dev/snd/by-path/platform-sound@2", - "params": { - "rate" : 48000, - "format": "S16_LE" + "source": { + "channels": [ + { + "uid": "mic-right", + "port": 0 + }, + { + "uid": "mic-left", + "port": 1 + } + ] + } }, - "source": { - "channels": [ - { - "uid": "radio-right", - "port": 0 - }, - { - "uid": "radio-left", - "port": 1 - } - ] + { + "uid": "radio", + "path": "/dev/snd/by-path/platform-sound@2", + "params": { + "rate" : 48000, + "format": "S16_LE" + }, + "source": { + "channels": [ + { + "uid": "radio-right", + "port": 0 + }, + { + "uid": "radio-left", + "port": 1 + } + ] + } } - } ], "zones": [ { -- cgit 1.2.3-korg