aboutsummaryrefslogtreecommitdiffstats
path: root/Common
diff options
context:
space:
mode:
authorfulup <fulup.arfoll@iot.bzh>2017-06-27 14:24:38 +0200
committerfulup <fulup.arfoll@iot.bzh>2017-06-27 14:25:53 +0200
commit6c0d556e956eaf1f4eea734d7313d258dd75b878 (patch)
tree3308e313b6520ea4469ecce5fdc1dbd6850e1882 /Common
parent0fe1ff36dcc75149481d8071a1806c5408f70acc (diff)
Work in Progress
Diffstat (limited to 'Common')
-rw-r--r--Common/AudioCommonLib.c102
-rw-r--r--Common/AudioCommonLib.h68
-rw-r--r--Common/CMakeLists.txt31
3 files changed, 201 insertions, 0 deletions
diff --git a/Common/AudioCommonLib.c b/Common/AudioCommonLib.c
new file mode 100644
index 0000000..0055896
--- /dev/null
+++ b/Common/AudioCommonLib.c
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2016 "IoT.bzh"
+ * Author Fulup Ar Foll <fulup@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+#define _GNU_SOURCE // needed for vasprintf
+
+#include <json-c/json.h>
+#include <afb/afb-binding.h>
+#include <afb/afb-service-itf.h>
+#include <semaphore.h>
+#include <string.h>
+
+#include "AudioCommonLib.h"
+
+typedef struct {
+ int index;
+ int numid;
+} shareHallMap_T;
+
+
+PUBLIC int cbCheckResponse(struct afb_req request, int iserror, struct json_object *result) {
+ struct json_object *response, *status, *info;
+
+ if (iserror) { // on error proxy information we got from lower layer
+ if (result) {
+ if (json_object_object_get_ex(result, "request", &response)) {
+ json_object_object_get_ex(response, "info", &info);
+ json_object_object_get_ex(response, "status", &status);
+ afb_req_fail(request, json_object_get_string(status), json_object_get_string(info));
+ goto OnErrorExit;
+ }
+ } else {
+ afb_req_fail(request, "cbCheckFail", "No Result inside API response");
+ }
+ goto OnErrorExit;
+ }
+ return (0);
+
+OnErrorExit:
+ return (-1);
+}
+
+
+// This function should be part of Generic AGL Framework
+PUBLIC json_object* afb_service_call_sync(struct afb_service srvitf, struct afb_req request, char* api, char* verb, struct json_object* queryurl) {
+ json_object* response = NULL;
+ int status = 0;
+ sem_t semid;
+
+ // Nested procedure are allow in GNU and allow us to keep caller stack valid
+
+ void callback(void *handle, int iserror, struct json_object *result) {
+
+ // Process Basic Error
+ if (!cbCheckResponse(request, iserror, result)) {
+ status = -1;
+ goto OnExitCB;
+ }
+
+ // Get response from object
+ json_object_object_get_ex(result, "response", &response);
+ if (!response) {
+ afb_req_fail_f(request, "response-notfound", "No Controls return from alsa/getcontrol result=[%s]", json_object_get_string(result));
+ goto OnExitCB;
+ }
+
+OnExitCB:
+ sem_post(&semid);
+ }
+
+ // Create an exclusive semaphore
+ status = sem_init(&semid, 0, 0);
+ if (status < 0) {
+ afb_req_fail_f(request, "error:seminit", "Fail to allocate semaphore err=[%s]", strerror(status));
+ goto OnExit;
+ }
+
+ // Call service and wait for call back to finish before moving any further
+ afb_service_call(srvitf, api, verb, queryurl, callback, NULL);
+ sem_wait(&semid);
+
+OnExit:
+ return (response);
+}
+
+PUBLIC void pingtest(struct afb_req request) {
+ json_object *query = afb_req_json(request);
+ afb_req_success(request, query, NULL);
+}
diff --git a/Common/AudioCommonLib.h b/Common/AudioCommonLib.h
new file mode 100644
index 0000000..ffefbfc
--- /dev/null
+++ b/Common/AudioCommonLib.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2016 "IoT.bzh"
+ * Author Fulup Ar Foll <fulup@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * reference:
+ * amixer contents; amixer controls;
+ * http://www.tldp.org/HOWTO/Alsa-sound-6.html
+ */
+
+#ifndef AUDIOCOMMON_H
+#define AUDIOCOMMON_H
+
+#include <json-c/json.h>
+#include <afb/afb-binding.h>
+#include <afb/afb-service-itf.h>
+
+#ifndef PUBLIC
+ #define PUBLIC
+#endif
+#define STATIC static
+
+// Most controls are MIXER but some vendor specific are possible
+typedef enum {
+ OUTVOL,
+ PCMVOL,
+ INVOL,
+ SWITCH,
+ ROUTE,
+ CARD,
+ ENUM,
+} halGroupEnumT;
+
+typedef enum {
+ READ,
+ WRITE,
+ RW,
+} halAclEnumT;
+
+typedef enum {
+ StartHalCrlTag=0,
+
+ // HighLevel Audio Control List
+ Master_Playback_Volume,
+ PCM_Playback_Volume,
+ PCM_Playback_Switch,
+ Capture_Volume,
+
+ EndHalCrlTag // used to compute number of ctls
+} halCtlsEnumT;
+
+PUBLIC int cbCheckResponse(struct afb_req request, int iserror, struct json_object *result) ;
+PUBLIC json_object* afb_service_call_sync(struct afb_service srvitf, struct afb_req request, char* api, char* verb, struct json_object* queryurl);
+PUBLIC void pingtest(struct afb_req request);
+
+#endif /* AUDIOCOMMON_H */
+
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
new file mode 100644
index 0000000..79ee8ac
--- /dev/null
+++ b/Common/CMakeLists.txt
@@ -0,0 +1,31 @@
+###########################################################################
+# Copyright 2015, 2016, 2017 IoT.bzh
+#
+# author: Fulup Ar Foll <fulup@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###########################################################################
+
+PROJECT(audio-common C)
+
+INCLUDE_DIRECTORIES(${include_dirs})
+
+##################################################
+# AudioCommon is a local static Library
+##################################################
+ADD_LIBRARY(audiocommon STATIC AudioCommonLib.c)
+SET_TARGET_PROPERTIES(audiocommon PROPERTIES OUTPUT_NAME audiocommon)
+SET(link_libraries ${libefence_LIBRARIES} ${json-c_LIBRARIES})
+TARGET_LINK_LIBRARIES(audiocommon ${link_libraries})
+
+