X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fradio%2Fradio-api.c;h=09fbcb5587c37d67cf2cf690d2cd85054182ecd1;hb=97cfff753ccb7e5739ebe53e43a5af29dc0f6577;hp=8754b63c006a6c70cb127971783bc3bed7229b60;hpb=3bce4a6a8648c91b6ddea478116b3b0679ef4648;p=src%2Fapp-framework-binder.git diff --git a/plugins/radio/radio-api.c b/plugins/radio/radio-api.c index 8754b63c..09fbcb55 100644 --- a/plugins/radio/radio-api.c +++ b/plugins/radio/radio-api.c @@ -97,26 +97,30 @@ STATIC AFB_error reserveRadio (pluginHandleT *handle, radioCtxHandleT *ctx) { /* free a radio device from requesting client, power it off */ STATIC AFB_error releaseRadio (pluginHandleT *handle, radioCtxHandleT *ctx) { - /* power it off */ - _radio_off (ctx->idx); + /* stop playing if it was doing this (blocks otherwise) */ + if (ctx->is_playing) { + ctx->is_playing = 0; + _radio_stop (ctx->idx); + } + + /* power it off */ + _radio_off (ctx->idx); - /* globally mark it as free */ - handle->radios[ctx->idx]->used = FALSE; + /* globally mark it as free */ + handle->radios[ctx->idx]->used = FALSE; - /* clean client context */ - ctx->radio = NULL; - ctx->idx = -1; + /* clean client context */ + ctx->radio = NULL; + ctx->idx = -1; - return AFB_SUCCESS; + return AFB_SUCCESS; } /* called when client session dies [e.g. client quits for more than 15mns] */ -STATIC json_object* freeRadio (AFB_clientCtx *client) { +STATIC void freeRadio (void *context, void *handle) { - releaseRadio (client->plugin->handle, client->ctx); - free (client->ctx); - - return jsonNewMessage (AFB_SUCCESS, "Released radio and client context"); + releaseRadio (handle, context); + free (context); } @@ -124,21 +128,20 @@ STATIC json_object* freeRadio (AFB_clientCtx *client) { STATIC json_object* init (AFB_request *request) { /* AFB_SESSION_CREATE */ - radioCtxHandleT *ctx; json_object *jresp; /* create a private client context */ - ctx = initRadioCtx(); - request->client->ctx = (radioCtxHandleT*)ctx; + request->context = initRadioCtx(); jresp = json_object_new_object(); - json_object_object_add(jresp, "token", json_object_new_string (request->client->token)); + json_object_object_add(jresp, "info", json_object_new_string ("Radio initialized")); + return jresp; } STATIC json_object* power (AFB_request *request) { /* AFB_SESSION_CHECK */ - - pluginHandleT *handle = request->client->plugin->handle; - radioCtxHandleT *ctx = (radioCtxHandleT*)request->client->ctx; + + pluginHandleT *handle = (pluginHandleT*)request->plugin; + radioCtxHandleT *ctx = (radioCtxHandleT*)request->context; const char *value = getQueryValue (request, "value"); json_object *jresp; @@ -150,8 +153,8 @@ STATIC json_object* power (AFB_request *request) { /* AFB_SESSION_CHECK */ : json_object_object_add (jresp, "power", 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") ) { if (!ctx->radio) { if (reserveRadio (handle, ctx) == AFB_FAIL) { request->errcode = MHD_HTTP_SERVICE_UNAVAILABLE; @@ -162,8 +165,8 @@ STATIC json_object* power (AFB_request *request) { /* AFB_SESSION_CHECK */ json_object_object_add (jresp, "power", 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") ) { if (ctx->radio) { if (releaseRadio (handle, ctx) == AFB_FAIL) { request->errcode = MHD_HTTP_SERVICE_UNAVAILABLE; @@ -179,33 +182,28 @@ STATIC json_object* power (AFB_request *request) { /* AFB_SESSION_CHECK */ STATIC json_object* mode (AFB_request *request) { /* AFB_SESSION_CHECK */ - radioCtxHandleT *ctx = (radioCtxHandleT*)request->client->ctx; + radioCtxHandleT *ctx = (radioCtxHandleT*)request->context; const char *value = getQueryValue (request, "value"); - json_object *jresp; + json_object *jresp = json_object_new_object(); /* no "?value=" parameter : return current state */ - if (!value) { - jresp = json_object_new_object(); + if (!value || !ctx->radio) { ctx->mode ? json_object_object_add (jresp, "mode", json_object_new_string ("AM")) : json_object_object_add (jresp, "mode", json_object_new_string ("FM")); } - /* "?value=" parameter is "1" or "on" */ + /* "?value=" parameter is "1" or "AM" */ else if ( atoi(value) == 1 || !strcasecmp(value, "AM") ) { ctx->mode = AM; _radio_set_mode (ctx->idx, ctx->mode); - - jresp = json_object_new_object(); json_object_object_add (jresp, "mode", json_object_new_string ("AM")); } - /* "?value=" parameter is "0" or "off" */ + /* "?value=" parameter is "0" or "FM" */ else if ( atoi(value) == 0 || !strcasecmp(value, "FM") ) { ctx->mode = FM; _radio_set_mode (ctx->idx, ctx->mode); - - jresp = json_object_new_object(); json_object_object_add (jresp, "mode", json_object_new_string ("FM")); } @@ -214,22 +212,24 @@ STATIC json_object* mode (AFB_request *request) { /* AFB_SESSION_CHECK */ STATIC json_object* freq (AFB_request *request) { /* AFB_SESSION_CHECK */ - radioCtxHandleT *ctx = (radioCtxHandleT*)request->client->ctx; + radioCtxHandleT *ctx = (radioCtxHandleT*)request->context; const char *value = getQueryValue (request, "value"); json_object *jresp = json_object_new_object(); + double freq; char freq_str[256]; /* no "?value=" parameter : return current state */ - if (!value) { + if (!value || !ctx->radio) { snprintf (freq_str, sizeof(freq_str), "%f", ctx->freq); json_object_object_add (jresp, "freq", json_object_new_string (freq_str)); } /* "?value=" parameter, set frequency */ else { - ctx->freq = strtof (value, NULL); - _radio_set_freq (ctx->idx, ctx->freq); - + freq = strtod (value, NULL); + _radio_set_freq (ctx->idx, freq); + ctx->freq = (float)freq; + snprintf (freq_str, sizeof(freq_str), "%f", ctx->freq); json_object_object_add (jresp, "freq", json_object_new_string (freq_str)); } @@ -239,33 +239,29 @@ STATIC json_object* freq (AFB_request *request) { /* AFB_SESSION_CHECK */ STATIC json_object* mute (AFB_request *request) { /* AFB_SESSION_CHECK */ - radioCtxHandleT *ctx = (radioCtxHandleT*)request->client->ctx; + radioCtxHandleT *ctx = (radioCtxHandleT*)request->context; const char *value = getQueryValue (request, "value"); - json_object *jresp; + json_object *jresp = json_object_new_object(); char *mute_str; /* no "?value=" parameter : return current state */ - if (!value) { + if (!value || !ctx->radio) { 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; _radio_set_mute (ctx->idx, ctx->mute); - - jresp = json_object_new_object(); json_object_object_add (jresp, "mute", json_object_new_string ("on")); } - /* "?value=" parameter is "0" or "off" */ + /* "?value=" parameter is "0" or "false" */ else if ( atoi(value) == 0 || !strcasecmp(value, "off") ) { ctx->mute = 0; _radio_set_mute (ctx->idx, ctx->mute); - - jresp = json_object_new_object(); json_object_object_add (jresp, "mute", json_object_new_string ("off")); } @@ -274,27 +270,27 @@ STATIC json_object* mute (AFB_request *request) { /* AFB_SESSION_CHECK */ STATIC json_object* play (AFB_request *request) { /* AFB_SESSION_CHECK */ - radioCtxHandleT *ctx = (radioCtxHandleT*)request->client->ctx; + radioCtxHandleT *ctx = (radioCtxHandleT*)request->context; const char *value = getQueryValue (request, "value"); json_object *jresp = json_object_new_object(); /* no "?value=" parameter : return current state */ - if (!value) { + if (!value || !ctx->radio) { 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 "on" */ - else if ( atoi(value) == 1 || !strcasecmp(value, "on") ) { + /* "?value=" parameter is "1" or "true" */ + else if ( atoi(value) == 1 || !strcasecmp(value, "true") ) { /* radio playback */ ctx->is_playing = 1; _radio_play (ctx->idx); json_object_object_add (jresp, "play", 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") ) { /* radio stop */ ctx->is_playing = 0; _radio_stop (ctx->idx); @@ -304,8 +300,8 @@ STATIC json_object* play (AFB_request *request) { /* AFB_SESSION_CHECK */ return jresp; } -STATIC json_object* status (AFB_request *request) { - return NULL; +STATIC json_object* ping (AFB_request *request) { /* AFB_SESSION_NONE */ + return jsonNewMessage(AFB_SUCCESS, "Ping Binder Daemon - Radio API"); } @@ -316,11 +312,11 @@ STATIC AFB_restapi pluginApis[]= { {"freq" , AFB_SESSION_CHECK, (AFB_apiCB)freq , "Radio API - freq"}, {"mute" , AFB_SESSION_CHECK, (AFB_apiCB)mute , "Radio API - mute"}, {"play" , AFB_SESSION_CHECK, (AFB_apiCB)play , "Radio API - play"}, - {"status" , AFB_SESSION_RENEW, (AFB_apiCB)status , "Radio API - status"}, + {"ping" , AFB_SESSION_NONE, (AFB_apiCB)ping , "Radio API - ping"}, {NULL} }; -PUBLIC AFB_plugin* radioRegister () { +PUBLIC AFB_plugin* pluginRegister () { AFB_plugin *plugin = malloc (sizeof(AFB_plugin)); plugin->type = AFB_PLUGIN_JSON; plugin->info = "Application Framework Binder - Radio plugin"; @@ -328,7 +324,7 @@ PUBLIC AFB_plugin* radioRegister () { plugin->apis = pluginApis; plugin->handle = initRadioPlugin(); - plugin->freeCtxCB = freeRadio; + plugin->freeCtxCB = (AFB_freeCtxCB)freeRadio; return (plugin); };