diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2019-01-23 16:46:45 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2019-01-24 11:45:09 +0100 |
| commit | d5cc09d1ef5c58bb8d34e3a47c391a10d8b48181 (patch) | |
| tree | 36b65c43fb60ae0ac22b09c832677be2f5fada1e /plugins/alsa/alsa-plug-dmix.c | |
| parent | 17ad00443eecdb2ed7b92da01c7be6f316e04b64 (diff) | |
Git submodule migration to separated libraries
- Replace controller binder functions definition with the binder ones.
and remove the last used submodules to use the separated libraries.
- Add liburcu as a project dependency in addition to the others ones.
Bug-AGL: SPEC-2139
Change-Id: If46eed24018e28e58d1e62397f4355d2aa46a58e
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'plugins/alsa/alsa-plug-dmix.c')
| -rw-r--r-- | plugins/alsa/alsa-plug-dmix.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/alsa/alsa-plug-dmix.c b/plugins/alsa/alsa-plug-dmix.c index 9aaf866..8dd9507 100644 --- a/plugins/alsa/alsa-plug-dmix.c +++ b/plugins/alsa/alsa-plug-dmix.c @@ -41,7 +41,7 @@ PUBLIC AlsaPcmCtlT* AlsaCreateDmix(SoftMixerT *mixer, const char* pcmName, AlsaS char * fullPcmName = NULL; int error=0; - AFB_ApiDebug(mixer->api, "%s: %s, slave %s, cardid %s (dev %d, subdev %d)", + AFB_API_DEBUG(mixer->api, "%s: %s, slave %s, cardid %s (dev %d, subdev %d)", __func__, pcmName, pcmSlave->uid, @@ -107,7 +107,7 @@ PUBLIC AlsaPcmCtlT* AlsaCreateDmix(SoftMixerT *mixer, const char* pcmName, AlsaS if (open) error = _snd_pcm_dmix_open(&pcmPlug->handle, pcmPlug->cid.cardid, snd_config, dmixConfig, SND_PCM_STREAM_PLAYBACK , SND_PCM_NONBLOCK); if (error) { - AFB_ApiError(mixer->api, + AFB_API_ERROR(mixer->api, "%s: fail to create Dmix=%s Slave=%s Error=%s", __func__, sndSlave->cid.cardid, sndSlave->cid.cardid, snd_strerror(error)); goto OnErrorExit; @@ -117,13 +117,13 @@ PUBLIC AlsaPcmCtlT* AlsaCreateDmix(SoftMixerT *mixer, const char* pcmName, AlsaS error += snd_config_search(snd_config, "pcm", &pcmConfig); error += snd_config_add(pcmConfig, dmixConfig); if (error) { - AFB_ApiError(mixer->api, "%s: fail to add configDMIX=%s", __func__, pcmPlug->cid.cardid); + AFB_API_ERROR(mixer->api, "%s: fail to add configDMIX=%s", __func__, pcmPlug->cid.cardid); goto OnErrorExit; } // Debug config & pcm AlsaDumpCtlConfig(mixer, "plug-dmix", dmixConfig, 1); - AFB_ApiNotice(mixer->api, "%s: %s done", __func__, pcmPlug->cid.cardid); + AFB_API_NOTICE(mixer->api, "%s: %s done", __func__, pcmPlug->cid.cardid); return pcmPlug; OnErrorExit: @@ -133,6 +133,6 @@ OnErrorExit: AlsaDumpCtlConfig(mixer, "plug-pcm", pcmConfig, 1); AlsaDumpCtlConfig(mixer, "plug-dmix", dmixConfig, 1); - AFB_ApiNotice(mixer->api, "%s: FAIL", __func__); + AFB_API_NOTICE(mixer->api, "%s: FAIL", __func__); return NULL; } |