X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Faudio%2Faudio-api.c;h=4a8d0da1ff8363223050633c75189fceb3e43807;hb=e3320f303c4eb8f7fe0fac69bfa9ce36d9916930;hp=fd5f620f38f16a043a3d6afb7164ca454b0b9272;hpb=07fb99ec63d034983b768e8b8bd3d2b30ae37f6f;p=src%2Fapp-framework-binder.git

diff --git a/plugins/audio/audio-api.c b/plugins/audio/audio-api.c
index fd5f620f..4a8d0da1 100644
--- a/plugins/audio/audio-api.c
+++ b/plugins/audio/audio-api.c
@@ -17,8 +17,88 @@
  */
 
 #include "audio-api.h"
-#include "audio-alsa.h"
 
+/* ------ BACKEND FUNCTIONS ------- */
+
+void _backend_init (const char *name, audioCtxHandleT *ctx) {
+
+# ifdef HAVE_PULSE
+    if (_pulse_init (name, ctx) < 0)
+# endif
+    _alsa_init (name, ctx);
+}
+
+void _backend_free (audioCtxHandleT *ctx) {
+
+# ifdef HAVE_PULSE
+    if (ctx->audio_dev) _pulse_free (ctx); else
+# endif
+    _alsa_free (ctx->idx);
+}
+
+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);
+}
+
+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, 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, 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) {
+
+# ifdef HAVE_PULSE
+    if (ctx->audio_dev) _pulse_set_mute (ctx, mute); else
+# endif
+    _alsa_set_mute (ctx->idx, mute);
+}
+
+void _backend_set_channels (audioCtxHandleT *ctx, unsigned int channels) {
+
+# ifdef HAVE_PULSE
+    if (ctx->audio_dev) return; else
+# endif
+    _alsa_set_channels (ctx->idx, channels);
+}
 
 /* ------ LOCAL HELPER FUNCTIONS --------- */
 
@@ -26,12 +106,16 @@
 STATIC audioCtxHandleT* initAudioCtx () {
 
     audioCtxHandleT *ctx;
+    int i;
 
     ctx = malloc (sizeof(audioCtxHandleT));
+    ctx->audio_dev = NULL;
     ctx->idx = -1;
-    ctx->volume = 25;
+    for (i = 0; i < 8; i++)
+        ctx->volume[i] = 25;
     ctx->channels = 2;
     ctx->mute = 0;
+    ctx->is_playing = 0;
 
     return ctx;
 }
@@ -39,7 +123,7 @@ STATIC audioCtxHandleT* initAudioCtx () {
 STATIC AFB_error releaseAudio (audioCtxHandleT *ctx) {
 
     /* power it off */
-    _alsa_free (ctx->idx);
+    _backend_free (ctx);
 
     /* clean client context */
     ctx->idx = -1;
@@ -48,61 +132,79 @@ STATIC AFB_error releaseAudio (audioCtxHandleT *ctx) {
 }
 
 /* called when client session dies [e.g. client quits for more than 15mns] */
-STATIC json_object* freeAudio (AFB_clientCtx *client) {
-
-    releaseAudio (client->ctx);
-    free (client->ctx);
-    
-    return jsonNewMessage (AFB_SUCCESS, "Released radio and client context");
+STATIC void freeAudio (void *context) {
+    free (context);    
 }
 
 
 /* ------ PUBLIC PLUGIN FUNCTIONS --------- */
 
-STATIC json_object* init (AFB_request *request) {       /* AFB_SESSION_CREATE */
+STATIC json_object* init (AFB_request *request) {        /* AFB_SESSION_CHECK */
 
-    audioCtxHandleT *ctx;
     json_object *jresp;
     int idx;
 
     /* create a private client context */
-    ctx = initAudioCtx();
-    request->client->ctx = (audioCtxHandleT*)ctx;
-    
-    _alsa_init("default", ctx);
-    
+    if (!request->context)
+        request->context = initAudioCtx();
+
+    _backend_init("default", request->context);
+
     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, "info", json_object_new_string ("Audio initialised"));
+    return (jresp);
 }
 
 STATIC json_object* volume (AFB_request *request) {      /* AFB_SESSION_CHECK */
 
-    audioCtxHandleT *ctx = (audioCtxHandleT*)request->client->ctx;
+    audioCtxHandleT *ctx = (audioCtxHandleT*)request->context;
     const char *value = getQueryValue (request, "value");
     json_object *jresp;
-    int volume;
+    int volume[8], i;
+    char *volume_i;
     char volume_str[256];
+    int len_str = 0;
 
     /* no "?value=" parameter : return current state */
     if (!value) {
-        ctx->volume = _alsa_get_volume (ctx->idx);
-        snprintf (volume_str, sizeof(volume_str), "%d", ctx->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) {
+        volume_i = strdup (value);
+        volume_i = strtok (volume_i, ",");
+        volume[0] = atoi (volume_i);
+
+        if (100 < volume[0] < 0) {
+            free (volume_i);
             request->errcode = MHD_HTTP_SERVICE_UNAVAILABLE;
             return (jsonNewMessage (AFB_FAIL, "Volume must be between 0 and 100"));
         }
-        ctx->volume = volume;
-        _alsa_set_volume (ctx->idx, ctx->volume);
-
-        snprintf (volume_str, sizeof(volume_str), "%d", ctx->volume);
+        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) < 0) {
+               ctx->volume[i] = _backend_get_volume (ctx, i);
+            } else {
+               ctx->volume[i] = 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();
         json_object_object_add (jresp, "volume", json_object_new_string(volume_str));
     }
@@ -112,7 +214,7 @@ STATIC json_object* volume (AFB_request *request) {      /* AFB_SESSION_CHECK */
 
 STATIC json_object* channels (AFB_request *request) {    /* AFB_SESSION_CHECK */
 
-    audioCtxHandleT *ctx = (audioCtxHandleT*)request->client->ctx;
+    audioCtxHandleT *ctx = (audioCtxHandleT*)request->context;
     const char *value = getQueryValue (request, "value");
     json_object *jresp = json_object_new_object();
     char channels_str[256];
@@ -126,7 +228,7 @@ STATIC json_object* channels (AFB_request *request) {    /* AFB_SESSION_CHECK */
     /* "?value=" parameter, set channels */
     else {
         ctx->channels = atoi (value);
-        _alsa_set_channels (ctx->idx, ctx->channels);
+        _backend_set_channels (ctx, ctx->channels);
 
         snprintf (channels_str, sizeof(channels_str), "%d", ctx->channels);
         json_object_object_add (jresp, "channels", json_object_new_string (channels_str));
@@ -137,30 +239,30 @@ STATIC json_object* channels (AFB_request *request) {    /* AFB_SESSION_CHECK */
 
 STATIC json_object* mute (AFB_request *request) {        /* AFB_SESSION_CHECK */
 
-    audioCtxHandleT *ctx = (audioCtxHandleT*)request->client->ctx;
+    audioCtxHandleT *ctx = (audioCtxHandleT*)request->context;
     const char *value = getQueryValue (request, "value");
     json_object *jresp = json_object_new_object();
 
     /* no "?value=" parameter : return current state */
     if (!value) {
-        ctx->mute = _alsa_get_mute (ctx->idx);
+        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") ) {
+    /* "?value=" parameter is "1" or "true" */
+    else if ( atoi(value) == 1 || !strcasecmp(value, "true") ) {
         ctx->mute = 1;
-        _alsa_set_mute (ctx->idx, ctx->mute);
+        _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") ) {
+    /* "?value=" parameter is "0" or "false" */
+    else if ( atoi(value) == 0 || !strcasecmp(value, "false") ) {
         ctx->mute = 0;
-        _alsa_set_mute (ctx->idx, ctx->mute);
+        _backend_set_mute (ctx, ctx->mute);
 
         json_object_object_add (jresp, "mute", json_object_new_string ("off"));
     }
@@ -168,28 +270,60 @@ STATIC json_object* mute (AFB_request *request) {        /* AFB_SESSION_CHECK */
     return jresp;
 }
 
-STATIC json_object* status (AFB_request *request) {      /* AFB_SESSION_RENEW */
-    return NULL;
+STATIC json_object* play (AFB_request *request) {        /* AFB_SESSION_CHECK */
+
+    audioCtxHandleT *ctx = (audioCtxHandleT*)request->context;
+    const char *value = getQueryValue (request, "value");
+    json_object *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"));
+    }
+
+    /* "?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"));
+    }
+
+    return jresp;
 }
 
+STATIC json_object* ping (AFB_request *request) {         /* AFB_SESSION_NONE */
+    return jsonNewMessage(AFB_SUCCESS, "Ping Binder Daemon - Radio API");
+}
 
 STATIC AFB_restapi pluginApis[]= {
-  {"init"    , AFB_SESSION_CREATE, (AFB_apiCB)init      , "Audio API - init"},
+  {"init"    , AFB_SESSION_CHECK,  (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"},
-  {"status"  , AFB_SESSION_RENEW,  (AFB_apiCB)status    , "Audio API - status"},
+  {"play"    , AFB_SESSION_CHECK,  (AFB_apiCB)play      , "Audio API - play"},
+  {"ping"    , AFB_SESSION_NONE,   (AFB_apiCB)ping      , "Audio API - ping"},
   {NULL}
 };
 
-PUBLIC AFB_plugin *audioRegister () {
+PUBLIC AFB_plugin *pluginRegister () {
     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;
+    plugin->freeCtxCB = (AFB_freeCtxCB)freeAudio;
 
     return (plugin);
 };