Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
naming: globally unic identifier
[src/app-framework-binder.git]
/
plugins
/
radio
/
radio-api.c
diff --git
a/plugins/radio/radio-api.c
b/plugins/radio/radio-api.c
index
919a875
..
bdb1768
100644
(file)
--- a/
plugins/radio/radio-api.c
+++ b/
plugins/radio/radio-api.c
@@
-26,6
+26,8
@@
/* ------ LOCAL HELPER FUNCTIONS --------- */
/* ------ LOCAL HELPER FUNCTIONS --------- */
+static pluginHandleT *the_radio = NULL;
+
/* detect new radio devices */
STATIC void updateRadioDevList(pluginHandleT *handle) {
/* detect new radio devices */
STATIC void updateRadioDevList(pluginHandleT *handle) {
@@
-116,9
+118,9
@@
STATIC AFB_error releaseRadio (pluginHandleT *handle, radioCtxHandleT *ctx) {
}
/* called when client session dies [e.g. client quits for more than 15mns] */
}
/* called when client session dies [e.g. client quits for more than 15mns] */
-STATIC void freeRadio (void *context
, void *handle
) {
+STATIC void freeRadio (void *context) {
- releaseRadio (
handle
, context);
+ releaseRadio (
the_radio
, context);
free (context);
}
free (context);
}
@@
-140,7
+142,7
@@
STATIC json_object* init (AFB_request *request) { /* AFB_SESSION_CHECK */
STATIC json_object* power (AFB_request *request) { /* AFB_SESSION_CHECK */
STATIC json_object* power (AFB_request *request) { /* AFB_SESSION_CHECK */
- pluginHandleT *handle =
(pluginHandleT*)request->handle
;
+ pluginHandleT *handle =
the_radio
;
radioCtxHandleT *ctx = (radioCtxHandleT*)request->context;
const char *value = getQueryValue (request, "value");
json_object *jresp;
radioCtxHandleT *ctx = (radioCtxHandleT*)request->context;
const char *value = getQueryValue (request, "value");
json_object *jresp;
@@
-176,6
+178,8
@@
STATIC json_object* power (AFB_request *request) { /* AFB_SESSION_CHECK */
jresp = json_object_new_object();
json_object_object_add (jresp, "power", json_object_new_string ("off"));
}
jresp = json_object_new_object();
json_object_object_add (jresp, "power", json_object_new_string ("off"));
}
+ else
+ jresp = NULL;
return jresp;
}
return jresp;
}
@@
-323,8
+327,8
@@
PUBLIC AFB_plugin* pluginRegister () {
plugin->prefix = "radio";
plugin->apis = pluginApis;
plugin->prefix = "radio";
plugin->apis = pluginApis;
- plugin->handle = initRadioPlugin();
plugin->freeCtxCB = (AFB_freeCtxCB)freeRadio;
plugin->freeCtxCB = (AFB_freeCtxCB)freeRadio;
- return (plugin);
+ radio = initRadioPlugin();
+ return plugin;
};
};