summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Jahnke <tobias.jahnke@microchip.com>2018-11-20 14:46:45 +0100
committerTobias Jahnke <tobias.jahnke@microchip.com>2018-12-18 13:01:13 +0100
commit3b4582fd7bbac25c1b8577d76b538e4e3fe8978c (patch)
treee81aa555beb26ea043fc11c94cabd30df7337397
parent8dc6241c47e500a51afb3db1c77ac4c234f11b17 (diff)
hal-unicens: removed unused sections, updated json
Bug-AGL: SPEC-1505 Signed-off-by: Tobias Jahnke <tobias.jahnke@microchip.com>
-rw-r--r--cfg/hal-4a-unicens-coax.json10
-rw-r--r--cfg/hal-4a-unicens-utp.json10
-rw-r--r--plugin/most_unicens.c6
3 files changed, 13 insertions, 13 deletions
diff --git a/cfg/hal-4a-unicens-coax.json b/cfg/hal-4a-unicens-coax.json
index b199123..0985ed3 100644
--- a/cfg/hal-4a-unicens-coax.json
+++ b/cfg/hal-4a-unicens-coax.json
@@ -99,7 +99,7 @@
],
"playbacks" : {
"uid": "UNICENS",
- "path": "/dev/snd/by-id/usb-Microchip-SMSC_OS81118_0000-0000004C-02",
+ "cardid": "hw:ep016ch",
"params": {
"rate": 48000,
"format": "S16_LE"
@@ -208,7 +208,7 @@
"uid": "multimedia",
"verb": "multimedia",
"zone": "full-stereo",
- "volume": 60,
+ "volume": 70,
"mute": false,
"params": {
"rate": 48000,
@@ -230,7 +230,7 @@
"uid": "emergency",
"verb": "emergency",
"zone": "front-seats",
- "volume": 60,
+ "volume": 70,
"mute": false,
"params": {
"rate": 48000,
@@ -240,9 +240,9 @@
{
"uid": "legacy",
"verb": "legacy",
- "zone": "back-seats",
+ "zone": "full-stereo",
"source": "loop-legacy",
- "volume": 50,
+ "volume": 70,
"mute": false,
"params": {
"rate": 48000,
diff --git a/cfg/hal-4a-unicens-utp.json b/cfg/hal-4a-unicens-utp.json
index ff7dbbc..9ef9041 100644
--- a/cfg/hal-4a-unicens-utp.json
+++ b/cfg/hal-4a-unicens-utp.json
@@ -99,7 +99,7 @@
],
"playbacks" : {
"uid": "UNICENS",
- "path": "/dev/snd/by-id/usb-Microchip-SMSC_OS81210_0200-0000000C-02",
+ "cardid": "hw:ep016ch",
"params": {
"rate": 48000,
"format": "S16_LE"
@@ -208,7 +208,7 @@
"uid": "multimedia",
"verb": "multimedia",
"zone": "full-stereo",
- "volume": 60,
+ "volume": 70,
"mute": false,
"params": {
"rate": 48000,
@@ -230,7 +230,7 @@
"uid": "emergency",
"verb": "emergency",
"zone": "front-seats",
- "volume": 60,
+ "volume": 70,
"mute": false,
"params": {
"rate": 48000,
@@ -241,8 +241,8 @@
"uid": "legacy",
"verb": "legacy",
"zone": "back-seats",
- "source": "loop-legacy",
- "volume": 50,
+ "source": "full-stereo",
+ "volume": 70,
"mute": false,
"params": {
"rate": 48000,
diff --git a/plugin/most_unicens.c b/plugin/most_unicens.c
index e34ef63..610a9f9 100644
--- a/plugin/most_unicens.c
+++ b/plugin/most_unicens.c
@@ -88,6 +88,7 @@ Abort_Exit:
return err;
}
+#if 0
CTLP_CAPI(MasterSwitch, source, argsJ, queryJ)
{
json_bool master_switch;
@@ -134,6 +135,7 @@ Abort_Exit:
return err;
}
+#endif
CTLP_CAPI(PCMVol, source, argsJ, queryJ)
{
@@ -204,13 +206,11 @@ CTLP_CAPI(Init, source, argsJ, queryJ)
// avoid muted volume to be persistent after boot.
//wrap_volume_master(source->api, 80);
wrap_volume_pcm(source->api, pcm_volume, PCM_MAX_CHANNELS);
-
- AFB_ApiNotice(source->api, "4A-HAL-UNICENS: Initializing plugin done..");
initialized = 1;
Abort_Exit:
pthread_mutex_unlock(&mutex);
-
+ AFB_ApiNotice(source->api, "4A-HAL-UNICENS: Initializing plugin done, err=%d", err);
return err;
}