C++ bindings: reorganize files

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")

bindings/cpp/source/portaudiocpp/AsioDeviceAdapter.cxx → 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
 {

bindings/cpp/source/portaudiocpp/BlockingStream.cxx → 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
 {

bindings/cpp/source/portaudiocpp/CFunCallbackStream.cxx → 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
 {

bindings/cpp/source/portaudiocpp/CallbackInterface.cxx → bindings/cpp/src/CallbackInterface.cxx

@@ -1,4 +1,4 @@
-#include "portaudiocpp/CallbackInterface.hxx"
+#include "CallbackInterface.hxx"
 
 namespace portaudio
 {

bindings/cpp/source/portaudiocpp/CallbackStream.cxx → bindings/cpp/src/CallbackStream.cxx

@@ -1,4 +1,4 @@
-#include "portaudiocpp/CallbackStream.hxx"
+#include "CallbackStream.hxx"
 
 namespace portaudio
 {

bindings/cpp/source/portaudiocpp/CppFunCallbackStream.cxx → 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
 {

bindings/cpp/source/portaudiocpp/Device.cxx → bindings/cpp/src/Device.cxx

@@ -1,10 +1,10 @@
-#include "portaudiocpp/Device.hxx"
+#include "Device.hxx"
 
 #include <cstddef>
 
-#include "portaudiocpp/HostApi.hxx"
-#include "portaudiocpp/System.hxx"
-#include "portaudiocpp/Exception.hxx"
+#include "HostApi.hxx"
+#include "System.hxx"
+#include "Exception.hxx"
 
 namespace portaudio
 {

bindings/cpp/source/portaudiocpp/DirectionSpecificStreamParameters.cxx → 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
 {

bindings/cpp/source/portaudiocpp/Exception.cxx → bindings/cpp/src/Exception.cxx

@@ -1,4 +1,4 @@
-#include "portaudiocpp/Exception.hxx"
+#include "Exception.hxx"
 
 namespace portaudio
 {

bindings/cpp/source/portaudiocpp/HostApi.cxx → 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
 {

bindings/cpp/source/portaudiocpp/InterfaceCallbackStream.cxx → 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
 {

bindings/cpp/src/MemFunCallbackStream.cxx

@@ -0,0 +1,4 @@
+#include "MemFunCallbackStream.hxx"
+
+// (... template class ...)
+

bindings/cpp/source/portaudiocpp/Stream.cxx → bindings/cpp/src/Stream.cxx

@@ -1,9 +1,9 @@
-#include "portaudiocpp/Stream.hxx"
+#include "Stream.hxx"
 
 #include <cstddef>
 
-#include "portaudiocpp/Exception.hxx"
-#include "portaudiocpp/System.hxx"
+#include "Exception.hxx"
+#include "System.hxx"
 
 namespace portaudio
 {

bindings/cpp/source/portaudiocpp/StreamParameters.cxx → bindings/cpp/src/StreamParameters.cxx

@@ -1,8 +1,8 @@
-#include "portaudiocpp/StreamParameters.hxx"
+#include "StreamParameters.hxx"
 
 #include <cstddef>
 
-#include "portaudiocpp/Device.hxx"
+#include "Device.hxx"
 
 namespace portaudio
 {

bindings/cpp/source/portaudiocpp/System.cxx → bindings/cpp/src/System.cxx

@@ -1,14 +1,14 @@
-#include "portaudiocpp/System.hxx"
+#include "System.hxx"
 
 #include <cstddef>
 #include <cassert>
 
-#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
 {

bindings/cpp/source/portaudiocpp/SystemDeviceIterator.cxx → bindings/cpp/src/SystemDeviceIterator.cxx

@@ -1,4 +1,4 @@
-#include "portaudiocpp/SystemDeviceIterator.hxx"
+#include "SystemDeviceIterator.hxx"
 
 namespace portaudio
 {

bindings/cpp/source/portaudiocpp/SystemHostApiIterator.cxx → bindings/cpp/src/SystemHostApiIterator.cxx

@@ -1,4 +1,4 @@
-#include "portaudiocpp/SystemHostApiIterator.hxx"
+#include "SystemHostApiIterator.hxx"
 
 namespace portaudio
 {