Final modifications for Radio-Audio API communication

Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh>

3 files changed, 44 insertions, 9 deletions

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index c9b7be53..ae317b8e 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -4,6 +4,7 @@
     <df root="." name="0">
       <df name="plugins">
         <df name="audio">
+          <in>audio-alsa.c</in>
           <in>audio-api.c</in>
         </df>
         <df name="radio">
@@ -87,6 +88,8 @@
           <incDir>
             <pElem>include</pElem>
             <pElem>/usr/include/json-c</pElem>
+            <pElem>/usr/include/uuid</pElem>
+            <pElem>/usr/include/alsa</pElem>
             <pElem>/usr/include/libusb-1.0</pElem>
             <pElem>build/plugins</pElem>
           </incDir>
@@ -96,7 +99,6 @@
         <cTool>
           <incDir>
             <pElem>plugins/audio</pElem>
-            <pElem>/usr/include/uuid</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -111,7 +113,6 @@
         <cTool>
           <incDir>
             <pElem>plugins/samples</pElem>
-            <pElem>/usr/include/uuid</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -119,12 +120,33 @@
         <cTool>
           <incDir>
             <pElem>plugins/session</pElem>
-            <pElem>/usr/include/uuid</pElem>
           </incDir>
+          <preprocessorList>
+            <Elem>__PIC__=2</Elem>
+            <Elem>__REGISTER_PREFIX__=</Elem>
+            <Elem>__USER_LABEL_PREFIX__=</Elem>
+            <Elem>__pic__=2</Elem>
+          </preprocessorList>
         </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>
+      </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>
       </item>
       <item path="plugins/radio/radio-api.c" ex="false" tool="0" flavor2="2">
@@ -132,6 +154,7 @@
           <incDir>
             <pElem>/usr/include/json-c</pElem>
             <pElem>include</pElem>
+            <pElem>plugins/audio</pElem>
             <pElem>/usr/include/uuid</pElem>
             <pElem>build/plugins</pElem>
           </incDir>
@@ -140,6 +163,7 @@
       <item path="plugins/radio/radio-rtlsdr.c" ex="false" tool="0" flavor2="2">
         <cTool flags="1">
           <incDir>
+            <pElem>plugins/audio</pElem>
             <pElem>include</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/uuid</pElem>
@@ -193,6 +217,7 @@
             <pElem>build/src</pElem>
           </incDir>
           <preprocessorList>
+            <Elem>HAVE_AUDIO_PLUGIN=1</Elem>
             <Elem>HAVE_RADIO_PLUGIN=1</Elem>
             <Elem>__PIC__=2</Elem>
             <Elem>__REGISTER_PREFIX__=</Elem>
@@ -225,6 +250,7 @@
             <pElem>build/src</pElem>
           </incDir>
           <preprocessorList>
+            <Elem>HAVE_AUDIO_PLUGIN=1</Elem>
             <Elem>HAVE_RADIO_PLUGIN=1</Elem>
             <Elem>__PIC__=2</Elem>
             <Elem>__REGISTER_PREFIX__=</Elem>
@@ -243,6 +269,7 @@
             <pElem>build/src</pElem>
           </incDir>
           <preprocessorList>
+            <Elem>HAVE_AUDIO_PLUGIN=1</Elem>
             <Elem>HAVE_RADIO_PLUGIN=1</Elem>
             <Elem>__PIC__=2</Elem>
             <Elem>__REGISTER_PREFIX__=</Elem>
@@ -279,6 +306,7 @@
             <pElem>build/src</pElem>
           </incDir>
           <preprocessorList>
+            <Elem>HAVE_AUDIO_PLUGIN=1</Elem>
             <Elem>HAVE_RADIO_PLUGIN=1</Elem>
             <Elem>__PIC__=2</Elem>
             <Elem>__REGISTER_PREFIX__=</Elem>
@@ -297,6 +325,7 @@
             <pElem>build/src</pElem>
           </incDir>
           <preprocessorList>
+            <Elem>HAVE_AUDIO_PLUGIN=1</Elem>
             <Elem>HAVE_RADIO_PLUGIN=1</Elem>
             <Elem>__PIC__=2</Elem>
             <Elem>__REGISTER_PREFIX__=</Elem>
diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml
index e198cc10..9a82aa63 100644
--- a/nbproject/private/configurations.xml
+++ b/nbproject/private/configurations.xml
@@ -48,7 +48,10 @@
       </df>
       <df name="plugins">
         <df name="audio">
+          <in>audio-alsa.c</in>
+          <in>audio-alsa.h</in>
           <in>audio-api.c</in>
+          <in>audio-api.h</in>
         </df>
         <df name="radio">
           <in>radio-api.c</in>
@@ -156,8 +159,6 @@
         <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/nbproject/private/private.xml b/nbproject/private/private.xml
index 10916bd0..6d359089 100644
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -7,10 +7,15 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/home/mbc/git/afb-daemon-newapi/include/local-def.h</file>
-            <file>file:/home/mbc/git/afb-daemon-newapi/src/radio-api.c</file>
-            <file>file:/home/mbc/git/afb-daemon-newapi/src/afbs-api.c</file>
-            <file>file:/home/mbc/git/afb-daemon-newapi/src/dbus-api.c</file>
+            <file>file:/home/mbc/git/afb-daemon-newapi2/plugins/audio/audio-api.c</file>
+            <file>file:/home/mbc/git/afb-daemon-newapi2/plugins/radio/radio-api.c</file>
+            <file>file:/home/mbc/git/afb-daemon-newapi2/src/main.c</file>
+            <file>file:/home/mbc/git/afb-daemon-newapi2/plugins/radio/radio-api.h</file>
+            <file>file:/home/mbc/git/afb-daemon-newapi2/plugins/audio/audio-alsa.c</file>
+            <file>file:/home/mbc/git/afb-daemon-newapi2/plugins/radio/radio-rtlsdr.c</file>
+            <file>file:/home/mbc/git/afb-daemon-newapi2/include/local-def.h</file>
+            <file>file:/home/mbc/git/afb-daemon-newapi2/plugins/audio/audio-api.h</file>
+            <file>file:/home/mbc/git/afb-daemon-newapi2/plugins/audio/audio-alsa.h</file>
         </group>
     </open-files>
 </project-private>