X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fradio%2Fradio-api.c;h=bdb1768fc50610ca50687f3ad13d02af2903f4f1;hb=3259015486ecc8e246b1b69b36235d24e9d9c2ea;hp=02f6330c9ff2275212e31f21211e2b8732321ab9;hpb=41c462374fb25fae29f3b4a28eb99fdb639e8547;p=src%2Fapp-framework-binder.git

diff --git a/plugins/radio/radio-api.c b/plugins/radio/radio-api.c
index 02f6330c..bdb1768f 100644
--- a/plugins/radio/radio-api.c
+++ b/plugins/radio/radio-api.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 "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
@@ -16,7 +17,6 @@
  */
 
 #include "radio-api.h"
-#include "radio-rtlsdr.h"
 
 /* ********************************************************
 
@@ -26,6 +26,8 @@
 
 /* ------ LOCAL HELPER FUNCTIONS --------- */
 
+static pluginHandleT *the_radio = NULL;
+
 /* detect new radio devices */
 STATIC void updateRadioDevList(pluginHandleT *handle) {
 
@@ -96,40 +98,54 @@ 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);
+    }
 
-   /* globally mark it as free */
-   handle->radios[ctx->idx]->used = FALSE;
+    /* power it off */
+    _radio_off (ctx->idx);
 
-   /* clean client context */
-   ctx->radio = NULL;
-   ctx->idx = -1;
+    /* globally mark it as free */
+    handle->radios[ctx->idx]->used = FALSE;
 
-   return AFB_SUCCESS;
+    /* clean client context */
+    ctx->radio = NULL;
+    ctx->idx = -1;
+
+    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) {
 
-    releaseRadio (client->plugin->handle, client->ctx);
-    free (client->ctx);
-    
-    return jsonNewMessage (AFB_SUCCESS, "Released radio and client context");
+    releaseRadio (the_radio, context);
+    free (context);
 }
 
 
 /* ------ PUBLIC PLUGIN FUNCTIONS --------- */
 
-STATIC json_object* power (AFB_request *request) {      /* AFB_SESSION_CREATE */
-    
-    pluginHandleT *handle = request->client->plugin->handle; 
-    radioCtxHandleT *ctx = (radioCtxHandleT*)request->client->ctx;
-    const char *value = getQueryValue (request, "value");
+STATIC json_object* init (AFB_request *request) {        /* AFB_SESSION_CHECK */
+
     json_object *jresp;
 
-    /* create a private client context if needed */
-    if (!ctx) ctx = initRadioCtx();
+    /* create a private client context */
+    if (!request->context)
+        request->context = initRadioCtx();
+
+    jresp = json_object_new_object();
+    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 = the_radio;
+    radioCtxHandleT *ctx = (radioCtxHandleT*)request->context;
+    const char *value = getQueryValue (request, "value");
+    json_object *jresp;
 
     /* no "?value=" parameter : return current state */
     if (!value) {
@@ -139,8 +155,8 @@ STATIC json_object* power (AFB_request *request) {      /* AFB_SESSION_CREATE */
           : 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;
@@ -151,8 +167,8 @@ STATIC json_object* power (AFB_request *request) {      /* AFB_SESSION_CREATE */
         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;
@@ -162,39 +178,36 @@ STATIC json_object* power (AFB_request *request) {      /* AFB_SESSION_CREATE */
         jresp = json_object_new_object();
         json_object_object_add (jresp, "power", json_object_new_string ("off"));
     }
+    else
+        jresp = NULL;
 
     return jresp;
 }
 
 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"));
     }
     
@@ -203,22 +216,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));
     }
@@ -228,33 +243,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"));
     }
     
@@ -263,64 +274,61 @@ 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 *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);
-
-        jresp = json_object_new_object();
         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);
-
-        jresp = json_object_new_object();
-        json_object_object_add (jresp, "play-on", json_object_new_string ("off"));
+        json_object_object_add (jresp, "play", json_object_new_string ("off"));
     }
 
     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");
 }
 
 
 STATIC AFB_restapi pluginApis[]= {
-  {"power"  , AFB_SESSION_CREATE, (AFB_apiCB)power      , "Radio API - power"},
+  {"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"},
-  {"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";
     plugin->prefix  = "radio";
     plugin->apis  = pluginApis;
 
-    plugin->handle = initRadioPlugin();
-    plugin->freeCtxCB = freeRadio;
+    plugin->freeCtxCB = (AFB_freeCtxCB)freeRadio;
 
-    return (plugin);
+    radio = initRadioPlugin();
+    return plugin;
 };