X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Faudio%2Faudio-api.c;h=915f8c6e1b03238bb806177134405226f500289b;hb=39a0ef5d1609e01f71039f9095c14cf6f3ca1a93;hp=0fcc73d173641e1bd4d39a3b23b54f10b74b3497;hpb=915d25a0c2fcff8a8bb189963f490e0894d05733;p=src%2Fapp-framework-binder.git diff --git a/plugins/audio/audio-api.c b/plugins/audio/audio-api.c index 0fcc73d1..915f8c6e 100644 --- a/plugins/audio/audio-api.c +++ b/plugins/audio/audio-api.c @@ -26,12 +26,15 @@ STATIC audioCtxHandleT* initAudioCtx () { audioCtxHandleT *ctx; + int i; ctx = malloc (sizeof(audioCtxHandleT)); 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; } @@ -81,28 +84,51 @@ STATIC json_object* volume (AFB_request *request) { /* AFB_SESSION_CHECK */ audioCtxHandleT *ctx = (audioCtxHandleT*)request->client->ctx; 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] = _alsa_get_volume (ctx->idx, 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]; + _alsa_set_volume (ctx->idx, 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) + _alsa_set_volume_all (ctx->idx, ctx->volume[0]); + if (!volume_i || 100 < atoi(volume_i) < 0) { + ctx->volume[i] = _alsa_get_volume (ctx->idx, i); + } else { + ctx->volume[i] = atoi(volume_i); + _alsa_set_volume (ctx->idx, 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)); } @@ -149,16 +175,16 @@ STATIC json_object* mute (AFB_request *request) { /* AFB_SESSION_CHECK */ : 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); json_object_object_add (jresp, "mute", json_object_new_string ("on")); } - /* "?value=" parameter is "0" or "off" */ - 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); @@ -168,8 +194,46 @@ 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->client->ctx; + 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; + _alsa_play (ctx->idx); + + 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; + _alsa_stop (ctx->idx); + + json_object_object_add (jresp, "play", json_object_new_string ("off")); + } + + return jresp; +} + +STATIC json_object* refresh (AFB_request *request) { /* AFB_SESSION_RENEW */ + 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"); } @@ -178,11 +242,13 @@ STATIC AFB_restapi pluginApis[]= { {"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"}, + {"refresh" , AFB_SESSION_RENEW, (AFB_apiCB)refresh , "Audio API - refresh"}, + {"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";