diff --git a/bindings/cpp/CMakeLists.txt b/bindings/cpp/CMakeLists.txt index d9f664c81..a1ce00b67 100644 --- a/bindings/cpp/CMakeLists.txt +++ b/bindings/cpp/CMakeLists.txt @@ -4,22 +4,22 @@ project(portaudiocpp VERSION 0.0.12) option(BUILD_SHARED_LIBS "Build dynamic library" ON) add_library(portaudiocpp - source/portaudiocpp/BlockingStream - source/portaudiocpp/CallbackInterface - source/portaudiocpp/CallbackStream - source/portaudiocpp/CFunCallbackStream - source/portaudiocpp/CppFunCallbackStream - source/portaudiocpp/Device - source/portaudiocpp/DirectionSpecificStreamParameters - source/portaudiocpp/Exception - source/portaudiocpp/HostApi - source/portaudiocpp/InterfaceCallbackStream - source/portaudiocpp/MemFunCallbackStream - source/portaudiocpp/Stream - source/portaudiocpp/StreamParameters - source/portaudiocpp/System - source/portaudiocpp/SystemDeviceIterator - source/portaudiocpp/SystemHostApiIterator + src/BlockingStream + src/CallbackInterface + src/CallbackStream + src/CFunCallbackStream + src/CppFunCallbackStream + src/Device + src/DirectionSpecificStreamParameters + src/Exception + src/HostApi + src/InterfaceCallbackStream + src/MemFunCallbackStream + src/Stream + src/StreamParameters + src/System + src/SystemDeviceIterator + src/SystemHostApiIterator ) target_include_directories(portaudiocpp PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") @@ -31,32 +31,32 @@ install(TARGETS portaudiocpp ) install(FILES - include/portaudiocpp/AutoSystem.hxx - include/portaudiocpp/BlockingStream.hxx - include/portaudiocpp/CallbackInterface.hxx - include/portaudiocpp/CallbackStream.hxx - include/portaudiocpp/CFunCallbackStream.hxx - include/portaudiocpp/CppFunCallbackStream.hxx - include/portaudiocpp/Device.hxx - include/portaudiocpp/DirectionSpecificStreamParameters.hxx - include/portaudiocpp/Exception.hxx - include/portaudiocpp/HostApi.hxx - include/portaudiocpp/InterfaceCallbackStream.hxx - include/portaudiocpp/MemFunCallbackStream.hxx - include/portaudiocpp/PortAudioCpp.hxx - include/portaudiocpp/SampleDataFormat.hxx - include/portaudiocpp/Stream.hxx - include/portaudiocpp/StreamParameters.hxx - include/portaudiocpp/SystemDeviceIterator.hxx - include/portaudiocpp/SystemHostApiIterator.hxx - include/portaudiocpp/System.hxx + include/AutoSystem.hxx + include/BlockingStream.hxx + include/CallbackInterface.hxx + include/CallbackStream.hxx + include/CFunCallbackStream.hxx + include/CppFunCallbackStream.hxx + include/Device.hxx + include/DirectionSpecificStreamParameters.hxx + include/Exception.hxx + include/HostApi.hxx + include/InterfaceCallbackStream.hxx + include/MemFunCallbackStream.hxx + include/PortAudioCpp.hxx + include/SampleDataFormat.hxx + include/Stream.hxx + include/StreamParameters.hxx + include/SystemDeviceIterator.hxx + include/SystemHostApiIterator.hxx + include/System.hxx DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/portaudiocpp" ) if(WIN32) - install(FILES include/portaudiocpp/AsioDeviceAdapter.hxx DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/portaudiocpp") + install(FILES include/AsioDeviceAdapter.hxx DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/portaudiocpp") endif() set(PORTAUDIOCPP_VERSION 12) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/portaudiocpp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/portaudiocpp.pc @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/portaudiocpp.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/portaudiocpp.pc @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudiocpp.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") diff --git a/bindings/cpp/include/portaudiocpp/AsioDeviceAdapter.hxx b/bindings/cpp/include/AsioDeviceAdapter.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/AsioDeviceAdapter.hxx rename to bindings/cpp/include/AsioDeviceAdapter.hxx diff --git a/bindings/cpp/include/portaudiocpp/AutoSystem.hxx b/bindings/cpp/include/AutoSystem.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/AutoSystem.hxx rename to bindings/cpp/include/AutoSystem.hxx diff --git a/bindings/cpp/include/portaudiocpp/BlockingStream.hxx b/bindings/cpp/include/BlockingStream.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/BlockingStream.hxx rename to bindings/cpp/include/BlockingStream.hxx diff --git a/bindings/cpp/include/portaudiocpp/CFunCallbackStream.hxx b/bindings/cpp/include/CFunCallbackStream.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/CFunCallbackStream.hxx rename to bindings/cpp/include/CFunCallbackStream.hxx diff --git a/bindings/cpp/include/portaudiocpp/CallbackInterface.hxx b/bindings/cpp/include/CallbackInterface.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/CallbackInterface.hxx rename to bindings/cpp/include/CallbackInterface.hxx diff --git a/bindings/cpp/include/portaudiocpp/CallbackStream.hxx b/bindings/cpp/include/CallbackStream.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/CallbackStream.hxx rename to bindings/cpp/include/CallbackStream.hxx diff --git a/bindings/cpp/include/portaudiocpp/CppFunCallbackStream.hxx b/bindings/cpp/include/CppFunCallbackStream.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/CppFunCallbackStream.hxx rename to bindings/cpp/include/CppFunCallbackStream.hxx diff --git a/bindings/cpp/include/portaudiocpp/Device.hxx b/bindings/cpp/include/Device.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/Device.hxx rename to bindings/cpp/include/Device.hxx diff --git a/bindings/cpp/include/portaudiocpp/DirectionSpecificStreamParameters.hxx b/bindings/cpp/include/DirectionSpecificStreamParameters.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/DirectionSpecificStreamParameters.hxx rename to bindings/cpp/include/DirectionSpecificStreamParameters.hxx diff --git a/bindings/cpp/include/portaudiocpp/Exception.hxx b/bindings/cpp/include/Exception.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/Exception.hxx rename to bindings/cpp/include/Exception.hxx diff --git a/bindings/cpp/include/portaudiocpp/HostApi.hxx b/bindings/cpp/include/HostApi.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/HostApi.hxx rename to bindings/cpp/include/HostApi.hxx diff --git a/bindings/cpp/include/portaudiocpp/InterfaceCallbackStream.hxx b/bindings/cpp/include/InterfaceCallbackStream.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/InterfaceCallbackStream.hxx rename to bindings/cpp/include/InterfaceCallbackStream.hxx diff --git a/bindings/cpp/include/portaudiocpp/MemFunCallbackStream.hxx b/bindings/cpp/include/MemFunCallbackStream.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/MemFunCallbackStream.hxx rename to bindings/cpp/include/MemFunCallbackStream.hxx diff --git a/bindings/cpp/include/portaudiocpp/PortAudioCpp.hxx b/bindings/cpp/include/PortAudioCpp.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/PortAudioCpp.hxx rename to bindings/cpp/include/PortAudioCpp.hxx diff --git a/bindings/cpp/include/portaudiocpp/SampleDataFormat.hxx b/bindings/cpp/include/SampleDataFormat.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/SampleDataFormat.hxx rename to bindings/cpp/include/SampleDataFormat.hxx diff --git a/bindings/cpp/include/portaudiocpp/Stream.hxx b/bindings/cpp/include/Stream.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/Stream.hxx rename to bindings/cpp/include/Stream.hxx diff --git a/bindings/cpp/include/portaudiocpp/StreamParameters.hxx b/bindings/cpp/include/StreamParameters.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/StreamParameters.hxx rename to bindings/cpp/include/StreamParameters.hxx diff --git a/bindings/cpp/include/portaudiocpp/System.hxx b/bindings/cpp/include/System.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/System.hxx rename to bindings/cpp/include/System.hxx diff --git a/bindings/cpp/include/portaudiocpp/SystemDeviceIterator.hxx b/bindings/cpp/include/SystemDeviceIterator.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/SystemDeviceIterator.hxx rename to bindings/cpp/include/SystemDeviceIterator.hxx diff --git a/bindings/cpp/include/portaudiocpp/SystemHostApiIterator.hxx b/bindings/cpp/include/SystemHostApiIterator.hxx similarity index 100% rename from bindings/cpp/include/portaudiocpp/SystemHostApiIterator.hxx rename to bindings/cpp/include/SystemHostApiIterator.hxx diff --git a/bindings/cpp/portaudiocpp.pc.in b/bindings/cpp/portaudiocpp.pc.cmake similarity index 100% rename from bindings/cpp/portaudiocpp.pc.in rename to bindings/cpp/portaudiocpp.pc.cmake diff --git a/bindings/cpp/source/portaudiocpp/MemFunCallbackStream.cxx b/bindings/cpp/source/portaudiocpp/MemFunCallbackStream.cxx deleted file mode 100644 index 5141de2ab..000000000 --- a/bindings/cpp/source/portaudiocpp/MemFunCallbackStream.cxx +++ /dev/null @@ -1,4 +0,0 @@ -#include "portaudiocpp/MemFunCallbackStream.hxx" - -// (... template class ...) - diff --git a/bindings/cpp/src/.AsioDeviceAdapter.cxx.kate-swp b/bindings/cpp/src/.AsioDeviceAdapter.cxx.kate-swp new file mode 100644 index 000000000..d95bbcf7c Binary files /dev/null and b/bindings/cpp/src/.AsioDeviceAdapter.cxx.kate-swp differ diff --git a/bindings/cpp/source/portaudiocpp/AsioDeviceAdapter.cxx b/bindings/cpp/src/AsioDeviceAdapter.cxx similarity index 91% rename from bindings/cpp/source/portaudiocpp/AsioDeviceAdapter.cxx rename to bindings/cpp/src/AsioDeviceAdapter.cxx index 3efc100f6..f61979686 100644 --- a/bindings/cpp/source/portaudiocpp/AsioDeviceAdapter.cxx +++ b/bindings/cpp/src/AsioDeviceAdapter.cxx @@ -1,11 +1,11 @@ -#include "portaudiocpp/AsioDeviceAdapter.hxx" +#include "AsioDeviceAdapter.hxx" #include "portaudio.h" #include "pa_asio.h" -#include "portaudiocpp/Device.hxx" -#include "portaudiocpp/HostApi.hxx" -#include "portaudiocpp/Exception.hxx" +#include "Device.hxx" +#include "HostApi.hxx" +#include "Exception.hxx" namespace portaudio { diff --git a/bindings/cpp/source/portaudiocpp/BlockingStream.cxx b/bindings/cpp/src/BlockingStream.cxx similarity index 93% rename from bindings/cpp/source/portaudiocpp/BlockingStream.cxx rename to bindings/cpp/src/BlockingStream.cxx index b26b9e81a..6d3493eb8 100644 --- a/bindings/cpp/source/portaudiocpp/BlockingStream.cxx +++ b/bindings/cpp/src/BlockingStream.cxx @@ -1,9 +1,9 @@ -#include "portaudiocpp/BlockingStream.hxx" +#include "BlockingStream.hxx" #include "portaudio.h" -#include "portaudiocpp/StreamParameters.hxx" -#include "portaudiocpp/Exception.hxx" +#include "StreamParameters.hxx" +#include "Exception.hxx" namespace portaudio { diff --git a/bindings/cpp/source/portaudiocpp/CFunCallbackStream.cxx b/bindings/cpp/src/CFunCallbackStream.cxx similarity index 86% rename from bindings/cpp/source/portaudiocpp/CFunCallbackStream.cxx rename to bindings/cpp/src/CFunCallbackStream.cxx index 9cceda9ab..c3d17697b 100644 --- a/bindings/cpp/source/portaudiocpp/CFunCallbackStream.cxx +++ b/bindings/cpp/src/CFunCallbackStream.cxx @@ -1,7 +1,7 @@ -#include "portaudiocpp/CFunCallbackStream.hxx" +#include "CFunCallbackStream.hxx" -#include "portaudiocpp/StreamParameters.hxx" -#include "portaudiocpp/Exception.hxx" +#include "StreamParameters.hxx" +#include "Exception.hxx" namespace portaudio { diff --git a/bindings/cpp/source/portaudiocpp/CallbackInterface.cxx b/bindings/cpp/src/CallbackInterface.cxx similarity index 93% rename from bindings/cpp/source/portaudiocpp/CallbackInterface.cxx rename to bindings/cpp/src/CallbackInterface.cxx index 01372612e..51dc38a83 100644 --- a/bindings/cpp/source/portaudiocpp/CallbackInterface.cxx +++ b/bindings/cpp/src/CallbackInterface.cxx @@ -1,4 +1,4 @@ -#include "portaudiocpp/CallbackInterface.hxx" +#include "CallbackInterface.hxx" namespace portaudio { diff --git a/bindings/cpp/source/portaudiocpp/CallbackStream.cxx b/bindings/cpp/src/CallbackStream.cxx similarity index 87% rename from bindings/cpp/source/portaudiocpp/CallbackStream.cxx rename to bindings/cpp/src/CallbackStream.cxx index b6c8e1d03..52e6a9f35 100644 --- a/bindings/cpp/source/portaudiocpp/CallbackStream.cxx +++ b/bindings/cpp/src/CallbackStream.cxx @@ -1,4 +1,4 @@ -#include "portaudiocpp/CallbackStream.hxx" +#include "CallbackStream.hxx" namespace portaudio { diff --git a/bindings/cpp/source/portaudiocpp/CppFunCallbackStream.cxx b/bindings/cpp/src/CppFunCallbackStream.cxx similarity index 94% rename from bindings/cpp/source/portaudiocpp/CppFunCallbackStream.cxx rename to bindings/cpp/src/CppFunCallbackStream.cxx index fe0b4ab0c..c6931013e 100644 --- a/bindings/cpp/source/portaudiocpp/CppFunCallbackStream.cxx +++ b/bindings/cpp/src/CppFunCallbackStream.cxx @@ -1,7 +1,7 @@ -#include "portaudiocpp/CppFunCallbackStream.hxx" +#include "CppFunCallbackStream.hxx" -#include "portaudiocpp/StreamParameters.hxx" -#include "portaudiocpp/Exception.hxx" +#include "StreamParameters.hxx" +#include "Exception.hxx" namespace portaudio { diff --git a/bindings/cpp/source/portaudiocpp/Device.cxx b/bindings/cpp/src/Device.cxx similarity index 95% rename from bindings/cpp/source/portaudiocpp/Device.cxx rename to bindings/cpp/src/Device.cxx index 7b21b03ca..e9cfd72e3 100644 --- a/bindings/cpp/source/portaudiocpp/Device.cxx +++ b/bindings/cpp/src/Device.cxx @@ -1,10 +1,10 @@ -#include "portaudiocpp/Device.hxx" +#include "Device.hxx" #include -#include "portaudiocpp/HostApi.hxx" -#include "portaudiocpp/System.hxx" -#include "portaudiocpp/Exception.hxx" +#include "HostApi.hxx" +#include "System.hxx" +#include "Exception.hxx" namespace portaudio { diff --git a/bindings/cpp/source/portaudiocpp/DirectionSpecificStreamParameters.cxx b/bindings/cpp/src/DirectionSpecificStreamParameters.cxx similarity index 98% rename from bindings/cpp/source/portaudiocpp/DirectionSpecificStreamParameters.cxx rename to bindings/cpp/src/DirectionSpecificStreamParameters.cxx index 68453d021..776fc64bf 100644 --- a/bindings/cpp/source/portaudiocpp/DirectionSpecificStreamParameters.cxx +++ b/bindings/cpp/src/DirectionSpecificStreamParameters.cxx @@ -1,6 +1,6 @@ -#include "portaudiocpp/DirectionSpecificStreamParameters.hxx" +#include "DirectionSpecificStreamParameters.hxx" -#include "portaudiocpp/Device.hxx" +#include "Device.hxx" namespace portaudio { diff --git a/bindings/cpp/source/portaudiocpp/Exception.cxx b/bindings/cpp/src/Exception.cxx similarity index 98% rename from bindings/cpp/source/portaudiocpp/Exception.cxx rename to bindings/cpp/src/Exception.cxx index 98945c817..2dfff2ee8 100644 --- a/bindings/cpp/source/portaudiocpp/Exception.cxx +++ b/bindings/cpp/src/Exception.cxx @@ -1,4 +1,4 @@ -#include "portaudiocpp/Exception.hxx" +#include "Exception.hxx" namespace portaudio { diff --git a/bindings/cpp/source/portaudiocpp/HostApi.cxx b/bindings/cpp/src/HostApi.cxx similarity index 92% rename from bindings/cpp/source/portaudiocpp/HostApi.cxx rename to bindings/cpp/src/HostApi.cxx index 6a09670c0..a158c3433 100644 --- a/bindings/cpp/source/portaudiocpp/HostApi.cxx +++ b/bindings/cpp/src/HostApi.cxx @@ -1,9 +1,9 @@ -#include "portaudiocpp/HostApi.hxx" +#include "HostApi.hxx" -#include "portaudiocpp/System.hxx" -#include "portaudiocpp/Device.hxx" -#include "portaudiocpp/SystemDeviceIterator.hxx" -#include "portaudiocpp/Exception.hxx" +#include "System.hxx" +#include "Device.hxx" +#include "SystemDeviceIterator.hxx" +#include "Exception.hxx" namespace portaudio { diff --git a/bindings/cpp/source/portaudiocpp/InterfaceCallbackStream.cxx b/bindings/cpp/src/InterfaceCallbackStream.cxx similarity index 84% rename from bindings/cpp/source/portaudiocpp/InterfaceCallbackStream.cxx rename to bindings/cpp/src/InterfaceCallbackStream.cxx index 5433fa373..a800a56f0 100644 --- a/bindings/cpp/source/portaudiocpp/InterfaceCallbackStream.cxx +++ b/bindings/cpp/src/InterfaceCallbackStream.cxx @@ -1,8 +1,8 @@ -#include "portaudiocpp/InterfaceCallbackStream.hxx" +#include "InterfaceCallbackStream.hxx" -#include "portaudiocpp/StreamParameters.hxx" -#include "portaudiocpp/Exception.hxx" -#include "portaudiocpp/CallbackInterface.hxx" +#include "StreamParameters.hxx" +#include "Exception.hxx" +#include "CallbackInterface.hxx" namespace portaudio { diff --git a/bindings/cpp/src/MemFunCallbackStream.cxx b/bindings/cpp/src/MemFunCallbackStream.cxx new file mode 100644 index 000000000..141cb2677 --- /dev/null +++ b/bindings/cpp/src/MemFunCallbackStream.cxx @@ -0,0 +1,4 @@ +#include "MemFunCallbackStream.hxx" + +// (... template class ...) + diff --git a/bindings/cpp/source/portaudiocpp/Stream.cxx b/bindings/cpp/src/Stream.cxx similarity index 97% rename from bindings/cpp/source/portaudiocpp/Stream.cxx rename to bindings/cpp/src/Stream.cxx index ba16e0335..b482f7b1e 100644 --- a/bindings/cpp/source/portaudiocpp/Stream.cxx +++ b/bindings/cpp/src/Stream.cxx @@ -1,9 +1,9 @@ -#include "portaudiocpp/Stream.hxx" +#include "Stream.hxx" #include -#include "portaudiocpp/Exception.hxx" -#include "portaudiocpp/System.hxx" +#include "Exception.hxx" +#include "System.hxx" namespace portaudio { diff --git a/bindings/cpp/source/portaudiocpp/StreamParameters.cxx b/bindings/cpp/src/StreamParameters.cxx similarity index 98% rename from bindings/cpp/source/portaudiocpp/StreamParameters.cxx rename to bindings/cpp/src/StreamParameters.cxx index 5857710b6..7908bee95 100644 --- a/bindings/cpp/source/portaudiocpp/StreamParameters.cxx +++ b/bindings/cpp/src/StreamParameters.cxx @@ -1,8 +1,8 @@ -#include "portaudiocpp/StreamParameters.hxx" +#include "StreamParameters.hxx" #include -#include "portaudiocpp/Device.hxx" +#include "Device.hxx" namespace portaudio { diff --git a/bindings/cpp/source/portaudiocpp/System.cxx b/bindings/cpp/src/System.cxx similarity index 95% rename from bindings/cpp/source/portaudiocpp/System.cxx rename to bindings/cpp/src/System.cxx index acb419d4a..1d4ddc3b7 100644 --- a/bindings/cpp/source/portaudiocpp/System.cxx +++ b/bindings/cpp/src/System.cxx @@ -1,14 +1,14 @@ -#include "portaudiocpp/System.hxx" +#include "System.hxx" #include #include -#include "portaudiocpp/HostApi.hxx" -#include "portaudiocpp/Device.hxx" -#include "portaudiocpp/Stream.hxx" -#include "portaudiocpp/Exception.hxx" -#include "portaudiocpp/SystemHostApiIterator.hxx" -#include "portaudiocpp/SystemDeviceIterator.hxx" +#include "HostApi.hxx" +#include "Device.hxx" +#include "Stream.hxx" +#include "Exception.hxx" +#include "SystemHostApiIterator.hxx" +#include "SystemDeviceIterator.hxx" namespace portaudio { diff --git a/bindings/cpp/source/portaudiocpp/SystemDeviceIterator.cxx b/bindings/cpp/src/SystemDeviceIterator.cxx similarity index 96% rename from bindings/cpp/source/portaudiocpp/SystemDeviceIterator.cxx rename to bindings/cpp/src/SystemDeviceIterator.cxx index f94cf10aa..aa2ec8529 100644 --- a/bindings/cpp/source/portaudiocpp/SystemDeviceIterator.cxx +++ b/bindings/cpp/src/SystemDeviceIterator.cxx @@ -1,4 +1,4 @@ -#include "portaudiocpp/SystemDeviceIterator.hxx" +#include "SystemDeviceIterator.hxx" namespace portaudio { diff --git a/bindings/cpp/source/portaudiocpp/SystemHostApiIterator.cxx b/bindings/cpp/src/SystemHostApiIterator.cxx similarity index 96% rename from bindings/cpp/source/portaudiocpp/SystemHostApiIterator.cxx rename to bindings/cpp/src/SystemHostApiIterator.cxx index 03f2d6e47..547929d80 100644 --- a/bindings/cpp/source/portaudiocpp/SystemHostApiIterator.cxx +++ b/bindings/cpp/src/SystemHostApiIterator.cxx @@ -1,4 +1,4 @@ -#include "portaudiocpp/SystemHostApiIterator.hxx" +#include "SystemHostApiIterator.hxx" namespace portaudio {