summaryrefslogtreecommitdiffstats
path: root/plugins/alsa/alsa-softmixer.h
diff options
context:
space:
mode:
authorMark Farrugia <mark.farrugia@fiberdyne.com.au>2019-01-29 11:35:44 +1100
committerMark Farrugia <mark.farrugia@fiberdyne.com.au>2019-02-10 23:56:47 +0000
commitb6aec989e0620322250b033bf339db7868d117d3 (patch)
treed47fb0d5b6647100be034ca4ca0a91be7efe710b /plugins/alsa/alsa-softmixer.h
parentca4b8d63bb92f0a72c31107605bca0ab78855ce0 (diff)
Add support for AVIRT
Leverage the new AVIRT driver for a more secure, more dynamically configurable loopback sound driver. To use, replace the file smixer-4a-default.json with smixer-4a-avirt.json, at /usr/libexec/agl/smixer/etc The existing snd-aloop configuration is not broken by this change. The submodule libavirt is temporary, and will be transformed into a library. Change-Id: I827636656c109a7393ad77997e05069a2462ea46 Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
Diffstat (limited to 'plugins/alsa/alsa-softmixer.h')
-rw-r--r--plugins/alsa/alsa-softmixer.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/alsa/alsa-softmixer.h b/plugins/alsa/alsa-softmixer.h
index 346964a..2e7874d 100644
--- a/plugins/alsa/alsa-softmixer.h
+++ b/plugins/alsa/alsa-softmixer.h
@@ -242,7 +242,7 @@ typedef struct {
typedef struct {
char * uid;
- int index;
+ int index; // AVIRT: parent PCM index (Since subdev idx is always 0)
int numid;
struct cds_list_head list;
} AlsaLoopSubdevT;
@@ -251,10 +251,11 @@ typedef struct {
struct SoftMixerT_;
typedef struct AlsaSndLoopT {
+ bool avirt; // AVIRT: Is this loop AVIRT?
const char *uid;
struct SoftMixerT_ * mixer; /* owner */
- int playback;
- int capture;
+ int playback; // AVIRT: UNUSED
+ int capture; // AVIRT: UNUSED
AlsaSndCtlT *sndcard;
int nbSubdevs;
AlsaLoopSubdevT subdevs;
@@ -368,7 +369,7 @@ PUBLIC AlsaPcmCtlT* AlsaCreateDmix(SoftMixerT *mixer, const char* pcmName, AlsaS
// alsa-api-*
-PUBLIC int ApiLoopAttach(SoftMixerT *mixer, AFB_ReqT request, const char *, json_object * argsJ);
+PUBLIC int ApiLoopAttach(SoftMixerT *mixer, AFB_ReqT request, const char *, json_object * argsJ, json_object *streamsJ);
PUBLIC int ApiSourceAttach(SoftMixerT *mixer, AFB_ReqT request, const char *, json_object * argsJ);
PUBLIC int ApiSinkAttach(SoftMixerT *mixer, AFB_ReqT request, const char *, json_object * argsJ);
PUBLIC int ApiStreamAttach(SoftMixerT *mixer, AFB_ReqT request, const char * uid, const char *prefix, json_object * argsJ);