From 4f44ee8f17789ac27cd1e29a451ac450c7dbeb06 Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Mon, 7 Jan 2019 11:30:12 +0100 Subject: Turn '4a-hal-utilities' into an internal library That way, includes will be cleaner and '4a-hal-utilities' functions will be usable in plugin. Change-Id: I8a2146bd4e5dd5ef449b9ba7f2b1eed4d59045d3 Signed-off-by: Jonathan Aillet --- .../4a-hal-controllers-alsacore-link.h | 45 +--------------------- 1 file changed, 2 insertions(+), 43 deletions(-) (limited to '4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.h') diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.h b/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.h index 5d687aa..351ad59 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.h +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.h @@ -26,6 +26,8 @@ #include +#include "4a-hal-utilities-alsa-data.h" + #define ALSACORE_API "alsacore" #define ALSACORE_SUBSCRIBE_VERB "subscribe" #define ALSACORE_GETINFO_VERB "infoget" @@ -33,52 +35,9 @@ #define ALSACORE_CTLSET_VERB "ctlset" #define ALSACORE_ADDCTL_VERB "addcustomctl" -struct CtlHalAlsaDBScale { - int min; - int max; - int step; - int mute; -}; - -struct CtlHalAlsaCtlProperties { - snd_ctl_elem_type_t type; - int count; - int minval; - int maxval; - int step; - // TBD JAI : use them - const char **enums; - struct CtlHalAlsaDBScale *dbscale; -}; - -struct CtlHalAlsaCtl { - char *name; - int numid; - int value; - struct CtlHalAlsaCtlProperties alsaCtlProperties; - struct CtlHalAlsaCtlProperties *alsaCtlCreation; -}; - -struct CtlHalAlsaMap { - const char *uid; - char *info; - AFB_EventT alsaControlEvent; - struct CtlHalAlsaCtl ctl; - json_object *actionJ; - CtlActionT *action; -}; - -struct CtlHalAlsaMapT { - struct CtlHalAlsaMap *ctls; - unsigned int ctlsCount; -}; - // Alsa control types map from string function snd_ctl_elem_type_t HalCtlsMapsAlsaTypeToEnum(const char *label); -// Free contents of 'CtlHalAlsaMapT' data structure -uint8_t HalCtlsFreeAlsaCtlsMap(struct CtlHalAlsaMapT *alsaCtlsMap); - // HAL controllers alsacore calls funtions int HalCtlsGetCardIdByCardPath(AFB_ApiT apiHandle, char *devPath); int HalCtlsSubscribeToAlsaCardEvent(AFB_ApiT apiHandle, char *cardId); -- cgit 1.2.3-korg