Fixe

4 files changed, 44 insertions, 65 deletions

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 522e7a70..c4d8a5ef 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -64,8 +64,9 @@
         <rebuildPropChanged>false</rebuildPropChanged>
       </toolsSet>
       <flagsDictionary>
-        <element flagsID="0" commonFlags="-fPIE"/>
-        <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -fPIC"/>
+        <element flagsID="0" commonFlags="-fPIC"/>
+        <element flagsID="1" commonFlags="-fPIE"/>
+        <element flagsID="2" commonFlags="-mtune=generic -march=x86-64 -fPIC"/>
       </flagsDictionary>
       <codeAssistance>
       </codeAssistance>
@@ -75,7 +76,7 @@
           <buildCommand>${MAKE} -f Makefile</buildCommand>
           <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
           <executablePath>build/afb-daemon</executablePath>
-          <cTool flags="1">
+          <cTool flags="2">
           </cTool>
         </makeTool>
         <preBuild>
@@ -97,7 +98,7 @@
       <folder path="0/plugins/audio">
         <cTool>
           <incDir>
-            <pElem>plugins/audio</pElem>
+            <pElem>build/plugins</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -114,7 +115,6 @@
       <folder path="0/plugins/samples">
         <cTool>
           <incDir>
-            <pElem>plugins/samples</pElem>
             <pElem>build/plugins</pElem>
           </incDir>
         </cTool>
@@ -122,53 +122,40 @@
       <folder path="0/plugins/session">
         <cTool>
           <incDir>
-            <pElem>plugins/session</pElem>
             <pElem>build/plugins</pElem>
           </incDir>
         </cTool>
       </folder>
       <item path="plugins/audio/audio-alsa.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
-          <incDir>
-            <pElem>include</pElem>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>/usr/include/uuid</pElem>
-            <pElem>build/plugins</pElem>
-          </incDir>
+        <cTool flags="0">
         </cTool>
       </item>
       <item path="plugins/audio/audio-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
-          <incDir>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>include</pElem>
-            <pElem>/usr/include/uuid</pElem>
-            <pElem>build/plugins</pElem>
-          </incDir>
+        <cTool flags="0">
         </cTool>
       </item>
       <item path="plugins/radio/radio-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
+        <cTool flags="2">
         </cTool>
       </item>
       <item path="plugins/radio/radio-rtlsdr.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
+        <cTool flags="2">
         </cTool>
       </item>
       <item path="plugins/samples/HelloWorld.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
+        <cTool flags="0">
         </cTool>
       </item>
       <item path="plugins/samples/SamplePost.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
+        <cTool flags="0">
         </cTool>
       </item>
       <item path="plugins/session/token-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
+        <cTool flags="0">
         </cTool>
       </item>
       <item path="src/afbs-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="0">
+        <cTool flags="1">
           <incDir>
             <pElem>plugins/audio</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -182,7 +169,7 @@
         </cTool>
       </item>
       <item path="src/alsa-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="0">
+        <cTool flags="1">
           <incDir>
             <pElem>plugins/audio</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -196,25 +183,21 @@
         </cTool>
       </item>
       <item path="src/config.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
+        <cTool flags="0">
           <incDir>
-            <pElem>src</pElem>
-            <pElem>/usr/include/json-c</pElem>
             <pElem>include</pElem>
+            <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/uuid</pElem>
+            <pElem>/usr/include/alsa</pElem>
             <pElem>build/src</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HAVE_AUDIO_PLUGIN=1</Elem>
-            <Elem>__PIC__=2</Elem>
-            <Elem>__REGISTER_PREFIX__=</Elem>
-            <Elem>__USER_LABEL_PREFIX__=</Elem>
-            <Elem>__pic__=2</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="src/dbus-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="0">
+        <cTool flags="1">
           <incDir>
             <pElem>plugins/audio</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -228,43 +211,35 @@
         </cTool>
       </item>
       <item path="src/http-svc.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
+        <cTool flags="0">
           <incDir>
-            <pElem>src</pElem>
-            <pElem>/usr/include/json-c</pElem>
             <pElem>include</pElem>
+            <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/uuid</pElem>
+            <pElem>/usr/include/alsa</pElem>
             <pElem>build/src</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HAVE_AUDIO_PLUGIN=1</Elem>
-            <Elem>__PIC__=2</Elem>
-            <Elem>__REGISTER_PREFIX__=</Elem>
-            <Elem>__USER_LABEL_PREFIX__=</Elem>
-            <Elem>__pic__=2</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="src/main.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
+        <cTool flags="0">
           <incDir>
-            <pElem>src</pElem>
-            <pElem>/usr/include/json-c</pElem>
             <pElem>include</pElem>
+            <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/uuid</pElem>
+            <pElem>/usr/include/alsa</pElem>
             <pElem>build/src</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HAVE_AUDIO_PLUGIN=1</Elem>
-            <Elem>__PIC__=2</Elem>
-            <Elem>__REGISTER_PREFIX__=</Elem>
-            <Elem>__USER_LABEL_PREFIX__=</Elem>
-            <Elem>__pic__=2</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="src/radio-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="0">
+        <cTool flags="1">
           <incDir>
             <pElem>plugins/audio</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -282,38 +257,30 @@
         </cTool>
       </item>
       <item path="src/rest-api.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
+        <cTool flags="0">
           <incDir>
-            <pElem>src</pElem>
-            <pElem>/usr/include/json-c</pElem>
             <pElem>include</pElem>
+            <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/uuid</pElem>
+            <pElem>/usr/include/alsa</pElem>
             <pElem>build/src</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HAVE_AUDIO_PLUGIN=1</Elem>
-            <Elem>__PIC__=2</Elem>
-            <Elem>__REGISTER_PREFIX__=</Elem>
-            <Elem>__USER_LABEL_PREFIX__=</Elem>
-            <Elem>__pic__=2</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="src/session.c" ex="false" tool="0" flavor2="2">
-        <cTool flags="1">
+        <cTool flags="0">
           <incDir>
-            <pElem>src</pElem>
+            <pElem>include</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/uuid</pElem>
-            <pElem>include</pElem>
+            <pElem>/usr/include/alsa</pElem>
             <pElem>build/src</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HAVE_AUDIO_PLUGIN=1</Elem>
-            <Elem>__PIC__=2</Elem>
-            <Elem>__REGISTER_PREFIX__=</Elem>
-            <Elem>__USER_LABEL_PREFIX__=</Elem>
-            <Elem>__pic__=2</Elem>
           </preprocessorList>
         </cTool>
       </item>
diff --git a/nbproject/private/Default.properties b/nbproject/private/Default.properties
index e69de29b..df9c96c1 100644
--- a/nbproject/private/Default.properties
+++ b/nbproject/private/Default.properties
@@ -0,0 +1,10 @@
+/home/fulup/Workspace/afb-daemon/src/session.c=/home/fulup/Workspace/afb-daemon/build/src#-DHAVE_AUDIO_PLUGIN=1 -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/src.dir/session.c.o -c /home/fulup/Workspace/afb-daemon/src/session.c
+/home/fulup/Workspace/afb-daemon/src/main.c=/home/fulup/Workspace/afb-daemon/build/src#-DHAVE_AUDIO_PLUGIN=1 -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/src.dir/main.c.o -c /home/fulup/Workspace/afb-daemon/src/main.c
+/home/fulup/Workspace/afb-daemon/src/http-svc.c=/home/fulup/Workspace/afb-daemon/build/src#-DHAVE_AUDIO_PLUGIN=1 -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/src.dir/http-svc.c.o -c /home/fulup/Workspace/afb-daemon/src/http-svc.c
+/home/fulup/Workspace/afb-daemon/src/rest-api.c=/home/fulup/Workspace/afb-daemon/build/src#-DHAVE_AUDIO_PLUGIN=1 -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/src.dir/rest-api.c.o -c /home/fulup/Workspace/afb-daemon/src/rest-api.c
+/home/fulup/Workspace/afb-daemon/src/config.c=/home/fulup/Workspace/afb-daemon/build/src#-DHAVE_AUDIO_PLUGIN=1 -g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/src.dir/config.c.o -c /home/fulup/Workspace/afb-daemon/src/config.c
+/home/fulup/Workspace/afb-daemon/plugins/session/token-api.c=/home/fulup/Workspace/afb-daemon/build/plugins#-g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/plugins.dir/session/token-api.c.o -c /home/fulup/Workspace/afb-daemon/plugins/session/token-api.c
+/home/fulup/Workspace/afb-daemon/plugins/audio/audio-api.c=/home/fulup/Workspace/afb-daemon/build/plugins#-g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/plugins.dir/audio/audio-api.c.o -c /home/fulup/Workspace/afb-daemon/plugins/audio/audio-api.c
+/home/fulup/Workspace/afb-daemon/plugins/audio/audio-alsa.c=/home/fulup/Workspace/afb-daemon/build/plugins#-g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/plugins.dir/audio/audio-alsa.c.o -c /home/fulup/Workspace/afb-daemon/plugins/audio/audio-alsa.c
+/home/fulup/Workspace/afb-daemon/plugins/samples/HelloWorld.c=/home/fulup/Workspace/afb-daemon/build/plugins#-g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/plugins.dir/samples/HelloWorld.c.o -c /home/fulup/Workspace/afb-daemon/plugins/samples/HelloWorld.c
+/home/fulup/Workspace/afb-daemon/plugins/samples/SamplePost.c=/home/fulup/Workspace/afb-daemon/build/plugins#-g3 -gdwarf-2 -fPIC -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -I/usr/include/uuid -I/usr/include/alsa -o CMakeFiles/plugins.dir/samples/SamplePost.c.o -c /home/fulup/Workspace/afb-daemon/plugins/samples/SamplePost.c
diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml
index b9de233e..d48f5acd 100644
--- a/nbproject/private/configurations.xml
+++ b/nbproject/private/configurations.xml
@@ -155,6 +155,8 @@
         <gdb_interceptlist>
           <gdbinterceptoptions gdb_all="false" gdb_unhandled="true" gdb_unexpected="true"/>
         </gdb_interceptlist>
+        <gdb_signals>
+        </gdb_signals>
         <gdb_options>
           <DebugOptions>
           </DebugOptions>
diff --git a/plugins/samples/HelloWorld.c b/plugins/samples/HelloWorld.c
index 5638b427..870225b1 100644
--- a/plugins/samples/HelloWorld.c
+++ b/plugins/samples/HelloWorld.c
@@ -57,7 +57,7 @@ STATIC json_object* pingBug (AFB_request *request) {
 
 
 // For samples https://linuxprograms.wordpress.com/2010/05/20/json-c-libjson-tutorial/
-STATIC json_object* pingJson (AFB_session *session, AFB_request *request) {
+STATIC json_object* pingJson (AFB_request *request) {
     json_object *jresp, *embed;    
     
     jresp = json_object_new_object();