[DEV] update Catkin

catkin/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(drain)
+project(audio_drain)
 
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
@@ -44,21 +44,21 @@ include_directories(
 
 ## Declare a cpp library
 add_library(${PROJECT_NAME}
-  ../${PROJECT_NAME}/debug.cpp
+  ../audio/drain/debug.cpp
-  ../${PROJECT_NAME}/airtalgo.cpp
+  ../audio/drain/airtalgo.cpp
-  ../${PROJECT_NAME}/Algo.cpp
+  ../audio/drain/Algo.cpp
-  ../${PROJECT_NAME}/ChannelReorder.cpp
+  ../audio/drain/ChannelReorder.cpp
-  ../${PROJECT_NAME}/CircularBuffer.cpp
+  ../audio/drain/CircularBuffer.cpp
-  ../${PROJECT_NAME}/EndPointCallback.cpp
+  ../audio/drain/EndPointCallback.cpp
-  ../${PROJECT_NAME}/EndPoint.cpp
+  ../audio/drain/EndPoint.cpp
-  ../${PROJECT_NAME}/EndPointRead.cpp
+  ../audio/drain/EndPointRead.cpp
-  ../${PROJECT_NAME}/EndPointWrite.cpp
+  ../audio/drain/EndPointWrite.cpp
-  ../${PROJECT_NAME}/FormatUpdate.cpp
+  ../audio/drain/FormatUpdate.cpp
-  ../${PROJECT_NAME}/Process.cpp
+  ../audio/drain/Process.cpp
-  ../${PROJECT_NAME}/Resampler.cpp
+  ../audio/drain/Resampler.cpp
-  ../${PROJECT_NAME}/Volume.cpp
+  ../audio/drain/Volume.cpp
-  ../${PROJECT_NAME}/IOFormatInterface.cpp
+  ../audio/drain/IOFormatInterface.cpp
-  ../${PROJECT_NAME}/AutoLogInOut.cpp
+  ../audio/drain/AutoLogInOut.cpp
 )
 
 #message("libspeex DSP file: ${LIB_SPEEX_DSP}")
@@ -83,7 +83,7 @@ install(TARGETS ${PROJECT_NAME}
 )
 
 ## Mark cpp header files for installation
-install(DIRECTORY ../${PROJECT_NAME}/
+install(DIRECTORY ../audio/drain/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
   FILES_MATCHING PATTERN "*.h"
 )

catkin/package.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <package>
-  <name>drain</name>
+  <name>audio_drain</name>
   <version>0.1.0</version>
   <description>Ewol audio basic flow algo (really simple)</description>
   <maintainer email="yui.heero@gmail.com">Edouard DUPIN</maintainer>