X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Faudio%2Faudio-api.c;h=1ba9126c672a1d2782e89546aef235a8e7547620;hb=146bb49ca5acf4bbd5d9841398030c29b4333cc6;hp=ebf78e183f4e9bf7f56edb1377edcebffa9b4fe6;hpb=d438e411f8f743573c79fd2c0a0a528b4a2cadf3;p=src%2Fapp-framework-binder.git
diff --git a/plugins/audio/audio-api.c b/plugins/audio/audio-api.c
index ebf78e18..1ba9126c 100644
--- a/plugins/audio/audio-api.c
+++ b/plugins/audio/audio-api.c
@@ -1,33 +1,36 @@
/*
- * Copyright (C) 2015 "IoT.bzh"
+ * Copyright (C) 2015, 2016 "IoT.bzh"
* Author "Manuel Bachmann"
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * 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
#include
+#include
#include "audio-api.h"
#include "audio-alsa.h"
+#ifdef HAVE_PULSE
+#include "audio-pulse.h"
+#endif
-#include "afb-plugin.h"
-#include "afb-req-itf.h"
+#include
+#include
/* ------ BACKEND FUNCTIONS ------- */
-void _backend_init (const char *name, audioCtxHandleT *ctx) {
+unsigned char _backend_init (const char *name, audioCtxHandleT *ctx) {
char *backend_env = getenv ("AFB_AUDIO_OUTPUT");
unsigned char res = 0;
@@ -39,8 +42,10 @@ void _backend_init (const char *name, audioCtxHandleT *ctx) {
#endif
res = _alsa_init (name, ctx);
- if (!res && verbose)
+ if (!res)
fprintf (stderr, "Could not initialize Audio backend\n");
+
+ return res;
}
void _backend_free (audioCtxHandleT *ctx) {
@@ -117,14 +122,15 @@ void _backend_set_channels (audioCtxHandleT *ctx, unsigned int channels) {
/* ------ LOCAL HELPER FUNCTIONS --------- */
-/* private client context creation ; default values */
-STATIC audioCtxHandleT* initAudioCtx () {
+/* private client context constructor ; default values */
+static audioCtxHandleT* initAudioCtx () {
audioCtxHandleT *ctx;
int i;
ctx = malloc (sizeof(audioCtxHandleT));
ctx->audio_dev = NULL;
+ ctx->name = NULL;
ctx->idx = -1;
for (i = 0; i < 8; i++)
ctx->volume[i] = 25;
@@ -135,60 +141,69 @@ STATIC audioCtxHandleT* initAudioCtx () {
return ctx;
}
-STATIC AFB_error releaseAudio (audioCtxHandleT *ctx) {
+static void releaseAudioCtx (void *context) {
+
+ audioCtxHandleT *ctx = (audioCtxHandleT*) context;
/* power it off */
_backend_free (ctx);
/* clean client context */
+ ctx->audio_dev = NULL;
+ if (ctx->name)
+ free (ctx->name);
ctx->idx = -1;
-
- return AFB_SUCCESS;
-}
-
-/* called when client session dies [e.g. client quits for more than 15mns] */
-STATIC void freeAudio (void *context) {
- free (context);
+ free (ctx);
}
/* ------ PUBLIC PLUGIN FUNCTIONS --------- */
-STATIC void init (struct afb_req request) { /* AFB_SESSION_CHECK */
+static void init (struct afb_req request) { /* AFB_SESSION_CHECK */
+ audioCtxHandleT *ctx = afb_req_context_get (request);
json_object *jresp;
/* create a private client context */
- if (!request.context)
- request.context = initAudioCtx();
+ if (!ctx) {
+ ctx = initAudioCtx();
+ afb_req_context_set (request, ctx, releaseAudioCtx);
+ }
- _backend_init("default", request.context);
+ if (!_backend_init ("default", ctx))
+ afb_req_fail (request, "failed", "backend initialization failed");
jresp = json_object_new_object();
- json_object_object_add (jresp, "info", json_object_new_string ("Audio initialized"));
-
- afb_req_success (request, jresp, "Audio initiliazed");
+ json_object_object_add (jresp, "init", json_object_new_string ("success"));
+ afb_req_success (request, jresp, "Audio initialized");
}
-STATIC void volume (struct afb_req request) { /* AFB_SESSION_CHECK */
+static void volume (struct afb_req request) { /* AFB_SESSION_CHECK */
- audioCtxHandleT *ctx = (audioCtxHandleT*)request.context;
- const char *value = afb_req_argument (request, "value");
+ audioCtxHandleT *ctx = afb_req_context_get (request);
+ const char *value = afb_req_value (request, "value");
json_object *jresp;
unsigned int volume[8], i;
char *volume_i;
char volume_str[256];
size_t len_str = 0;
+ if (!ctx) {
+ afb_req_fail (request, "failed", "you must call 'init' first");
+ return;
+ }
+ jresp = json_object_new_object();
+
/* no "?value=" parameter : return current state */
if (!value) {
for (i = 0; i < 8; i++) {
ctx->volume[i] = _backend_get_volume (ctx, i);
snprintf (volume_str+len_str, sizeof(volume_str)-len_str, "%d,", ctx->volume[i]);
- len_str = strlen(volume_str);
+ len_str = strlen (volume_str);
}
- jresp = json_object_new_object();
json_object_object_add (jresp, "volume", json_object_new_string(volume_str));
+ afb_req_success (request, jresp, "Audio - Volume obtained");
+ return;
}
/* "?value=" parameter, set volume */
@@ -199,8 +214,7 @@ STATIC void volume (struct afb_req request) { /* AFB_SESSION_CHECK */
if (100 < volume[0]) {
free (volume_i);
- //request.errcode = MHD_HTTP_SERVICE_UNAVAILABLE;
- afb_req_fail (request, "Failed", "Volume must be between 0 and 100");
+ afb_req_fail (request, "failed", "volume must be between 0 and 100");
return;
}
ctx->volume[0] = volume[0];
@@ -212,52 +226,68 @@ STATIC void volume (struct afb_req request) { /* AFB_SESSION_CHECK */
/* if there is only one value, set all channels to this one */
if (!volume_i && i == 1)
_backend_set_volume_all (ctx, ctx->volume[0]);
- if (!volume_i || 100 < atoi(volume_i) || atoi(volume_i) < 0) {
+ if (!volume_i || 100 < atoi(volume_i) || atoi(volume_i) < 0)
ctx->volume[i] = _backend_get_volume (ctx, i);
- } else {
+ else {
ctx->volume[i] = (unsigned int) atoi(volume_i);
_backend_set_volume (ctx, i, ctx->volume[i]);
}
len_str = strlen(volume_str);
snprintf (volume_str+len_str, sizeof(volume_str)-len_str, "%d,", ctx->volume[i]);
}
- jresp = json_object_new_object();
+ free (volume_i);
json_object_object_add (jresp, "volume", json_object_new_string(volume_str));
}
afb_req_success (request, jresp, "Audio - Volume changed");
}
-STATIC void channels (struct afb_req request) { /* AFB_SESSION_CHECK */
+static void channels (struct afb_req request) { /* AFB_SESSION_CHECK */
- audioCtxHandleT *ctx = (audioCtxHandleT*)request.context;
- const char *value = afb_req_argument (request, "value");
- json_object *jresp = json_object_new_object();
+ audioCtxHandleT *ctx = afb_req_context_get (request);
+ const char *value = afb_req_value (request, "value");
+ json_object *jresp;
char channels_str[256];
+ if (!ctx) {
+ afb_req_fail (request, "failed", "you must call 'init' first");
+ return;
+ }
+ jresp = json_object_new_object();
+
/* no "?value=" parameter : return current state */
if (!value) {
snprintf (channels_str, sizeof(channels_str), "%d", ctx->channels);
+
json_object_object_add (jresp, "channels", json_object_new_string (channels_str));
+ afb_req_success (request, jresp, "Audio - Channels obtained");
+ return;
}
/* "?value=" parameter, set channels */
else {
ctx->channels = (unsigned int) atoi (value);
_backend_set_channels (ctx, ctx->channels);
-
snprintf (channels_str, sizeof(channels_str), "%d", ctx->channels);
+
+ jresp = json_object_new_object();
json_object_object_add (jresp, "channels", json_object_new_string (channels_str));
}
afb_req_success (request, jresp, "Audio - Channels set");
}
-STATIC void mute (struct afb_req request) { /* AFB_SESSION_CHECK */
+static void mute (struct afb_req request) { /* AFB_SESSION_CHECK */
+
+ audioCtxHandleT *ctx = afb_req_context_get (request);
+ const char *value = afb_req_value (request, "value");
+ json_object *jresp;
- audioCtxHandleT *ctx = (audioCtxHandleT*)request.context;
- const char *value = afb_req_argument (request, "value");
- json_object *jresp = json_object_new_object();
+ if (!ctx) {
+ afb_req_fail (request, "failed", "you must call 'init' first");
+ return;
+ }
+ jresp = json_object_new_object();
/* no "?value=" parameter : return current state */
if (!value) {
@@ -265,13 +295,14 @@ STATIC void mute (struct afb_req request) { /* AFB_SESSION_CHECK */
ctx->mute ?
json_object_object_add (jresp, "mute", json_object_new_string ("on"))
: json_object_object_add (jresp, "mute", json_object_new_string ("off"));
+ afb_req_success (request, jresp, "Audio - Mute status obtained");
+ return;
}
/* "?value=" parameter is "1" or "true" */
else if ( atoi(value) == 1 || !strcasecmp(value, "true") ) {
ctx->mute = 1;
_backend_set_mute (ctx, ctx->mute);
-
json_object_object_add (jresp, "mute", json_object_new_string ("on"));
}
@@ -279,31 +310,37 @@ STATIC void mute (struct afb_req request) { /* AFB_SESSION_CHECK */
else if ( atoi(value) == 0 || !strcasecmp(value, "false") ) {
ctx->mute = 0;
_backend_set_mute (ctx, ctx->mute);
-
json_object_object_add (jresp, "mute", json_object_new_string ("off"));
}
afb_req_success (request, jresp, "Audio - Mute set");
}
-STATIC void play (struct afb_req request) { /* AFB_SESSION_CHECK */
+static void play (struct afb_req request) { /* AFB_SESSION_CHECK */
- audioCtxHandleT *ctx = (audioCtxHandleT*)request.context;
- const char *value = afb_req_argument (request, "value");
- json_object *jresp = json_object_new_object();
+ audioCtxHandleT *ctx = afb_req_context_get (request);
+ const char *value = afb_req_value (request, "value");
+ json_object *jresp;
+
+ if (!ctx) {
+ afb_req_fail (request, "failed", "you must call 'init' first");
+ return;
+ }
+ jresp = json_object_new_object();
/* no "?value=" parameter : return current state */
if (!value) {
ctx->is_playing ?
json_object_object_add (jresp, "play", json_object_new_string ("on"))
: json_object_object_add (jresp, "play", json_object_new_string ("off"));
+ afb_req_success (request, jresp, "Audio - Playing status obtained");
+ return;
}
/* "?value=" parameter is "1" or "true" */
else if ( atoi(value) == 1 || !strcasecmp(value, "true") ) {
ctx->is_playing = 1;
_backend_play (ctx);
-
json_object_object_add (jresp, "play", json_object_new_string ("on"));
}
@@ -311,18 +348,17 @@ STATIC void play (struct afb_req request) { /* AFB_SESSION_CHECK */
else if ( atoi(value) == 0 || !strcasecmp(value, "false") ) {
ctx->is_playing = 0;
_backend_stop (ctx);
-
json_object_object_add (jresp, "play", json_object_new_string ("off"));
}
afb_req_success (request, jresp, "Audio - Play");
}
-STATIC void ping (struct afb_req request) { /* AFB_SESSION_NONE */
+static void ping (struct afb_req request) { /* AFB_SESSION_NONE */
afb_req_success (request, NULL, "Audio - Ping success");
}
-STATIC const struct AFB_restapi pluginApis[]= {
+static const struct AFB_verb_desc_v1 verbs[] = {
{"init" , AFB_SESSION_CHECK, init , "Audio API - init"},
{"volume" , AFB_SESSION_CHECK, volume , "Audio API - volume"},
{"channels", AFB_SESSION_CHECK, channels , "Audio API - channels"},
@@ -332,9 +368,16 @@ STATIC const struct AFB_restapi pluginApis[]= {
{NULL}
};
-STATIC const struct AFB_plugin plug_desc = {
- .type = AFB_PLUGIN_JSON,
- .info = "Application Framework Binder - Audio plugin",
- .prefix = "audio",
- .apis = pluginApis
+static const struct AFB_plugin pluginDesc = {
+ .type = AFB_PLUGIN_VERSION_1,
+ .v1 = {
+ .info = "Application Framework Binder - Audio plugin",
+ .prefix = "audio",
+ .verbs = verbs
+ }
};
+
+const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
+{
+ return &pluginDesc;
+}