First testable version.

Mixing with volume and mute per audio role works.

1 files changed, 38 insertions, 87 deletions

diff --git a/conf.d/project/lua.d/softmixer-01.lua b/conf.d/project/lua.d/softmixer-02.lua
index ed60192..5ea52de 100644
--- a/conf.d/project/lua.d/softmixer-01.lua
+++ b/conf.d/project/lua.d/softmixer-02.lua
@@ -35,47 +35,55 @@ function _mixer_config_ (source, args)
     local error
     local response
 
-    -- ============================= Sound Cards ===================  
+    -- ==================== Default rate ===========================
 
-    local snd_params = {
+    local audio_defaults = {
         ["rate"]   = 48000,
-        ["channel"]= 2,
     }  
 
-    local sndcard_0 = {
-        ["uid"]= "YAMAHA-APU70",
-        ["devpath"]= "/dev/snd/by-id/usb-YAMAHA_Corporation_YAMAHA_AP-U70_USB_Audio_00-00",
-        ["params"] = params,
-        ["sink"] = {
-            [0]= {["uid"]= "front-right", ["port"]= 0},
-            [1]= {["uid"]= "front-left", ["port"]= 1},
+    -- ======================= Loop PCM ===========================
+
+    local snd_aloop = {
+        ["uid"]     = "Alsa-Loop",
+        ["devpath"] = "/dev/snd/by-path/platform-snd_aloop.0",
+        ["devices"] = {["playback"]=0,["capture"]=1},
+        ["params"]  = audio_defaults,
+        ["subdevs"] = {
+            {["subdev"]= 0, ["numid"]= 51},
+            {["subdev"]= 1, ["numid"]= 57},
+            {["subdev"]= 2, ["numid"]= 63},
+            {["subdev"]= 3, ["numid"]= 69},
+            {["subdev"]= 4, ["numid"]= 75},
+            {["subdev"]= 5, ["numid"]= 81},
+            {["subdev"]= 6, ["numid"]= 87},
+            {["subdev"]= 7, ["numid"]= 93},
         }
     }
 
-    local sndcard_1 = {
-        ["uid"]= "Jabra-Solemate",
-        ["devpath"]= "/dev/snd/by-id/usb-0b0e_Jabra_SOLEMATE_v1.34.0-00",
-        ["params"] = params,
+    error,response= L2C:snd_loops (source, snd_aloop)
+    if (error ~= 0) then 
+        AFB:error (source, "--InLua-- L2C:snd_loops fail to attach sndcards=%s", Dump_Table(aloop))
+        goto OnErrorExit
+    else
+        AFB:notice (source, "--InLua-- L2C:snd_loops done response=%s\n", Dump_Table(response))
+    end
+    
+
+    -- ============================= Sound Cards ===================  
+
+    local sndcard_0 = {
+        ["uid"]= "YAMAHA-APU70",
+        ["devpath"]= "/dev/snd/by-id/usb-YAMAHA_Corporation_YAMAHA_AP-U70_USB_Audio_00-00",
+        ["params"] = snd_params,
         ["sink"] = {
             [0]= {["uid"]= "front-right", ["port"]= 0},
             [1]= {["uid"]= "front-left", ["port"]= 1},
         }
     }
 
-    local sndcard_2 = {
-        ["uid"]= "Jabra-410",
-        ["params"] = params,
-        ["devpath"]= "/dev/snd/by-id/usb-0b0e_Jabra_SPEAK_410_USB_745C4B15BD11x010900-00",
-        ["sink"] = {
-            [0]= {["uid"]= "back-right", ["port"]= 0},
-            [1]= {["uid"]= "back-left",  ["port"]= 1},
-        }
-    }
- 
-    -- group sound card as one multi channels card
+     -- group sound card as one multi channels card
     local sndcards= {
         sndcard_0,
-        sndcard_2,
     }
 
     error,response= L2C:snd_cards (source, sndcards)
@@ -97,30 +105,8 @@ function _mixer_config_ (source, args)
         }
     }
 
-    local zone_back= {
-        ["uid"]  = "back-seats",
-        ["type"] = "playback",
-        ["mapping"] = {
-            {["target"]="back-right",["channel"]=0},
-            {["target"]="back-left" ,["channel"]=1},
-        }
-    }
-
-    local zone_all= {
-        ["uid"]  = "all-seats",
-        ["type"] = "playback",
-        ["mapping"] = {
-            {["target"]="front-right",["channel"]=0},
-            {["target"]="front-left" ,["channel"]=1},
-            {["target"]="back-right" ,["channel"]=0},
-            {["target"]="back-left"  ,["channel"]=1},
-        }
-    }
-
     local multi_zones = {
-        zone_all,
         zone_front,
-        zone_back,
     }
 
     error,response= L2C:snd_zones (source, multi_zones)
@@ -131,60 +117,25 @@ function _mixer_config_ (source, args)
         AFB:notice (source, "--InLua-- L2C:snd_zones done response=%s\n", Dump_Table(response))
     end
 
-    -- ======================= Loop PCM ===========================
-
-    local snd_aloop = {
-        ["uid"]     = "Alsa-Loop",
-        ["devpath"] = "/dev/snd/by-path/platform-snd_aloop.0",
-        ["devices"] = {["playback"]=0,["capture"]=1},
-        ["subdevs"] = {
-            {["subdev"]= 0, ["numid"]= 51},
-            {["subdev"]= 1, ["numid"]= 57},
-            {["subdev"]= 2, ["numid"]= 63},
-            {["subdev"]= 3, ["numid"]= 69},
-            {["subdev"]= 4, ["numid"]= 75},
-            {["subdev"]= 5, ["numid"]= 81},
-            {["subdev"]= 6, ["numid"]= 87},
-            {["subdev"]= 7, ["numid"]= 93},
-        }
-    }
-
-    error,response= L2C:snd_loops (source, snd_aloop)
-    if (error ~= 0) then 
-        AFB:error (source, "--InLua-- L2C:snd_loops fail to attach sndcards=%s", Dump_Table(aloop))
-        goto OnErrorExit
-    else
-        AFB:notice (source, "--InLua-- L2C:snd_loops done response=%s\n", Dump_Table(response))
-    end
-    
     -- =================== Audio Stream ============================
 
     local stream_music= {
         ["uid"]   = "multimedia",
-        ["zone"]  = "all-seats",
+        ["zone"]  = "front-seats",
         ["volume"]= 70,
-        ["rate"]  = 48000,
-        ["mute"]  = false;
+        ["mute"]  = false,
     }
     
     local stream_navigation= {
         ["uid"]   = "navigation",
         ["zone"]  = "front-seats",
         ["volume"]= 80,
-        ["mute"]  = false;
+        ["mute"]  = false,
     }
-    
-    local stream_children= {
-        ["uid"]   = "children",
-        ["zone"]  = "back-seats",
-        ["volume"]= 50,
-        ["mute"]  = false;
-    }
-    
+        
     local snd_streams = {
         stream_music,
         stream_navigation,
-        stream_children,
     }
 
     error,response= L2C:snd_streams (source, snd_streams)