diff options
| author |   Thierry Bultel <thierry.bultel@iot.bzh> | 2019-05-13 14:30:01 +0200 |
|---|---|---|
| committer | Thierry Bultel <thierry.bultel@iot.bzh> | 2019-05-14 15:14:20 +0200 |
| commit | b5206132b6fb5b060acacaf2aee45841a7792a8c (patch) | |
| tree | ef69b33d17629f6eddd249eadc7f2c446557620a /plugins/alsa/alsa-api-zones.c | |
| parent | 6c627f8650b88b19704dd4e513fe7fff701c00c1 (diff) | |
| parent | 43df82896d8535f99233b4d3ab35a744b07871e0 (diff) | |
Merge branch 'sandbox/tbultel/spec-2387' into guppyguppy_7.0.4guppy_7.0.3guppy_7.0.2guppy/7.0.4guppy/7.0.3guppy/7.0.27.0.47.0.37.0.2guppy
Bug AGL: SPEC-2387
This brings the following commits from master:
* 43df828 loops/avirt: forget saved loops after creation
* 622096c plug route: added a calculation for the number of physical c..
* c950295 streams: improved log output
* 7520fbf core-pcm: fixed channels setting issues
* 293fe69 core pcm: use the same model for writing and reading audio
* e355716 pcm plugs: rework the alsa config cleanup
* eb45566 alsa-api-pcm: added an 'optional' parameter
* 93bf6e6 alsa-transaction: simplify the cleanup
* bb70b48 alsa-api-pcm: added support of quirks
* 93ca785 alsa-utils-dump: added missing ending null char
Change-Id: I8ccc641b1f6827873e479185c0098d732d1b2b0a
Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
Diffstat (limited to 'plugins/alsa/alsa-api-zones.c')
| -rw-r--r-- | plugins/alsa/alsa-api-zones.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/plugins/alsa/alsa-api-zones.c b/plugins/alsa/alsa-api-zones.c index bf3bece..83f6e3a 100644 --- a/plugins/alsa/alsa-api-zones.c +++ b/plugins/alsa/alsa-api-zones.c @@ -81,6 +81,7 @@ fail: return NULL; } + STATIC AlsaSndZoneT *AttachOneZone(SoftMixerT *mixer, const char *uid, json_object *zoneJ) { AFB_ApiDebug(mixer->api, "%s uid %s", __func__, uid); @@ -199,13 +200,6 @@ static void zoneDestroy(SoftMixerT* mixer, void * arg) { AFB_ApiDebug(mixer->api, "%s... %s (%d sinks, %d sources)", __func__, zone->uid, zone->nbSinks, zone->nbSources); - if (zone->routeConfig) { - AFB_ApiDebug(mixer->api, "%s... %s delete route config", __func__, zone->uid); - snd_config_delete(zone->routeConfig); - snd_config_update(); - zone->routeConfig = NULL; - } - AlsaPcmChannelT * channel, *tmp; cds_list_for_each_entry_safe(channel, tmp, &zone->sinks.list, list) { @@ -241,6 +235,7 @@ PUBLIC AlsaSndZoneT * zoneCreate(SoftMixerT* mixer, const char * uid, json_objec } zone->isPcmPlug = routeConfig->isPcmPlug; + zone->quirks = routeConfig->quirks; fail: return zone; |