summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2019-04-09 11:49:59 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2019-04-09 11:49:59 +0000
commit1a75612274f883aed09d198575582abdc0c9fe0f (patch)
tree9e94b8c4ac76eee6c27d31b6122f778e7d818f85
parent3786d73cd834672592089882de40d4fe3fb0510f (diff)
parent7687aea64ee6505818a563b6aa42303ab9be2e78 (diff)
Merge "Updates for latest libavirt, adds avirt cleanup"
-rw-r--r--plugins/alsa/alsa-api-loop.c11
-rw-r--r--plugins/alsa/alsa-transaction.c21
-rw-r--r--plugins/alsa/alsa-transaction.h1
3 files changed, 30 insertions, 3 deletions
diff --git a/plugins/alsa/alsa-api-loop.c b/plugins/alsa/alsa-api-loop.c
index 7949c63..a4595dc 100644
--- a/plugins/alsa/alsa-api-loop.c
+++ b/plugins/alsa/alsa-api-loop.c
@@ -159,7 +159,7 @@ STATIC AlsaLoopSubdevT *ProcessOneAvirtSubdev(SoftMixerT *mixer, AlsaSndLoopT *l
}
error = snd_avirt_stream_new(uid, zone->ccount,
- SND_PCM_STREAM_PLAYBACK, "ap_loopback");
+ SND_PCM_STREAM_PLAYBACK, "ap_loopback", false);
if (error < 0) {
AFB_API_ERROR(mixer->api,
"%s: mixer=%s stream=%s could not create AVIRT stream [errno=%d]",
@@ -364,7 +364,7 @@ STATIC AlsaSndLoopT *AttachOneLoop(SoftMixerT *mixer, const char *uid, json_obje
goto fail_snd_card;
}
- snd_avirt_card_seal();
+ snd_avirt_card_configure();
// try to open sound card control interface
loop->sndcard->ctl = AlsaByPathOpenCtl(mixer, loop->uid, loop->sndcard);
@@ -414,6 +414,10 @@ static void loopDestroy(SoftMixerT * mixer, void* arg) {
mixer->nbLoops--;
cds_list_del(&loop->list);
+
+ if (loop->avirt)
+ snd_avirt_card_unconfigure();
+
free(loop);
AFB_API_DEBUG(mixer->api, "DONE !");
@@ -428,7 +432,8 @@ static AlsaSndLoopT * loopCreate(SoftMixerT *mixer, const char *uid, json_object
mixer->nbLoops++;
cds_list_add(&newLoop->list, &mixer->loops.list);
- AlsaMixerTransactionObjectAdd(mixer->transaction, newLoop, loopDestroy);
+ /* We need the loops to be at the end of the list, so that they are destroyed last */
+ AlsaMixerTransactionObjectAddTail(mixer->transaction, newLoop, loopDestroy);
loopsDisplay(mixer);
diff --git a/plugins/alsa/alsa-transaction.c b/plugins/alsa/alsa-transaction.c
index c35ea81..f8affa6 100644
--- a/plugins/alsa/alsa-transaction.c
+++ b/plugins/alsa/alsa-transaction.c
@@ -71,6 +71,27 @@ fail:
}
+bool AlsaMixerTransactionObjectAddTail(AlsaMixerTransaction* list, void* object, AlsaTransactionDestructor destructor) {
+ bool ret = false;
+ AlsaMixerTransactionDataItem * newItem = NULL;
+ if (!list)
+ goto fail;
+
+ newItem = (AlsaMixerTransactionDataItem *) malloc(sizeof(AlsaMixerTransactionDataItem));
+ if (newItem == NULL)
+ goto fail;
+
+ CDS_INIT_LIST_HEAD(&newItem->list_entry);
+ newItem->object = object;
+ newItem->destructor = destructor;
+ cds_list_add_tail(&newItem->list_entry, &list->item_list);
+
+ ret = true;
+fail:
+ return ret;
+
+}
+
static void AlsaMixerTransactionDoCleanup(AlsaMixerTransaction* transaction) {
AlsaMixerTransactionDataItem * item, *sav;
diff --git a/plugins/alsa/alsa-transaction.h b/plugins/alsa/alsa-transaction.h
index 6bb5d92..048447d 100644
--- a/plugins/alsa/alsa-transaction.h
+++ b/plugins/alsa/alsa-transaction.h
@@ -30,6 +30,7 @@ extern void AlsaMixerTransactionDelete(AlsaMixerTransaction * transaction);
extern void AlsaMixerTransactionDataListDestroy(AlsaMixerTransaction*);
extern bool AlsaMixerTransactionObjectAdd(AlsaMixerTransaction*, void * object, AlsaTransactionDestructor destructor);
+extern bool AlsaMixerTransactionObjectAddTail(AlsaMixerTransaction* list, void* object, AlsaTransactionDestructor destructor);
extern void AlsaMixerTransactionObjectDelete(AlsaMixerTransaction* list, void * object, bool destructor);