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-effect-ramp.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-effect-ramp.c')
| -rw-r--r-- | plugins/alsa/alsa-effect-ramp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/alsa/alsa-effect-ramp.c b/plugins/alsa/alsa-effect-ramp.c index a3bf54b..a24615f 100644 --- a/plugins/alsa/alsa-effect-ramp.c +++ b/plugins/alsa/alsa-effect-ramp.c @@ -75,7 +75,7 @@ STATIC int VolRampTimerCB(sd_event_source* source, uint64_t timer, void* handle) return 0; OnErrorExit: - AFB_ApiWarning(rHandle->mixer->api, "VolRampTimerCB stream=%s numid=%d value=%ld", rHandle->uid, rHandle->numid, rHandle->current); + AFB_API_WARNING(rHandle->mixer->api, "VolRampTimerCB stream=%s numid=%d value=%ld", rHandle->uid, rHandle->numid, rHandle->current); sd_event_source_unref(source); // abandon volRamp return -1; } @@ -93,7 +93,7 @@ PUBLIC int AlsaVolRampApply(SoftMixerT *mixer, AlsaSndCtlT *sndcard, AlsaStreamA , "volume", &volJ ); if (error) { - AFB_ApiError(mixer->api, + AFB_API_ERROR(mixer->api, "%s: mixer=%s stream=%s invalid-json should {uid:ramp, vol:[+,-,=]value} ramp=%s", __func__, mixer->uid, stream->uid, json_object_get_string(rampJ)); goto OnErrorExit; @@ -127,7 +127,7 @@ PUBLIC int AlsaVolRampApply(SoftMixerT *mixer, AlsaSndCtlT *sndcard, AlsaStreamA } if (count != 1) { - AFB_ApiError(mixer->api, + AFB_API_ERROR(mixer->api, "%s: mixer=%s stream=%s invalid-numeric expect {uid:%s, vol:[+,-,=]value} get vol:%s", __func__, mixer->uid, stream->uid, uid, json_object_get_string(volJ)); goto OnErrorExit; @@ -138,7 +138,7 @@ PUBLIC int AlsaVolRampApply(SoftMixerT *mixer, AlsaSndCtlT *sndcard, AlsaStreamA break; default: - AFB_ApiError(mixer->api, + AFB_API_ERROR(mixer->api, "%s :mixer=%s stream=%s invalid-type expect {uid:%s, vol:[+,-,=]value} get vol:%s", __func__, mixer->uid, stream->uid, uid, json_object_get_string(volJ)); goto OnErrorExit; @@ -147,7 +147,7 @@ PUBLIC int AlsaVolRampApply(SoftMixerT *mixer, AlsaSndCtlT *sndcard, AlsaStreamA error = AlsaCtlNumidGetLong(mixer, sndcard, stream->volume, &curvol); if (error) { - AFB_ApiError(mixer->api, + AFB_API_ERROR(mixer->api, "%s: mixer=%s stream=%s ramp=%s Fail to get volume from numid=%d", __func__, mixer->uid, stream->uid, uid, stream->volume); goto OnErrorExit; @@ -164,7 +164,7 @@ PUBLIC int AlsaVolRampApply(SoftMixerT *mixer, AlsaSndCtlT *sndcard, AlsaStreamA } if (!found) { - AFB_ApiError(mixer->api, + AFB_API_ERROR(mixer->api, "%s: mixer=%s stream=%s ramp=%s does not exit", __func__, mixer->uid, stream->uid, uid); goto OnErrorExit; |