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 --------- 6 files changed, 6 insertions(+), 101 deletions(-) (limited to 'community-boards') 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", -- cgit 1.2.3-korg