musicdsp/audio-river
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update Catkin

Browse Source
This commit is contained in:
Edouard DUPIN 2015-04-14 21:53:14 +02:00
parent 41f55ab83d
commit be5489bc73
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
catkin/CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3) cmake_minimum_required(VERSION 2.8.3)
project(river) project(audio_river)
set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_VERBOSE_MAKEFILE ON)
@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
find_package(catkin REQUIRED COMPONENTS find_package(catkin REQUIRED COMPONENTS
drain drain
audio audio
airtaudio audio_orchestra
ejson ejson
) )
@ -25,7 +25,7 @@ find_package(catkin REQUIRED COMPONENTS
catkin_package( catkin_package(
INCLUDE_DIRS ../ INCLUDE_DIRS ../
LIBRARIES ${PROJECT_NAME} LIBRARIES ${PROJECT_NAME}
CATKIN_DEPENDS airtaudio audio drain ejson CATKIN_DEPENDS audio_orchestra audio audio_drain ejson
DEPENDS system_lib DEPENDS system_lib
) )
@ -42,20 +42,20 @@ include_directories(
## Declare a cpp library ## Declare a cpp library
add_library(${PROJECT_NAME} add_library(${PROJECT_NAME}
../${PROJECT_NAME}/debug.cpp ../audio/river/debug.cpp
../${PROJECT_NAME}/river.cpp ../audio/river/river.cpp
../${PROJECT_NAME}/Manager.cpp ../audio/river/Manager.cpp
../${PROJECT_NAME}/Interface.cpp ../audio/river/Interface.cpp
../${PROJECT_NAME}/io/Group.cpp ../audio/river/io/Group.cpp
../${PROJECT_NAME}/io/Node.cpp ../audio/river/io/Node.cpp
../${PROJECT_NAME}/io/NodeAirTAudio.cpp ../audio/river/io/NodeOrchestra.cpp
../${PROJECT_NAME}/io/NodePortAudio.cpp ../audio/river/io/NodePortAudio.cpp
../${PROJECT_NAME}/io/NodeAEC.cpp ../audio/river/io/NodeAEC.cpp
../${PROJECT_NAME}/io/NodeMuxer.cpp ../audio/river/io/NodeMuxer.cpp
../${PROJECT_NAME}/io/Manager.cpp ../audio/river/io/Manager.cpp
) )
add_definitions(-D__AIRTAUDIO_INFERFACE__) add_definitions(-DAUDIO_RIVER_BUILD_ORCHESTRA)
## Specify libraries to link a library or executable target against ## Specify libraries to link a library or executable target against
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
@ -73,7 +73,7 @@ install(TARGETS ${PROJECT_NAME}
) )
## Mark cpp header files for installation ## Mark cpp header files for installation
install(DIRECTORY ../${PROJECT_NAME}/ install(DIRECTORY ../audio/river/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
FILES_MATCHING PATTERN "*.h" FILES_MATCHING PATTERN "*.h"
) )

8
catkin/package.xml
View File

@ -5,13 +5,13 @@
<description>Ewol River Intrerface : Is to multiple acces on different format on Audio IO</description> <description>Ewol River Intrerface : Is to multiple acces on different format on Audio IO</description>
<maintainer email="yui.heero@gmail.com">Edouard DUPIN</maintainer> <maintainer email="yui.heero@gmail.com">Edouard DUPIN</maintainer>
<license>Apache-2.0</license> <license>Apache-2.0</license>
<build_depend>drain</build_depend> <build_depend>audio_drain</build_depend>
<build_depend>audio</build_depend> <build_depend>audio</build_depend>
<build_depend>ejson</build_depend> <build_depend>ejson</build_depend>
<build_depend>airtaudio</build_depend> <build_depend>audio_orchestra</build_depend>
<buildtool_depend>catkin</buildtool_depend> <buildtool_depend>catkin</buildtool_depend>
<run_depend>drain</run_depend> <run_depend>audio_drain</run_depend>
<run_depend>audio</run_depend> <run_depend>audio</run_depend>
<run_depend>ejson</run_depend> <run_depend>ejson</run_depend>
<run_depend>airtaudio</run_depend> <run_depend>audio_orchestra</run_depend>
</package> </package>

4
test/catkin/CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3) cmake_minimum_required(VERSION 2.8.3)
project(river_test) project(audio_river_test)
set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_VERBOSE_MAKEFILE ON)
@ -7,7 +7,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages ## is used, also find other catkin packages
find_package(catkin REQUIRED COMPONENTS find_package(catkin REQUIRED COMPONENTS
river audio_river
) )
################################### ###################################

6
test/catkin/package.xml
View File

@ -1,13 +1,13 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<package> <package>
<name>river_test</name> <name>audio_river_test</name>
<version>0.3.0</version> <version>0.3.0</version>
<description>Ewol River test</description> <description>Ewol River test</description>
<maintainer email="yui.heero@gmail.com">Edouard DUPIN</maintainer> <maintainer email="yui.heero@gmail.com">Edouard DUPIN</maintainer>
<license>Apache-2.0</license> <license>Apache-2.0</license>
<build_depend>gtest</build_depend> <build_depend>gtest</build_depend>
<build_depend>river</build_depend> <build_depend>audio_river</build_depend>
<buildtool_depend>catkin</buildtool_depend> <buildtool_depend>catkin</buildtool_depend>
<run_depend>river</run_depend> <run_depend>audio_river</run_depend>
<run_depend>gtest</run_depend> <run_depend>gtest</run_depend>
</package> </package>

2
test/testPlaybackCallback.h
View File

@ -82,7 +82,7 @@ namespace river_test_playback_callback {
" io:'output',\n" " io:'output',\n"
" map-on:{\n" " map-on:{\n"
" interface:'auto',\n" " interface:'auto',\n"
" name:'hw:2,0',\n" " name:'default',\n"
" },\n" " },\n"
" frequency:0,\n" " frequency:0,\n"
" channel-map:['front-left', 'front-right'],\n" " channel-map:['front-left', 'front-right'],\n"