summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2018-06-11 01:34:12 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2018-10-08 15:52:51 +0200
commit3571ce961cc7920f6f2d976e7880b0e220330d11 (patch)
tree01d7988e59b8321f41ebd699524efb6139dd5097
parente8cd2f8161706331208168c8171f0677838549d6 (diff)
Change mixer data structures names
Change mixer data structures names bacause we won't only stores streams data anymore. Change-Id: Id7e4482b6a69696d156c6a8bfc8f8d231dba9d2c Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
-rw-r--r--4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c4
-rw-r--r--4a-hal/4a-hal-utilities/4a-hal-utilities-data.c2
-rw-r--r--4a-hal/4a-hal-utilities/4a-hal-utilities-data.h8
3 files changed, 7 insertions, 7 deletions
diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c
index 924054b..cb4ea93 100644
--- a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c
+++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c
@@ -34,7 +34,7 @@
* HAL controllers handle mixer calls functions *
******************************************************************************/
-int HalCtlsHandleMixerAttachResponse(AFB_ApiT apiHandle, struct CtlHalStreamsDataT *currentHalStreamsData, json_object *mixerResponseJ)
+int HalCtlsHandleMixerAttachResponse(AFB_ApiT apiHandle, struct CtlHalMixerDataT *currentHalStreamsData, json_object *mixerResponseJ)
{
int err = (int) MIXER_NO_ERROR;
unsigned int idx;
@@ -63,7 +63,7 @@ int HalCtlsHandleMixerAttachResponse(AFB_ApiT apiHandle, struct CtlHalStreamsDat
return (int) MIXER_ERROR_NO_STREAMS;
}
- currentHalStreamsData->data = (struct CtlHalStreamData *) calloc(currentHalStreamsData->count, sizeof(struct CtlHalStreamData));
+ currentHalStreamsData->data = (struct CtlHalMixerData *) calloc(currentHalStreamsData->count, sizeof(struct CtlHalMixerData));
CtlHalDynApiStreamVerbs = alloca((currentHalStreamsData->count + 1) * sizeof(struct HalUtlApiVerb));
memset(CtlHalDynApiStreamVerbs, '\0', (currentHalStreamsData->count + 1) * sizeof(struct HalUtlApiVerb));
diff --git a/4a-hal/4a-hal-utilities/4a-hal-utilities-data.c b/4a-hal/4a-hal-utilities/4a-hal-utilities-data.c
index b2c4b25..e8f54a2 100644
--- a/4a-hal/4a-hal-utilities/4a-hal-utilities-data.c
+++ b/4a-hal/4a-hal-utilities/4a-hal-utilities-data.c
@@ -31,7 +31,7 @@
* Specfic Hal controller streams data handling functions *
******************************************************************************/
-uint8_t HalUtlRemoveAllCtlHalStreamsData(struct CtlHalStreamsDataT *ctlHalStreamsData)
+uint8_t HalUtlRemoveAllCtlHalStreamsData(struct CtlHalMixerDataT *ctlHalStreamsData)
{
unsigned int cpt;
diff --git a/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h b/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h
index a79a7f1..244546f 100644
--- a/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h
+++ b/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h
@@ -37,14 +37,14 @@ enum HalStatus {
};
// Structure to store stream data
-struct CtlHalStreamData {
+struct CtlHalMixerData {
char *name;
char *streamCardId;
};
// Structure to store stream data table
-struct CtlHalStreamsDataT {
- struct CtlHalStreamData *data;
+struct CtlHalMixerDataT {
+ struct CtlHalMixerData *data;
unsigned int count;
};
@@ -54,7 +54,7 @@ struct CtlHalSpecificData {
char *mixerVerbName;
json_object *halMixerJ;
- struct CtlHalStreamsDataT ctlHalStreamsData;
+ struct CtlHalMixerDataT ctlHalStreamsData;
struct CtlHalAlsaMapT *ctlHalAlsaMapT;
AFB_ApiT apiHandle;