X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fradio%2Fradio-api.c;h=919a875f6745832f077ea43b074a1cf7f40520d9;hb=e3320f303c4eb8f7fe0fac69bfa9ce36d9916930;hp=3048f7b3a7042539e17941de99cee4220dcbf1fd;hpb=61354a55ac2abd9e83e1f869cdb735654d6eb74a;p=src%2Fapp-framework-binder.git

diff --git a/plugins/radio/radio-api.c b/plugins/radio/radio-api.c
index 3048f7b3..919a875f 100644
--- a/plugins/radio/radio-api.c
+++ b/plugins/radio/radio-api.c
@@ -17,7 +17,6 @@
  */
 
 #include "radio-api.h"
-#include "radio-rtlsdr.h"
 
 /* ********************************************************
 
@@ -117,35 +116,32 @@ STATIC AFB_error releaseRadio (pluginHandleT *handle, radioCtxHandleT *ctx) {
 }
 
 /* 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);
 }
 
 
 /* ------ PUBLIC PLUGIN FUNCTIONS --------- */
 
-STATIC json_object* init (AFB_request *request) {       /* AFB_SESSION_CREATE */
+STATIC json_object* init (AFB_request *request) {        /* AFB_SESSION_CHECK */
 
-    radioCtxHandleT *ctx;
     json_object *jresp;
 
     /* create a private client context */
-    ctx = initRadioCtx();
-    request->client->ctx = (radioCtxHandleT*)ctx;
+    if (!request->context)
+        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->handle;
+    radioCtxHandleT *ctx = (radioCtxHandleT*)request->context;
     const char *value = getQueryValue (request, "value");
     json_object *jresp;
 
@@ -186,7 +182,7 @@ 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_new_object();
 
@@ -216,9 +212,10 @@ 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 */
@@ -229,8 +226,9 @@ STATIC json_object* freq (AFB_request *request) {        /* AFB_SESSION_CHECK */
 
     /* "?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));
@@ -241,7 +239,7 @@ 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_new_object();
     char *mute_str;
@@ -272,7 +270,7 @@ 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();
     
@@ -302,30 +300,23 @@ STATIC json_object* play (AFB_request *request) {        /* AFB_SESSION_CHECK */
     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");
 }
 
 
 STATIC AFB_restapi pluginApis[]= {
-  {"init"   , AFB_SESSION_CREATE, (AFB_apiCB)init       , "Radio API - init"},
+  {"init"   , AFB_SESSION_CHECK,  (AFB_apiCB)init       , "Radio API - init"},
   {"power"  , AFB_SESSION_CHECK,  (AFB_apiCB)power      , "Radio API - power"},
   {"mode"   , AFB_SESSION_CHECK,  (AFB_apiCB)mode       , "Radio API - mode"},
   {"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"},
-  {"refresh", AFB_SESSION_RENEW,  (AFB_apiCB)refresh    , "Radio API - refresh"},
   {"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";
@@ -333,7 +324,7 @@ PUBLIC AFB_plugin* radioRegister () {
     plugin->apis  = pluginApis;
 
     plugin->handle = initRadioPlugin();
-    plugin->freeCtxCB = freeRadio;
+    plugin->freeCtxCB = (AFB_freeCtxCB)freeRadio;
 
     return (plugin);
 };