diff options
| -rw-r--r-- | README.md | 10 | ||||
| -rw-r--r-- | conf.d/project/lua.d/softmixer-double.lua | 223 | ||||
| -rw-r--r-- | conf.d/project/lua.d/softmixer-simple.lua | 6 | ||||
| -rw-r--r-- | nbproject/configurations.xml | 26 | ||||
| -rw-r--r-- | plugins/alsa/alsa-api-sndstreams.c | 9 | ||||
| -rw-r--r-- | plugins/alsa/alsa-core-ctl.c | 58 | ||||
| -rw-r--r-- | plugins/alsa/alsa-plug-vol.c (renamed from plugins/alsa/alsa-plug-stream.c) | 4 | ||||
| -rw-r--r-- | plugins/alsa/alsa-softmixer.h | 4 |
8 files changed, 95 insertions, 245 deletions
@@ -64,3 +64,13 @@ Current version does not handle audio rate conversion, using gstreamer or equiva speaker-test -D hw:XXX:0:??? -twav -c!! 'cc' is the number of channel and depends on the audio stream zone target. ``` +## Warning + +Alsa try top automatically store current state into /var/lib/alsa/asound.state when developing/testing this may create impossible +situation. In order to clean up your Alsa snd-aloop config, a simple "rmmod" might not be enough in some case you may have to delete +/var/lib/alsa/asound.state before applying "modprobe". + +In case of doubt check with folling command that you start from a clear green field +``` +rmmod snd-aloop && modprobe --first-time snd-aloop && amixer -D hw:Loopback controls | grep vol +```
\ No newline at end of file diff --git a/conf.d/project/lua.d/softmixer-double.lua b/conf.d/project/lua.d/softmixer-double.lua deleted file mode 100644 index 8f7a20a..0000000 --- a/conf.d/project/lua.d/softmixer-double.lua +++ /dev/null @@ -1,223 +0,0 @@ ---[[ - Copyright (C) 2016 "IoT.bzh" - Author Fulup Ar Foll <fulup@iot.bzh> - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - NOTE: strict mode: every global variables should be prefixed by '_' ---]] - --- Static variables should be prefixed with _ -_EventHandle={} - --- Call when AlsaCore return HAL active list -function _AlsaPingCB_ (source, result, context) - - AFB:notice (source, "--InLua-- PingCB: result='%s'", Dump_Table(result)) - -end - - --- Display receive arguments and echo them to caller -function _mixer_config_ (source, args) - do - local error - local response - - - -- ======================= 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= smix:snd_loops (source, snd_aloop) - if (error ~= 0) then - AFB:error (source, "--InLua-- smix:snd_loops fail to attach sndcards=%s", Dump_Table(aloop)) - goto OnErrorExit - else - AFB:notice (source, "--InLua-- smix:snd_loops done response=%s\n", Dump_Table(response)) - end - - - -- ============================= Sound Cards =================== - - local snd_params = { - ["rate"] = 48000, - ["channels"]= 2, - } - - 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_1 = { - ["uid"]= "Jabra-Solemate", - ["devpath"]= "/dev/snd/by-id/usb-0b0e_Jabra_SOLEMATE_v1.34.0-00", - ["params"] = snd_params, - ["sink"] = { - [0]= {["uid"]= "front-right", ["port"]= 0}, - [1]= {["uid"]= "front-left", ["port"]= 1}, - } - } - - local sndcard_2 = { - ["uid"]= "Jabra-410", - ["params"] = snd_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 - local sndcards= { - sndcard_0, - sndcard_2, - } - - error,response= smix:snd_cards (source, sndcards) - if (error ~= 0) then - AFB:error (source, "--InLua-- smix:snd_cards fail to attach sndcards=%s", Dump_Table(sndcards)) - goto OnErrorExit - else - AFB:notice (source, "--InLua-- smix:snd_cards done response=%s\n", Dump_Table(response)) - end - - -- ============================= Zones =================== - - local zone_front= { - ["uid"] = "front-seats", - ["type"] = "playback", - ["mapping"] = { - {["target"]="front-right",["channel"]=0}, - {["target"]="front-left" ,["channel"]=1}, - } - } - - 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= smix:snd_zones (source, multi_zones) - if (error ~= 0) then - AFB:error (source, "--InLua-- smix:snd_zones fail to attach sndcards=%s", Dump_Table(multi_zones)) - goto OnErrorExit - else - AFB:notice (source, "--InLua-- smix:snd_zones done response=%s\n", Dump_Table(response)) - end - - -- =================== Audio Stream ============================ - - local stream_music= { - ["uid"] = "multimedia", - ["zone"] = "all-seats", - ["volume"]= 70, - ["params"] = { - ["rate"] = 44100, - ["rate"] = 48000, - ["format"]= "S16_LE", - }, - ["mute"] = false, - } - - local stream_navigation= { - ["uid"] = "navigation", - ["zone"] = "front-seats", - ["volume"]= 80, - ["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= smix:snd_streams (source, snd_streams) - if (error ~= 0) then - AFB:error (source, "--InLua-- smix:snd_streams fail to attach sndcards=%s", Dump_Table(aloop)) - goto OnErrorExit - else - AFB:notice (source, "--InLua-- smix:streams_loops done response=%s\n", Dump_Table(response)) - end - - - -- ================== Happy End ============================= - AFB:notice (source, "--InLua-- _mixer_config_ done") - return 0 end - - -- ================= Unhappy End ============================ - ::OnErrorExit:: - AFB:error (source, "--InLua-- snd_attach fail") - return 1 -- unhappy end -- -end - --- Display receive arguments and echo them to caller -function _init_softmixer_ (source, args) - - -- create event to push change audio roles to potential listeners - _EventHandle=AFB:evtmake(source, "control") - - _mixer_config_ (source, args) - -end diff --git a/conf.d/project/lua.d/softmixer-simple.lua b/conf.d/project/lua.d/softmixer-simple.lua index 9f00ce1..e78eacd 100644 --- a/conf.d/project/lua.d/softmixer-simple.lua +++ b/conf.d/project/lua.d/softmixer-simple.lua @@ -71,7 +71,7 @@ function _mixer_config_ (source, args) -- ============================= Sound Cards =================== - local sndcard_0 = { + local snd_yamaha = { ["uid"]= "YAMAHA-APU70", ["devpath"]= "/dev/snd/by-id/usb-YAMAHA_Corporation_YAMAHA_AP-U70_USB_Audio_00-00", ["params"] = snd_params, @@ -81,7 +81,7 @@ function _mixer_config_ (source, args) } } - local sndcard_1 = { + local snd_jabra= { ["uid"]= "Jabra-Solemate", ["devpath"]= "/dev/snd/by-id/usb-0b0e_Jabra_SOLEMATE_v1.34.0-00", ["params"] = snd_params, @@ -93,7 +93,7 @@ function _mixer_config_ (source, args) -- group sound card as one multi channels card local sndcards= { - sndcard_1, + snd_yamaha, } error,response= smix:snd_cards (source, sndcards) diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 966c264..96a283e 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -37,7 +37,7 @@ <in>alsa-plug-multi.c</in> <in>alsa-plug-rate.c</in> <in>alsa-plug-route.c</in> - <in>alsa-plug-stream.c</in> + <in>alsa-plug-vol.c</in> <in>alsa-softmixer.c</in> <in>alsa-utils-bypath.c</in> <in>alsa-utils-dump.c</in> @@ -148,6 +148,7 @@ <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>app-afb-helpers-submodule</pElem> + <pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem> <pElem>../../../opt/include</pElem> <pElem>build/app-afb-helpers-submodule</pElem> </incDir> @@ -160,6 +161,7 @@ <cTool flags="1"> <incDir> <pElem>app-afb-helpers-submodule</pElem> + <pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem> <pElem>build/app-afb-helpers-submodule</pElem> </incDir> </cTool> @@ -172,6 +174,8 @@ <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>app-controller-submodule/ctl-lib</pElem> + <pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem> + <pElem>/usr/include/lua5.3</pElem> <pElem>app-afb-helpers-submodule</pElem> <pElem>../../../opt/include</pElem> <pElem>build/app-controller-submodule/ctl-lib</pElem> @@ -186,7 +190,9 @@ <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>app-controller-submodule/ctl-lib</pElem> + <pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem> <pElem>app-afb-helpers-submodule</pElem> + <pElem>/usr/include/lua5.3</pElem> <pElem>../../../opt/include</pElem> <pElem>build/app-controller-submodule/ctl-lib</pElem> </incDir> @@ -200,6 +206,8 @@ <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>app-controller-submodule/ctl-lib</pElem> + <pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem> + <pElem>/usr/include/lua5.3</pElem> <pElem>app-afb-helpers-submodule</pElem> <pElem>../../../opt/include</pElem> <pElem>build/app-controller-submodule/ctl-lib</pElem> @@ -214,6 +222,8 @@ <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>app-controller-submodule/ctl-lib</pElem> + <pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem> + <pElem>/usr/include/lua5.3</pElem> <pElem>app-afb-helpers-submodule</pElem> <pElem>../../../opt/include</pElem> <pElem>build/app-controller-submodule/ctl-lib</pElem> @@ -239,6 +249,8 @@ <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>app-controller-submodule/ctl-lib</pElem> + <pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem> + <pElem>/usr/include/lua5.3</pElem> <pElem>app-afb-helpers-submodule</pElem> <pElem>../../../opt/include</pElem> <pElem>build/app-controller-submodule/ctl-lib</pElem> @@ -253,6 +265,8 @@ <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>app-controller-submodule/ctl-lib</pElem> + <pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem> + <pElem>/usr/include/lua5.3</pElem> <pElem>app-afb-helpers-submodule</pElem> <pElem>../../../opt/include</pElem> <pElem>build/app-controller-submodule/ctl-lib</pElem> @@ -267,6 +281,8 @@ <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>app-controller-submodule/ctl-lib</pElem> + <pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem> + <pElem>/usr/include/lua5.3</pElem> <pElem>app-afb-helpers-submodule</pElem> <pElem>../../../opt/include</pElem> <pElem>build/app-controller-submodule/ctl-lib</pElem> @@ -281,6 +297,8 @@ <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>app-controller-submodule/ctl-lib</pElem> + <pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem> + <pElem>/usr/include/lua5.3</pElem> <pElem>app-afb-helpers-submodule</pElem> <pElem>../../../opt/include</pElem> <pElem>build/app-controller-submodule/ctl-lib</pElem> @@ -292,9 +310,6 @@ <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>app-controller-submodule/ctl-lib</pElem> - <pElem>app-afb-helpers-submodule</pElem> - <pElem>../../../opt/include</pElem> - <pElem>build/app-controller-submodule/ctl-lib</pElem> </incDir> <preprocessorList> <Elem>AFB_BINDING_VERSION=dyn</Elem> @@ -312,6 +327,7 @@ <incDir> <pElem>../../../opt/include/afb</pElem> <pElem>mixer-binding</pElem> + <pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem> <pElem>../../../opt/include/alsa</pElem> <pElem>app-afb-helpers-submodule</pElem> <pElem>app-controller-submodule/ctl-lib</pElem> @@ -429,7 +445,7 @@ </incDir> </cTool> </item> - <item path="plugins/alsa/alsa-plug-stream.c" ex="false" tool="0" flavor2="2"> + <item path="plugins/alsa/alsa-plug-vol.c" ex="false" tool="0" flavor2="2"> <cTool flags="0"> <incDir> <pElem>/usr/include/lua5.3</pElem> diff --git a/plugins/alsa/alsa-api-sndstreams.c b/plugins/alsa/alsa-api-sndstreams.c index d02d47e..e55aeff 100644 --- a/plugins/alsa/alsa-api-sndstreams.c +++ b/plugins/alsa/alsa-api-sndstreams.c @@ -21,6 +21,11 @@ #include "alsa-softmixer.h" #include <string.h> +// Set stream volume control in % +#define VOL_CONTROL_MAX 100 +#define VOL_CONTROL_MIN 0 +#define VOL_CONTROL_STEP 1 + // Fulup need to be cleanup with new controller version extern Lua2cWrapperT Lua2cWrap; @@ -158,14 +163,14 @@ CTLP_LUA2C(snd_streams, source, argsJ, responseJ) { // create stream and delay pcm openning until vol control is created char volName[ALSA_CARDID_MAX_LEN]; snprintf(volName, sizeof (volName), "vol-%s", sndStream[idx].uid); - AlsaPcmInfoT *streamPcm = AlsaCreateStream(source, &sndStream[idx], captureDev, volName, 0); + AlsaPcmInfoT *streamPcm = AlsaCreateStream(source, &sndStream[idx], captureDev, volName, VOL_CONTROL_MAX, 0); if (!streamPcm) { AFB_ApiError(source->api, "L2C:sndstreams:%s(pcm) fail to create stream", sndStream[idx].uid); goto OnErrorExit; } // create volume control before softvol pcm is opened - int volNumid = AlsaCtlCreateControl(source, ctlDev, playbackDev, volName, streamPcm->params.channels, 0, 100, 1, sndStream[idx].volume); + int volNumid = AlsaCtlCreateControl(source, ctlDev, playbackDev, volName, streamPcm->params.channels, VOL_CONTROL_MIN, VOL_CONTROL_MAX, VOL_CONTROL_STEP, sndStream[idx].volume); if (volNumid <= 0) goto OnErrorExit; // **** Fulup (would need some help to get automatic rate converter to work). diff --git a/plugins/alsa/alsa-core-ctl.c b/plugins/alsa/alsa-core-ctl.c index 79bf0c8..9a0b844 100644 --- a/plugins/alsa/alsa-core-ctl.c +++ b/plugins/alsa/alsa-core-ctl.c @@ -89,7 +89,7 @@ PUBLIC snd_ctl_elem_id_t *AlsaCtlGetNumidElemId(CtlSourceT *source, snd_ctl_t* c } if (index == ctlCount) { - AFB_ApiError(source->api, "AlsaCtlGetNumidElemId [%s] fail get numid=%i count", ALSA_CTL_UID(ctlDev, string), numid); + AFB_ApiNotice(source->api, "AlsaCtlGetNumidElemId [%s] fail get numid=%i count", ALSA_CTL_UID(ctlDev, string), numid); goto OnErrorExit; } @@ -139,7 +139,7 @@ PUBLIC snd_ctl_elem_id_t *AlsaCtlGetNameElemId(CtlSourceT *source, snd_ctl_t* ct } if (index == ctlCount) { - AFB_ApiError(source->api, "AlsaCtlGetNameElemId [%s] fail get ctl name=%s", ALSA_CTL_UID(ctlDev, string), ctlName); + AFB_ApiNotice(source->api, "AlsaCtlGetNameElemId [%s] ctl not found name=%s", ALSA_CTL_UID(ctlDev, string), ctlName); goto OnErrorExit; } @@ -347,13 +347,52 @@ PUBLIC int AlsaCtlNumidGetLong(CtlSourceT *source, snd_ctl_t* ctlDev, int numid, snd_ctl_elem_id_t *elemId = AlsaCtlGetNumidElemId(source, ctlDev, numid); if (!elemId) { - AFB_ApiError(source->api, "AlsaCtlGetNumValueI [sndcard=%s] fail to find numid=%d", snd_ctl_name(ctlDev), numid); + AFB_ApiError(source->api, "AlsaCtlNumidGetLong [sndcard=%s] fail to find numid=%d", snd_ctl_name(ctlDev), numid); goto OnErrorExit; } int error = CtlElemIdGetLong(source->api, ctlDev, elemId, value); if (error) { - AFB_ApiError(source->api, "AlsaCtlGetNumValueI [sndcard=%s] fail to get numid=%d value", snd_ctl_name(ctlDev), numid); + AFB_ApiError(source->api, "AlsaCtlNumidGetLong [sndcard=%s] fail to get numid=%d value", snd_ctl_name(ctlDev), numid); + goto OnErrorExit; + } + + return 0; +OnErrorExit: + return -1; +} + +PUBLIC int AlsaCtlNameSetLong(CtlSourceT *source, snd_ctl_t* ctlDev, const char *ctlName, long value) { + + snd_ctl_elem_id_t *elemId = AlsaCtlGetNameElemId(source, ctlDev, ctlName); + if (!elemId) { + AFB_ApiError(source->api, "AlsaCtlNameSetLong [sndcard=%s] fail to find crlName=%s", snd_ctl_name(ctlDev), ctlName); + goto OnErrorExit; + } + + int error = CtlElemIdSetLong(source->api, ctlDev, elemId, value); + if (error) { + AFB_ApiError(source->api, "AlsaCtlNameSetLong [sndcard=%s] fail to set crlName=%s value=%ld", snd_ctl_name(ctlDev), ctlName, value); + goto OnErrorExit; + } + + return 0; +OnErrorExit: + return -1; +} + + +PUBLIC int AlsaCtlNameGetLong(CtlSourceT *source, snd_ctl_t* ctlDev, const char *ctlName, long* value) { + + snd_ctl_elem_id_t *elemId = AlsaCtlGetNameElemId(source, ctlDev, ctlName); + if (!elemId) { + AFB_ApiError(source->api, "AlsaCtlNameGetLong [sndcard=%s] fail to find crlName=%s", snd_ctl_name(ctlDev), ctlName); + goto OnErrorExit; + } + + int error = CtlElemIdGetLong(source->api, ctlDev, elemId, value); + if (error) { + AFB_ApiError(source->api, "AlsaCtlNameGetLong [sndcard=%s] fail to get crlName=%s value", snd_ctl_name(ctlDev), ctlName); goto OnErrorExit; } @@ -372,9 +411,9 @@ STATIC int AlsaCtlMakeControl(CtlSourceT *source, snd_ctl_t* ctlDev, AlsaPcmInfo snd_ctl_elem_info_set_interface(elemInfo, SND_CTL_ELEM_IFACE_MIXER); snd_ctl_elem_info(ctlDev, elemInfo); - // softvol plugin is bugged and can only map volume to sndcard device+subdev=0 - // snd_ctl_elem_info_set_device(elemInfo, subdev->device); - // snd_ctl_elem_info_set_subdevice(elemInfo, subdev->subdev); + // map volume to sndcard device+subdev=0 + snd_ctl_elem_info_set_device(elemInfo, subdev->device); + snd_ctl_elem_info_set_subdevice(elemInfo, subdev->subdev); snd_ctl_elem_info_set_device(elemInfo, 0); snd_ctl_elem_info_set_subdevice(elemInfo, 0); @@ -426,10 +465,11 @@ PUBLIC int AlsaCtlCreateControl(CtlSourceT *source, snd_ctl_t* ctlDev, AlsaPcmIn int error = CtlElemIdSetLong(source->api, ctlDev, elemId, value); if (error) { - AFB_ApiError(source->api, "AlsaCtlCreateControl [sndcard=%s] fail to set ctlName=%s Numid=%d", snd_ctl_name(ctlDev), ctlName, numid); + AFB_ApiError(source->api, "AlsaCtlCreateControl [sndcard=%s] fail to set ctlName=%s Numid=%d", snd_ctl_name(ctlDev), ctlName, numid); goto OnErrorExit; } + AFB_ApiNotice(source->api, "AlsaCtlCreateControl [sndcard=%s] ctl create name=%s numid=%d value=%ld", snd_ctl_name(ctlDev), ctlName, numid, value); return numid; OnErrorExit: return -1; @@ -483,7 +523,7 @@ STATIC int CtlSubscribeEventCB(sd_event_source* src, int fd, uint32_t revents, v if (idx == AudioStreamHandle.count) { char cardName[32]; ALSA_CTL_UID(subscribeHandle->ctlDev, cardName); - AFB_ApiWarning(subscribeHandle->api, "CtlSubscribeEventCB:%s/%d card=%s numid=%d (ignored)", subscribeHandle->info, subscribeHandle->tid, cardName, numid); + AFB_ApiNotice(subscribeHandle->api, "CtlSubscribeEventCB:%s/%d card=%s numid=%d (ignored)", subscribeHandle->info, subscribeHandle->tid, cardName, numid); } OnSuccessExit: diff --git a/plugins/alsa/alsa-plug-stream.c b/plugins/alsa/alsa-plug-vol.c index ffb7010..dc600f9 100644 --- a/plugins/alsa/alsa-plug-stream.c +++ b/plugins/alsa/alsa-plug-vol.c @@ -36,7 +36,7 @@ STATIC AlsaPcmInfoT* SlaveZoneByUid(CtlSourceT *source, AlsaPcmInfoT **pcmZones return NULL; } -PUBLIC AlsaPcmInfoT* AlsaCreateStream(CtlSourceT *source, AlsaSndStreamT *stream, AlsaPcmInfoT *ctlControl, const char* ctlName, int open) { +PUBLIC AlsaPcmInfoT* AlsaCreateStream(CtlSourceT *source, AlsaSndStreamT *stream, AlsaPcmInfoT *ctlControl, const char* ctlName, int max, int open) { snd_config_t *streamConfig, *elemConfig, *slaveConfig, *controlConfig,*pcmConfig; int error = 0; @@ -77,7 +77,7 @@ PUBLIC AlsaPcmInfoT* AlsaCreateStream(CtlSourceT *source, AlsaSndStreamT *stream error += snd_config_set_id (streamConfig, pcmPlug->cardid); error += snd_config_imake_string(&elemConfig, "type", "softvol"); error += snd_config_add(streamConfig, elemConfig); - error += snd_config_imake_integer(&elemConfig, "resolution", 99); // use 0-100% + error += snd_config_imake_integer(&elemConfig, "resolution", max+1); error += snd_config_add(streamConfig, elemConfig); if (error) goto OnErrorExit; diff --git a/plugins/alsa/alsa-softmixer.h b/plugins/alsa/alsa-softmixer.h index c5f6305..e2c9370 100644 --- a/plugins/alsa/alsa-softmixer.h +++ b/plugins/alsa/alsa-softmixer.h @@ -153,6 +153,8 @@ PUBLIC int AlsaCtlSubscribe(CtlSourceT *source, snd_ctl_t *ctlDev); PUBLIC int AlsaCtlRegister(CtlSourceT *source, AlsaPcmInfoT *pcm, int numid); PUBLIC int AlsaCtlNumidGetLong(CtlSourceT *source, snd_ctl_t* ctlDev, int numid, long* value); PUBLIC int AlsaCtlNumidSetLong(CtlSourceT *source, snd_ctl_t* ctlDev, int numid, long value); +PUBLIC int AlsaCtlNameGetLong(CtlSourceT *source, snd_ctl_t* ctlDev, const char *ctlName, long* value); +PUBLIC int AlsaCtlNameSetLong(CtlSourceT *source, snd_ctl_t* ctlDev, const char *ctlName, long value); PUBLIC int AlsaCtlCreateControl(CtlSourceT *source, snd_ctl_t* ctlDev, AlsaPcmInfoT *subdevs, char* name, int ctlCount, int ctlMin, int ctlMax, int ctlStep, long value); PUBLIC snd_ctl_elem_id_t *AlsaCtlGetNameElemId(CtlSourceT *source, snd_ctl_t* ctlDev, const char *ctlName); PUBLIC int CtlElemIdSetLong(AFB_ApiT api, snd_ctl_t *ctlDev, snd_ctl_elem_id_t *elemId, long value); @@ -166,7 +168,7 @@ PUBLIC int AlsaPcmCopy(CtlSourceT *source, AlsaPcmInfoT *pcmIn, AlsaPcmInfoT *pc PUBLIC AlsaPcmInfoT* AlsaCreateDmix(CtlSourceT *source, const char* pcmName, AlsaPcmInfoT *pcmSlave, int open); PUBLIC AlsaPcmInfoT* AlsaCreateMulti(CtlSourceT *source, const char *pcmName, int open); PUBLIC AlsaPcmInfoT* AlsaCreateRoute(CtlSourceT *source, AlsaSndZoneT *zone, int open); -PUBLIC AlsaPcmInfoT* AlsaCreateStream(CtlSourceT *source, AlsaSndStreamT *stream, AlsaPcmInfoT *ctlControl, const char* ctlName, int open); +PUBLIC AlsaPcmInfoT* AlsaCreateStream(CtlSourceT *source, AlsaSndStreamT *stream, AlsaPcmInfoT *ctlControl, const char* ctlName, int max, int open); PUBLIC AlsaPcmInfoT* AlsaCreateRate(CtlSourceT *source, const char* pcmName, AlsaPcmInfoT *pcmSlave, int open); #endif
\ No newline at end of file |