1 files changed, 11 insertions, 11 deletions

diff --git a/plugins/alsa/alsa-softmixer.h b/plugins/alsa/alsa-softmixer.h
index 346964a..b6c0e5b 100644
--- a/plugins/alsa/alsa-softmixer.h
+++ b/plugins/alsa/alsa-softmixer.h
@@ -70,12 +70,12 @@
     int _snd_pcm_ ## plugin ## _open(snd_pcm_t **pcmp, const char *name, snd_config_t *root, snd_config_t *conf, snd_pcm_stream_t stream, int mode)
 
 #define SOFTMIXER_NOMEM(api) \
-	AFB_ApiError((api), "%s: Insufficient memory", __func__)
+	AFB_API_ERROR((api), "%s: Insufficient memory", __func__)
 
 // auto switch from Log to API request depending on request presence.
 #define AFB_IfReqFailF(mixer, request, status, format, ...) \
- if (request) AFB_ReqFailF(request, status, format, __VA_ARGS__); \
- else AFB_ApiError(mixer->api, format, __VA_ARGS__); 
+ if (request) afb_req_fail_f(request, status, format, __VA_ARGS__); \
+ else AFB_API_ERROR(mixer->api, format, __VA_ARGS__); 
 
 #ifndef PUBLIC
 #define PUBLIC
@@ -133,7 +133,7 @@ typedef struct {
 typedef struct {
 	AlsaPcmCtlT *pcmIn;
 	AlsaPcmCtlT *pcmOut;
-    AFB_ApiT api;
+    afb_api_t api;
     sd_event_source* evtsrc;
 
     size_t frame_size;
@@ -284,7 +284,7 @@ typedef struct AlsaStreamAudioT_ {
 typedef struct SoftMixerT_{
     const char *uid;
     const char *info;
-    AFB_ApiT api;
+    afb_api_t api;
     sd_event *sdLoop;
 
     struct {
@@ -368,12 +368,12 @@ 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 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);
-PUBLIC int ApiZoneAttach(SoftMixerT *mixer, AFB_ReqT request, const char *, json_object * argsJ);
-PUBLIC int ApiRampAttach(SoftMixerT *mixer, AFB_ReqT request, const char *, json_object *argsJ);
+PUBLIC int ApiLoopAttach(SoftMixerT *mixer, afb_req_t request, const char *, json_object * argsJ);
+PUBLIC int ApiSourceAttach(SoftMixerT *mixer, afb_req_t request, const char *, json_object * argsJ);
+PUBLIC int ApiSinkAttach(SoftMixerT *mixer, afb_req_t request, const char *, json_object * argsJ);
+PUBLIC int ApiStreamAttach(SoftMixerT *mixer, afb_req_t request, const char * uid, const char *prefix, json_object * argsJ);
+PUBLIC int ApiZoneAttach(SoftMixerT *mixer, afb_req_t request, const char *, json_object * argsJ);
+PUBLIC int ApiRampAttach(SoftMixerT *mixer, afb_req_t request, const char *, json_object *argsJ);
 
 PUBLIC void loopsDisplay(SoftMixerT * mixer);