Autorize direct zone to point on sndcard

2 files changed, 2 insertions, 289 deletions

diff --git a/conf.d/project/etc/fiberdyme_hal_sample.json b/conf.d/project/etc/fiberdyme_hal_sample.json
deleted file mode 100644
index 2614163..0000000
--- a/conf.d/project/etc/fiberdyme_hal_sample.json
+++ /dev/null
@@ -1,287 +0,0 @@
-{
-  "$schema": "ToBeDone",
-  "metadata": {
-    "api": "fd-dsp",
-    "uid": "fiberdyne_dsp",
-    "info": "Fiberdyne DSP HAL for Xtensa HiFi2",
-    "version": "1.0",
-    "require": "alsacore"
-  },
-  "plugins": [
-    {
-      "uid": "fd-dsp-hifi2",
-      "info": "Fiberdyne DSP client library for HiFi2",
-      "basename": "fd-dsp-hifi2",
-      "ldpath": "./fd-dsp-hifi2"
-    }
-  ],
-  "comment": "These are per-stream, could look at alsa byte stream?",
-  "control": [
-    {
-      "uid": "Volume",
-      "alsa": {
-        "name": "PCM Playback Volume",
-        "value": 50
-      }
-    },
-    {
-      "uid": "Mute",
-      "alsa": {
-        "name": "PCM Playback Switch",
-        "value": false
-      }
-    },
-    {
-      "uid": "Bass",
-      "alsa": {
-        "name": "PCM Playback Bass",
-        "value": 50
-      }
-    },
-    {
-      "uid": "Mid",
-      "alsa": {
-        "name": "PCM Playback Mid",
-        "value": 50
-      }
-    },
-    {
-      "uid": "Treble",
-      "alsa": {
-        "name": "PCM Playback Treble",
-        "value": 50
-      }
-    },
-    {
-      "uid": "Balance",
-      "alsa": {
-        "name": "PCM Playback Balance",
-        "value": 50
-      }
-    },
-    {
-      "uid": "Fade",
-      "alsa": {
-        "name": "PCM Playback Fade",
-        "value": 50
-      }
-    }
-  ],
-  "eqpoint": {
-    "action": [
-      {
-        "uid": "eq-add-point",
-        "function": "plugin://fd-dsp-hifi2/eq_add_point"
-      },
-      {
-        "uid": "eq-remove-point",
-        "function": "plugin://fd-dsp-hifi2/eq_remove_point"
-      }
-    ]
-  },
-  "filter": {
-    "plugin": "fd-dsp-hifi2",
-    "action": [
-      {
-        "uid": "filter-hip",
-        "function": "plugin://fd-dsp-hifi2/filter_hip"
-      }
-    ]
-  },
-  "cards": {
-    "uid": "A",
-    "alsa": "xf-dsp-alsa:0,1",
-    "desc": "Xtensa R-Car HiFi2 DSP",
-    "action": {
-      "uid": "init-snd-card",
-      "function": "plugin://fd-dsp-hifi2/init-stereo"
-    },
-    "channels": {
-      "sink": [
-        {
-          "type": "FrontLeftFullRange",
-          "port": 0
-        },
-        {
-          "type": "FrontRightFullRange",
-          "port": 1
-        },
-        {
-          "type": "RearLeftFullRange",
-          "port": 2
-        },
-        {
-          "type": "FrontRightFullRange",
-          "port": 3
-        },
-        {
-          "type": "Center",
-          "port": 4
-        },
-        {
-          "type": "LFE",
-          "port": 5
-        }
-      ],
-      "source": [
-        {
-          "uid": "FrontRightMic",
-          "type": "Directional",
-          "port": 0
-        }
-      ]
-    }
-  },
-  "info": "This is totally an abstraction",
-  "zone": [
-    {
-      "uid": "FrontSeat",
-      "type": "sink",
-      "mapping": [
-        [
-          "FrontRightMain",
-          "FrontRightHigh"
-        ],
-        [
-          "FrontLeftMain",
-          "FrontLeftHigh"
-        ]
-      ]
-    },
-    {
-      "uid": "RearSeat",
-      "type": "sink",
-      "mapping": [
-        [
-          "RearRightMain",
-          "RearRightHigh"
-        ],
-        [
-          "RearLeftMain",
-          "RearLeftHigh"
-        ]
-      ]
-    },
-    {
-      "uid": "DriverMic",
-      "type": "source",
-      "mapping": [
-        [
-          "FrontRightMic"
-        ]
-      ]
-    },
-    {
-      "uid": "FullMicSetup",
-      "type":"source",
-      "mapping":
-      [
-        [ "FrontLeftMic"],
-        [ "FrontRightMic"],
-        [ "RearLeftMic"],
-        [ "RearLeftMic"]
-      ]
-    }
-    {
-      "uid": "FiveOne",
-      "type": "sink",
-      "mapping": [
-        [
-          "FrontRightMain",
-          "FrontRightHigh"
-        ],
-        [
-          "FrontLeftMain",
-          "FrontLeftHigh"
-        ],
-        [
-          "RearRightMain",
-          "RearRightHigh"
-        ],
-        [
-          "RearLeftMain",
-          "RearLeftHigh"
-        ],
-        [
-          "Center"
-        ],
-        [
-          "LFE"
-        ]
-      ]
-    },
-    {
-      "uid": "StereoFour",
-      "type": "sink",
-      "mapping": [
-        [
-          "FrontRightMain",
-          "FrontRightHigh",
-          "RearRightMain",
-          "RearRightHigh"
-        ],
-        [
-          "FrontLeftMain",
-          "FrontLeftHigh",
-          "RearLeftMain",
-          "RearLeftHigh"
-        ]
-      ]
-    }
-  ],
-  "streams": [
-    {
-      "name": "speech-engine",
-      "profile": "profile-speech",
-      "source": {
-        "zone":"DriverMic",
-        "defaultconfig":{
-          "mute": true
-        }
-      },
-      "sink": {
-        "zone": "FrontSeat",
-        "defaultconfig": {
-          "volume": 50,
-          "mute": false,
-          "bass": 50,
-          "mid": 50,
-          "treble": 50,
-          "balance": 50,
-          "fade": 50
-        }
-      }
-    },
-    {
-      "name": "phone",
-      "profile": "test",
-      "source": {
-        "channels": 1,
-        "zone": "DriverMic",
-        "defaultconfig":{
-          "volume":"25"
-        }
-      },
-      "sink": {
-        "channels": 2,
-        "zone": "FrontSeat"
-      }
-    },
-    {
-      "name": "stereo",
-      "profile": "profile-dynamic",
-      "sink": {
-        "channels": 2,
-        "zone": "StereoFour"
-      }
-    },
-    {
-      "name": "5_1",
-      "profile": "profile-dynamic",
-      "sink": {
-        "channels": 6,
-        "zone": "FiveOne"
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/conf.d/project/etc/smixer-test-config.json b/conf.d/project/etc/smixer-test-config.json
index 42f9e65..8643175 100644
--- a/conf.d/project/etc/smixer-test-config.json
+++ b/conf.d/project/etc/smixer-test-config.json
@@ -11,7 +11,7 @@
             "uid": "softmixer",
             "info": "Map alsa-loop subdevices to 4A HAL streams",
             "spath": "./package/lib/plugins:./package/var:./lib/plugins:./var",
-            "libs": ["alsa-softmixer.ctlso", "smixer-test-usb_ch8.lua"],
+            "libs": ["alsa-softmixer.ctlso", "smixer-test-usb_8ch.lua"]
         }
     ],
     "onload": [
@@ -26,7 +26,7 @@
                 "max_source": 8,
                 "max_zone": 8,
                 "max_stream": 8,
-                "max_ramp": 4,
+                "max_ramp": 4
             }
         },
         {