X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Faudio%2Faudio-api.c;h=8956f80910dd4c8fe46fd5d2cc6085277bdcfd94;hb=9481b4f2960c560ec8297bdc37d8014230072a5c;hp=74a1be95b552734860f987d13910afc86b315292;hpb=61354a55ac2abd9e83e1f869cdb735654d6eb74a;p=src%2Fapp-framework-binder.git

diff --git a/plugins/audio/audio-api.c b/plugins/audio/audio-api.c
index 74a1be95..8956f809 100644
--- a/plugins/audio/audio-api.c
+++ b/plugins/audio/audio-api.c
@@ -1,202 +1,355 @@
 /*
- * 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 <http://www.gnu.org/licenses/>.
+ * 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 <stdlib.h>
+#include <json-c/json.h>
+
 #include "audio-api.h"
 #include "audio-alsa.h"
+#ifdef HAVE_PULSE
+#include "audio-pulse.h"
+#endif
 
+#include <afb/afb-plugin.h>
+#include <afb/afb-req-itf.h>
 
-/* ------ LOCAL HELPER FUNCTIONS --------- */
+/* ------ BACKEND FUNCTIONS ------- */
 
-/* private client context creation ; default values */
-STATIC audioCtxHandleT* initAudioCtx () {
+unsigned char _backend_init (const char *name, audioCtxHandleT *ctx) {
 
-    audioCtxHandleT *actx;
+    char *backend_env = getenv ("AFB_AUDIO_OUTPUT");
+    unsigned char res = 0;
 
-    actx = malloc (sizeof(audioCtxHandleT));
-    actx->idx = -1;
-    actx->volume = 25;
-    actx->channels = 2;
-    actx->mute = 0;
+# ifdef HAVE_PULSE
+    if (!backend_env || (strcasecmp (backend_env, "Pulse") == 0))
+        res = _pulse_init (name, ctx);
+    if (!res)
+#endif
+    res = _alsa_init (name, ctx);
 
-    return actx;
+    if (!res)
+        fprintf (stderr, "Could not initialize Audio backend\n");
+
+    return res;
 }
 
-STATIC AFB_error releaseAudio (audioCtxHandleT *actx) {
+void _backend_free (audioCtxHandleT *ctx) {
 
-    /* power it off */
-    _alsa_free (actx->idx);
+# ifdef HAVE_PULSE
+    if (ctx->audio_dev) _pulse_free (ctx); else
+# endif
+    _alsa_free (ctx->name);
+}
 
-    /* clean client context */
-    actx->idx = -1;
+void _backend_play (audioCtxHandleT *ctx) {
+
+# ifdef HAVE_PULSE
+    if (ctx->audio_dev) _pulse_play (ctx); else
+# endif
+    _alsa_play (ctx->idx);
+}
+
+void _backend_stop (audioCtxHandleT *ctx) {
+
+# ifdef HAVE_PULSE
+    if (ctx->audio_dev) _pulse_stop (ctx); else
+# endif
+    _alsa_stop (ctx->idx);
+}
+
+unsigned int _backend_get_volume (audioCtxHandleT *ctx, unsigned int channel) {
+
+# ifdef HAVE_PULSE
+    if (ctx->audio_dev) return _pulse_get_volume (ctx, channel); else
+# endif
+    return _alsa_get_volume (ctx->idx, channel);
+}
+
+void _backend_set_volume (audioCtxHandleT *ctx, unsigned int channel, unsigned int vol) {
+
+# ifdef HAVE_PULSE
+    if (ctx->audio_dev) _pulse_set_volume (ctx, channel, vol); else
+# endif
+    _alsa_set_volume (ctx->idx, channel, vol);
+}
+
+void _backend_set_volume_all (audioCtxHandleT *ctx, unsigned int vol) {
+
+# ifdef HAVE_PULSE
+    if (ctx->audio_dev) _pulse_set_volume_all (ctx, vol); else
+# endif
+    _alsa_set_volume_all (ctx->idx, vol);
+}
+
+unsigned char _backend_get_mute (audioCtxHandleT *ctx) {
+
+# ifdef HAVE_PULSE
+    if (ctx->audio_dev) return _pulse_get_mute (ctx); else
+# endif
+    return _alsa_get_mute (ctx->idx);
+}
+
+void _backend_set_mute (audioCtxHandleT *ctx, unsigned char mute) {
 
-    return AFB_SUCCESS;
+# ifdef HAVE_PULSE
+    if (ctx->audio_dev) _pulse_set_mute (ctx, mute); else
+# endif
+    _alsa_set_mute (ctx->idx, mute);
 }
 
-/* called when client session dies [e.g. client quits for more than 15mns] */
-STATIC json_object* freeAudio (AFB_clientCtx *client) {
+void _backend_set_channels (audioCtxHandleT *ctx, unsigned int channels) {
 
-    releaseAudio (client->ctx);
-    free (client->ctx);
-    
-    return jsonNewMessage (AFB_SUCCESS, "Released radio and client context");
+# ifdef HAVE_PULSE
+    if (ctx->audio_dev) return; else
+# endif
+    _alsa_set_channels (ctx->idx, channels);
+}
+
+/* ------ LOCAL HELPER FUNCTIONS --------- */
+
+/* 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;
+    ctx->channels = 2;
+    ctx->mute = 0;
+    ctx->is_playing = 0;
+
+    return 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;
+    free (ctx);
 }
 
 
 /* ------ PUBLIC PLUGIN FUNCTIONS --------- */
 
-STATIC json_object* init (AFB_request *request) {       /* AFB_SESSION_CREATE */
+static void init (struct afb_req request) {        /* AFB_SESSION_CHECK */
 
-    audioCtxHandleT *actx;
+    audioCtxHandleT *ctx = (audioCtxHandleT*) afb_req_context_get(request);
     json_object *jresp;
-    int idx;
 
     /* create a private client context */
-    actx = initAudioCtx();
-    request->client->ctx = (audioCtxHandleT*)actx;
-    
-    _alsa_init("default", actx);
-    
+	if (!ctx) {
+        ctx = initAudioCtx();
+        afb_req_context_set (request, ctx, releaseAudioCtx);
+    }
+
+    if (!_backend_init ("default", ctx)) {
+        afb_req_fail (request, "failed", "backend initialization failed");
+    }
+
     jresp = json_object_new_object();
-    json_object_object_add (jresp, "token", json_object_new_string (request->client->token));
-    return jresp;
+    json_object_object_add (jresp, "init", json_object_new_string ("success"));
+    afb_req_success (request, jresp, "Audio initialized");
 }
 
-STATIC json_object* volume (AFB_request *request) {      /* AFB_SESSION_CHECK */
+static void volume (struct afb_req request) {      /* AFB_SESSION_CHECK */
 
-    audioCtxHandleT *actx = (audioCtxHandleT*)request->client->ctx;
-    const char *value = getQueryValue (request, "value");
+    audioCtxHandleT *ctx = (audioCtxHandleT*) afb_req_context_get(request);
+    const char *value = afb_req_value (request, "value");
     json_object *jresp;
-    int volume;
+    unsigned int volume[8], i;
+    char *volume_i;
     char volume_str[256];
+    size_t len_str = 0;
 
     /* no "?value=" parameter : return current state */
     if (!value) {
-        actx->volume = _alsa_get_volume (actx->idx);
-        snprintf (volume_str, sizeof(volume_str), "%d", actx->volume);
+        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);
+        }
         jresp = json_object_new_object();
         json_object_object_add (jresp, "volume", json_object_new_string(volume_str));
     }
 
     /* "?value=" parameter, set volume */
     else {
-        volume = atoi (value);
-        if (100 < volume < 0) {
-            request->errcode = MHD_HTTP_SERVICE_UNAVAILABLE;
-            return (jsonNewMessage (AFB_FAIL, "Volume must be between 0 and 100"));
+        volume_i = strdup (value);
+        volume_i = strtok (volume_i, ",");
+        volume[0] = (unsigned int) atoi (volume_i);
+
+        if (100 < volume[0]) {
+            free (volume_i);
+            afb_req_fail (request, "failed", "volume must be between 0 and 100");
+            return;
+        }
+        ctx->volume[0] = volume[0];
+        _backend_set_volume (ctx, 0, ctx->volume[0]);
+        snprintf (volume_str, sizeof(volume_str), "%d,", ctx->volume[0]);
+
+        for (i = 1; i < 8; i++) {
+            volume_i = strtok (NULL, ",");
+            /* 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) {
+               ctx->volume[i] = _backend_get_volume (ctx, i);
+            } 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]);
         }
-        actx->volume = volume;
-        _alsa_set_volume (actx->idx, actx->volume);
-
-        snprintf (volume_str, sizeof(volume_str), "%d", actx->volume);
         jresp = json_object_new_object();
         json_object_object_add (jresp, "volume", json_object_new_string(volume_str));
     }
 
-    return jresp;
+    afb_req_success (request, jresp, "Audio - Volume changed");
 }
 
-STATIC json_object* channels (AFB_request *request) {    /* AFB_SESSION_CHECK */
+static void channels (struct afb_req request) {    /* AFB_SESSION_CHECK */
 
-    audioCtxHandleT *actx = (audioCtxHandleT*)request->client->ctx;
-    const char *value = getQueryValue (request, "value");
+    audioCtxHandleT *ctx = (audioCtxHandleT*) afb_req_context_get(request);
+    const char *value = afb_req_value (request, "value");
     json_object *jresp = json_object_new_object();
     char channels_str[256];
 
     /* no "?value=" parameter : return current state */
     if (!value) {
-        snprintf (channels_str, sizeof(channels_str), "%d", actx->channels);
+        snprintf (channels_str, sizeof(channels_str), "%d", ctx->channels);
         json_object_object_add (jresp, "channels", json_object_new_string (channels_str));
     }
 
     /* "?value=" parameter, set channels */
     else {
-        actx->channels = atoi (value);
-        _alsa_set_channels (actx->idx, actx->channels);
+        ctx->channels = (unsigned int) atoi (value);
+        _backend_set_channels (ctx, ctx->channels);
 
-        snprintf (channels_str, sizeof(channels_str), "%d", actx->channels);
+        snprintf (channels_str, sizeof(channels_str), "%d", ctx->channels);
         json_object_object_add (jresp, "channels", json_object_new_string (channels_str));
     }
 
-    return jresp;
+    afb_req_success (request, jresp, "Audio - Channels set");
 }
 
-STATIC json_object* mute (AFB_request *request) {        /* AFB_SESSION_CHECK */
+static void mute (struct afb_req request) {        /* AFB_SESSION_CHECK */
 
-    audioCtxHandleT *actx = (audioCtxHandleT*)request->client->ctx;
-    const char *value = getQueryValue (request, "value");
+    audioCtxHandleT *ctx = (audioCtxHandleT*) afb_req_context_get(request);
+    const char *value = afb_req_value (request, "value");
     json_object *jresp = json_object_new_object();
 
     /* no "?value=" parameter : return current state */
     if (!value) {
-        actx->mute = _alsa_get_mute (actx->idx);
-        actx->mute ?
+        ctx->mute = _backend_get_mute (ctx);
+        ctx->mute ?
             json_object_object_add (jresp, "mute", json_object_new_string ("on"))
           : json_object_object_add (jresp, "mute", json_object_new_string ("off"));
     }
 
-    /* "?value=" parameter is "1" or "on" */
-    else if ( atoi(value) == 1 || !strcasecmp(value, "on") ) {
-        actx->mute = 1;
-        _alsa_set_mute (actx->idx, actx->mute);
+    /* "?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"));
     }
 
-    /* "?value=" parameter is "0" or "off" */
-    else if ( atoi(value) == 0 || !strcasecmp(value, "off") ) {
-        actx->mute = 0;
-        _alsa_set_mute (actx->idx, actx->mute);
+    /* "?value=" parameter is "0" or "false" */
+    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"));
     }
 
-    return jresp;
+    afb_req_success (request, jresp, "Audio - Mute set");
 }
 
-STATIC json_object* refresh (AFB_request *request) {     /* AFB_SESSION_RENEW */
+static void play (struct afb_req request) {        /* AFB_SESSION_CHECK */
+
+    audioCtxHandleT *ctx = (audioCtxHandleT*) afb_req_context_get(request);
+    const char *value = afb_req_value (request, "value");
     json_object *jresp = json_object_new_object();
-    json_object_object_add(jresp, "token", json_object_new_string (request->client->token));
-    return jresp;
-}
 
-STATIC json_object* ping (AFB_request *request) {         /* AFB_SESSION_NONE */
-    return jsonNewMessage(AFB_SUCCESS, "Ping Binder Daemon - Radio API");
+    /* 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"));
+    }
+
+    /* "?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"));
+    }
+
+    /* "?value=" parameter is "0" or "false" */
+    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 */
+    afb_req_success (request, NULL, "Audio - Ping success");
+}
 
-STATIC AFB_restapi pluginApis[]= {
-  {"init"    , AFB_SESSION_CREATE, (AFB_apiCB)init      , "Audio API - init"},
-  {"volume"  , AFB_SESSION_CHECK,  (AFB_apiCB)volume    , "Audio API - volume"},
-  {"channels", AFB_SESSION_CHECK,  (AFB_apiCB)channels  , "Audio API - channels"},
-  {"mute"    , AFB_SESSION_CHECK,  (AFB_apiCB)mute      , "Audio API - mute"},
-  {"refresh",  AFB_SESSION_RENEW,  (AFB_apiCB)refresh   , "Audio API - refresh"},
-  {"ping"   ,  AFB_SESSION_NONE,   (AFB_apiCB)ping      , "Audio API - ping"},
+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"},
+  {"mute"    , AFB_SESSION_CHECK,  mute      , "Audio API - mute"},
+  {"play"    , AFB_SESSION_CHECK,  play      , "Audio API - play"},
+  {"ping"    , AFB_SESSION_NONE,   ping      , "Audio API - ping"},
   {NULL}
 };
 
-PUBLIC AFB_plugin *audioRegister () {
-    AFB_plugin *plugin = malloc (sizeof(AFB_plugin));
-    plugin->type   = AFB_PLUGIN_JSON;
-    plugin->info   = "Application Framework Binder - Audio plugin";
-    plugin->prefix = "audio";        
-    plugin->apis   = pluginApis;
-
-    plugin->freeCtxCB = freeAudio;
-
-    return (plugin);
+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;
+}