improves the build system

[src/app-framework-binder.git] / plugins / audio / audio-api.c

diff --git a/plugins/audio/audio-api.c b/plugins/audio/audio-api.c
index f8c51cc..8956f80 100644 (file)
--- a/plugins/audio/audio-api.c
+++ b/plugins/audio/audio-api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 "IoT.bzh"
+ * Copyright (C) 2015, 2016 "IoT.bzh"
  * Author "Manuel Bachmann"
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,8 +25,8 @@
 #include "audio-pulse.h"
 #endif
 
-#include "afb-plugin.h"
-#include "afb-req-itf.h"
+#include <afb/afb-plugin.h>
+#include <afb/afb-req-itf.h>
 
 /* ------ BACKEND FUNCTIONS ------- */
 
@@ -182,8 +182,7 @@ static void init (struct afb_req request) {        /* AFB_SESSION_CHECK */
 static void volume (struct afb_req request) {      /* AFB_SESSION_CHECK */
 
     audioCtxHandleT *ctx = (audioCtxHandleT*) afb_req_context_get(request);
-    struct afb_arg arg = afb_req_get (request, "value");
-    const char *value = arg.value;
+    const char *value = afb_req_value (request, "value");
     json_object *jresp;
     unsigned int volume[8], i;
     char *volume_i;
@@ -240,8 +239,7 @@ static void volume (struct afb_req request) {      /* AFB_SESSION_CHECK */
 static void channels (struct afb_req request) {    /* AFB_SESSION_CHECK */
 
     audioCtxHandleT *ctx = (audioCtxHandleT*) afb_req_context_get(request);
-    struct afb_arg arg = afb_req_get (request, "value");
-    const char *value = arg.value;
+    const char *value = afb_req_value (request, "value");
     json_object *jresp = json_object_new_object();
     char channels_str[256];
 
@@ -266,8 +264,7 @@ static void channels (struct afb_req request) {    /* AFB_SESSION_CHECK */
 static void mute (struct afb_req request) {        /* AFB_SESSION_CHECK */
 
     audioCtxHandleT *ctx = (audioCtxHandleT*) afb_req_context_get(request);
-    struct afb_arg arg = afb_req_get (request, "value");
-    const char *value = arg.value;
+    const char *value = afb_req_value (request, "value");
     json_object *jresp = json_object_new_object();
 
     /* no "?value=" parameter : return current state */
@@ -300,8 +297,7 @@ static void mute (struct afb_req request) {        /* AFB_SESSION_CHECK */
 static void play (struct afb_req request) {        /* AFB_SESSION_CHECK */
 
     audioCtxHandleT *ctx = (audioCtxHandleT*) afb_req_context_get(request);
-    struct afb_arg arg = afb_req_get (request, "value");
-    const char *value = arg.value;
+    const char *value = afb_req_value (request, "value");
     json_object *jresp = json_object_new_object();
 
     /* no "?value=" parameter : return current state */
@@ -334,7 +330,7 @@ static void ping (struct afb_req request) {         /* AFB_SESSION_NONE */
     afb_req_success (request, NULL, "Audio - Ping success");
 }
 
-static const struct AFB_restapi pluginApis[]= {
+static const struct AFB_verb_desc_v1 verbs[]= {
   {"init"    , AFB_SESSION_CHECK,  init      , "Audio API - init"},
   {"volume"  , AFB_SESSION_CHECK,  volume    , "Audio API - volume"},
   {"channels", AFB_SESSION_CHECK,  channels  , "Audio API - channels"},
@@ -345,13 +341,15 @@ static const struct AFB_restapi pluginApis[]= {
 };
 
 static const struct AFB_plugin pluginDesc = {
-    .type   = AFB_PLUGIN_JSON,
-    .info   = "Application Framework Binder - Audio plugin",
-    .prefix = "audio",
-    .apis   = pluginApis
+    .type   = AFB_PLUGIN_VERSION_1,
+    .v1 = {
+        .info   = "Application Framework Binder - Audio plugin",
+        .prefix = "audio",
+        .verbs   = verbs
+    }
 };
 
-const struct AFB_plugin *pluginRegister (const struct AFB_interface *itf)
+const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
 {
        return &pluginDesc;
 }