Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Institute of Technical Acoustics (ITA)
ITAStreaming
Commits
8c973c6f
Commit
8c973c6f
authored
Feb 13, 2017
by
Dipl.-Ing. Jonas Stienen
Browse files
Merge branch 'develop'
parents
1f2cf622
764476d9
Changes
14
Hide whitespace changes
Inline
Side-by-side
.gitignore
0 → 100644
View file @
8c973c6f
HTML
*.bat
*.mat
*.pdf
*.dll
*.exe
*.so*
Thumbs.db
.DS_Store
*.asv
*.wav
*.xlsx
*.docx
*.dll
*.csv
*.h5
*.ita
*.fig
*.png
*.jpeg
*.sofa
*.spk
*.unv
*.stl
svnaccess
*.lib
*.exp
CMakeLists.txt
View file @
8c973c6f
...
...
@@ -7,24 +7,25 @@ include( VistaCommon )
# dependencies
vista_use_package
(
ITABase REQUIRED FIND_DEPENDENCIES
)
vista_use_package
(
ASIO
)
vista_use_package
(
Portaudio
)
vista_use_package
(
ASIO QUIET
)
vista_use_package
(
Portaudio QUIET
)
vista_use_package
(
JACK QUIET
)
if
(
NOT DEFINED ITA_CORE_LIBS_BUILD_STATIC
)
set
(
ITA_CORE_LIBS_BUILD_STATIC OFF CACHE BOOL
"Build all ITA core libs in static mode"
)
endif
(
NOT DEFINED ITA_CORE_LIBS_BUILD_STATIC
)
endif
(
)
if
(
NOT DEFINED ITA_STREAMING_WITH_BACKEND_ASIO
)
set
(
ITA_STREAMING_WITH_BACKEND_ASIO
${
VASIO_FOUND
}
CACHE BOOL
"Build with ASIO for audio streaming"
)
endif
(
NOT DEFINED ITA_STREAMING_WITH_BACKEND_ASIO
)
endif
(
)
if
(
NOT DEFINED ITA_STREAMING_WITH_BACKEND_PORTAUDIO
)
set
(
ITA_STREAMING_WITH_BACKEND_PORTAUDIO OFF CACHE BOOL
"Build with Portaudio for audio streaming"
)
endif
(
NOT DEFINED ITA_STREAMING_WITH_BACKEND_PORTAUDIO
)
endif
(
)
if
(
NOT DEFINED ITA_STREAMING_WITH_BACKEND_VIRTUAL
)
set
(
ITA_STREAMING_WITH_BACKEND_VIRTUAL ON CACHE BOOL
"Build with virtual audio streaming backend"
)
endif
(
NOT DEFINED ITA_STREAMING_WITH_BACKEND_VIRTUAL
)
endif
(
)
# includes
...
...
@@ -57,40 +58,36 @@ set( ITAStreamingSources
if
(
ITA_STREAMING_WITH_BACKEND_ASIO AND VASIO_FOUND
)
set
(
ITAStreamingSources
"
${
ITAStreamingSources
}
"
"src/ITAStreamingBackendASIO.h"
"src/ITAStreamingBackendASIO.cpp"
)
add_definitions
(
-DITA_STREAMING_WITH_BACKEND_ASIO -DIEEE754_64FLOAT=1
)
endif
(
ITA_STREAMING_WITH_BACKEND_ASIO AND VASIO_FOUND
)
endif
(
)
if
(
ITA_STREAMING_WITH_BACKEND_PORTAUDIO AND VPORTAUDIO_FOUND
)
set
(
ITAStreamingSources
"
${
ITAStreamingSources
}
"
"src/ITAStreamingBackendPortaudio.h"
"src/ITAStreamingBackendPortaudio.cpp"
)
add_definitions
(
-DITA_STREAMING_WITH_BACKEND_PORTAUDIO
)
endif
(
ITA_STREAMING_WITH_BACKEND_PORTAUDIO AND VPORTAUDIO_FOUND
)
endif
(
)
if
(
ITA_STREAMING_WITH_BACKEND_VIRTUAL
)
set
(
ITAStreamingHeader
"
${
ITAStreamingHeader
}
"
"include/ITAStreamingVirtualDevice.h"
)
set
(
ITAStreamingSources
"
${
ITAStreamingSources
}
"
"src/ITAStreamingVirtualDevice.cpp"
)
endif
(
ITA_STREAMING_WITH_BACKEND_VIRTUAL
)
endif
(
)
# compiler
# compiler settings
if
(
NOT ITA_CORE_LIBS_BUILD_STATIC
)
if
(
ITA_VISTA_BUILD_STATIC
)
add_definitions
(
-DVISTABASE_STATIC -DVISTAMATH_STATIC -DVISTAASPECTS_STATIC -DVISTATOOLS_STATIC -DVISTAINTERPROCCOMM_STATIC
)
endif
(
)
if
(
BUILD_SHARED_LIBS
)
add_definitions
(
-DITA_STREAMING_EXPORT
)
else
(
NOT ITA_CORE_LIBS_BUILD_STATIC
)
add_definitions
(
-DITA_BASE_STATIC -ITA_STREAMING_STATIC
)
set
(
BUILD_SHARED_LIBS_TEMP
${
BUILD_SHARED_LIBS
}
)
if
(
BUILD_SHARED_LIBS
)
set
(
BUILD_SHARED_LIBS OFF
)
message
(
"Ignoring activated BUILD_SHARED_LIBS temporary because static ITA core libs requested"
)
endif
(
BUILD_SHARED_LIBS
)
endif
(
NOT ITA_CORE_LIBS_BUILD_STATIC
)
else
(
)
add_definitions
(
-ITA_STREAMING_STATIC -DITA_BASE_STATIC
)
endif
(
)
# linker
add_library
(
ITAStreaming
${
ITAStreamingHeader
}
${
ITAStreamingSources
}
)
target_link_libraries
(
ITAStreaming
${
VISTA_USE_PACKAGE_LIBRARIES
}
)
set
(
BUILD_SHARED_LIBS
${
BUILD_SHARED_LIBS_TEMP
}
)
# config
vista_configure_lib
(
ITAStreaming
)
...
...
@@ -103,5 +100,7 @@ set_property( TARGET ITAStreaming PROPERTY FOLDER "ITACoreLibs" )
# tests
set
(
ITASTREAMING_COMMON_BUILD TRUE
)
add_subdirectory
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/tests"
)
if
(
ITA_CORE_LIBS_WITH_TESTS
)
set
(
ITASTREAMING_COMMON_BUILD TRUE
)
add_subdirectory
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/tests"
)
endif
(
)
LICENSE.md
View file @
8c973c6f
Copyright 2015-201
6
Institute of Technical Acoustics, RWTH Aachen University
Copyright 2015-201
7
Institute of Technical Acoustics, RWTH Aachen University
Licensed under the Apache License, Version 2.0 (the "License");
you may not use files of this project except in compliance with the License.
...
...
include/ITAStreamingBackend.h
View file @
8c973c6f
...
...
@@ -3,7 +3,7 @@
*
* ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-201
6
* RWTH Aachen University, Germany, 2015-201
7
*
* ----------------------------------------------------------------
* ____ __________ _______
...
...
include/ITAStreamingComponent.h
View file @
8c973c6f
...
...
@@ -3,7 +3,7 @@
*
* ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-201
6
* RWTH Aachen University, Germany, 2015-201
7
*
* ----------------------------------------------------------------
* ____ __________ _______
...
...
include/ITAStreamingDefinitions.h
View file @
8c973c6f
...
...
@@ -3,7 +3,7 @@
*
* ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-201
6
* RWTH Aachen University, Germany, 2015-201
7
*
* ----------------------------------------------------------------
* ____ __________ _______
...
...
include/ITAStreamingDevice.h
View file @
8c973c6f
...
...
@@ -3,7 +3,7 @@
*
* ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-201
6
* RWTH Aachen University, Germany, 2015-201
7
*
* ----------------------------------------------------------------
* ____ __________ _______
...
...
include/ITAStreamingFunctionGenerator.h
View file @
8c973c6f
...
...
@@ -3,7 +3,7 @@
*
* ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-201
6
* RWTH Aachen University, Germany, 2015-201
7
*
* ----------------------------------------------------------------
* ____ __________ _______
...
...
include/ITAStreamingProperties.h
View file @
8c973c6f
...
...
@@ -3,7 +3,7 @@
*
* ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-201
6
* RWTH Aachen University, Germany, 2015-201
7
*
* ----------------------------------------------------------------
* ____ __________ _______
...
...
include/ITAStreamingSource.h
View file @
8c973c6f
...
...
@@ -3,7 +3,7 @@
*
* ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-201
6
* RWTH Aachen University, Germany, 2015-201
7
*
* ----------------------------------------------------------------
* ____ __________ _______
...
...
include/ITAStreamingSourceRealization.h
View file @
8c973c6f
...
...
@@ -3,7 +3,7 @@
*
* ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-201
6
* RWTH Aachen University, Germany, 2015-201
7
*
* ----------------------------------------------------------------
* ____ __________ _______
...
...
include/ITAStreamingState.h
View file @
8c973c6f
...
...
@@ -3,7 +3,7 @@
*
* ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-201
6
* RWTH Aachen University, Germany, 2015-201
7
*
* ----------------------------------------------------------------
* ____ __________ _______
...
...
src/ITAStreamingBackendASIO.h
View file @
8c973c6f
...
...
@@ -3,7 +3,7 @@
*
* ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-201
6
* RWTH Aachen University, Germany, 2015-201
7
*
* ----------------------------------------------------------------
* ____ __________ _______
...
...
tests/CMakeLists.txt
View file @
8c973c6f
cmake_minimum_required
(
VERSION 2.8
)
if
(
NOT ITASTREAMING_COMMON_BUILD
)
project
(
ITAStreamingTest
)
list
(
APPEND CMAKE_MODULE_PATH
"$ENV{VISTA_CMAKE_COMMON}"
)
include
(
VistaCommon
)
project
(
ITAStreamingTest
)
list
(
APPEND CMAKE_MODULE_PATH
"$ENV{VISTA_CMAKE_COMMON}"
)
include
(
VistaCommon
)
endif
()
vista_use_package
(
ITAStreaming REQUIRED FIND_DEPENDENCIES
)
if
(
ITA_CORE_LIBS_BUILD_STATIC
AND DEFINED ITA_CORE_LIBS_BUILD_STATIC
)
if
(
ITA_CORE_LIBS_BUILD_STATIC
)
add_definitions
(
-DITA_STREAMING_STATIC -DITA_BASE_STATIC
)
endif
(
ITA_CORE_LIBS_BUILD_STATIC AND DEFINED ITA_CORE_LIBS_BUILD_STATIC
)
endif
(
)
add_executable
(
StreamingComponentTest StreamingComponentTest.cpp
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment