Header restructuring

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.23)
 
 # ABI version
 # Do not forget to increase the major version when breaking ABI!
@@ -36,7 +36,7 @@ target_sources(spatialaudio
         source/AmbisonicEncoder.cpp
         source/AmbisonicMicrophone.cpp
         source/AmbisonicCommons.cpp
-        source/mit_hrtf_lib.c
+        source/mit_hrtf/mit_hrtf_lib.c
         source/AmbisonicProcessor.cpp
         source/AmbisonicRotator.cpp
         source/AmbisonicDecoder.cpp
@@ -70,74 +70,66 @@ target_sources(spatialaudio
         source/dsp/IIRFilter.cpp
         source/dsp/LinkwitzRileyIIR.cpp
         source/LoudspeakerLayouts.cpp
-)
-list(APPEND spatialaudio_headers
-    include/adm/Conversions.h
-    include/adm/MappingRules.h
-    include/adm/CartesianLoudspeakerLayouts.h
-    include/adm/DirectSpeakerGainCalc.h
-    include/RendererMetadata.h
-    include/Renderer.h
-    include/adm/AllocentricPannerGainCalc.h
-    include/adm/AllocentricExtent.h
-    include/AmbisonicAllRAD.h
-    include/AmbisonicBase.h
-    include/AmbisonicBinauralizer.h
-    include/AmbisonicCommons.h
-    include/AmbisonicDecoder.h
-    include/AmbisonicDecoderPresets.h
-    include/AmbisonicEncoderDist.h
-    include/AmbisonicEncoder.h
-    include/AmbisonicMicrophone.h
-    include/AmbisonicProcessor.h
-    include/AmbisonicPsychoacousticFilters.h
-    include/AmbisonicRotator.h
-    include/Ambisonics.h
-    include/AmbisonicShelfFilters.h
-    include/AmbisonicOptimFilters.h
-    include/AmbisonicSource.h
-    include/AmbisonicSpeaker.h
-    include/AmbisonicZoomer.h
-    include/BFormat.h
-    include/Coordinates.h
-    include/Decorrelator.h
-    include/adm/GainCalculator.h
-    include/GainInterp.h
-    include/hrtf/hrtf.h
-    include/hrtf/mit_hrtf.h
-    include/hrtf/sofa_hrtf.h
-    include/LoudspeakerLayouts.h
-    include/LoudspeakerLayoutHulls.h
-    include/mit_hrtf_filter.h
-    include/mit_hrtf_lib.h
-    include/normal/mit_hrtf_normal_44100.h
-    include/normal/mit_hrtf_normal_48000.h
-    include/normal/mit_hrtf_normal_88200.h
-    include/normal/mit_hrtf_normal_96000.h
-    include/PointSourcePannerGainCalc.h
-    include/adm/PolarExtent.h
-    include/RegionHandlers.h
-    include/Screen.h
-    include/ScreenCommon.h
-    include/SpeakersBinauralizer.h
-    include/Tools.h
-    include/ObjectPanner.h
-    include/t_design_5200.h
-    source/kiss_fft/kiss_fft.h
-    source/kiss_fft/kiss_fftr.h
-    include/dsp/IIRFilter.h
-    include/dsp/LinkwitzRileyIIR.h
-)
-target_include_directories(spatialaudio
+
     PUBLIC
-        include
+        FILE_SET HEADERS
+        TYPE HEADERS
+        BASE_DIRS
+            include
+            source
+        FILES
+            include/adm/Conversions.h
+            include/adm/MappingRules.h
+            include/adm/CartesianLoudspeakerLayouts.h
+            include/adm/DirectSpeakerGainCalc.h
+            include/RendererMetadata.h
+            include/Renderer.h
+            include/adm/AllocentricPannerGainCalc.h
+            include/adm/AllocentricExtent.h
+            include/AmbisonicAllRAD.h
+            include/AmbisonicBase.h
+            include/AmbisonicBinauralizer.h
+            include/AmbisonicCommons.h
+            include/AmbisonicDecoder.h
+            include/AmbisonicDecoderPresets.h
+            include/AmbisonicEncoderDist.h
+            include/AmbisonicEncoder.h
+            include/AmbisonicMicrophone.h
+            include/AmbisonicProcessor.h
+            include/AmbisonicPsychoacousticFilters.h
+            include/AmbisonicRotator.h
+            include/Ambisonics.h
+            include/AmbisonicShelfFilters.h
+            include/AmbisonicOptimFilters.h
+            include/AmbisonicSource.h
+            include/AmbisonicSpeaker.h
+            include/AmbisonicZoomer.h
+            include/BFormat.h
+            include/Coordinates.h
+            include/Decorrelator.h
+            include/adm/GainCalculator.h
+            include/GainInterp.h
+            include/hrtf/hrtf.h
+            include/hrtf/mit_hrtf.h
+            include/hrtf/sofa_hrtf.h
+            include/LoudspeakerLayouts.h
+            include/LoudspeakerLayoutHulls.h
+            include/PointSourcePannerGainCalc.h
+            include/adm/PolarExtent.h
+            include/RegionHandlers.h
+            include/Screen.h
+            include/ScreenCommon.h
+            include/SpeakersBinauralizer.h
+            include/Tools.h
+            include/ObjectPanner.h
+            include/kiss_fft/kiss_fft.h
+            include/kiss_fft/kiss_fftr.h
+            include/dsp/IIRFilter.h
+            include/dsp/LinkwitzRileyIIR.h
+)
 
+target_include_directories(spatialaudio
     PRIVATE
-        include/adm
-        include/dsp
-        include/hrtf
-        source
-        source/kiss_fft
         ${CMAKE_CURRENT_BINARY_DIR}
 )
 
@@ -164,9 +156,9 @@ configure_file(
 install(TARGETS spatialaudio
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    FILE_SET HEADERS
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/spatialaudio
 )
-install(FILES ${spatialaudio_headers}
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/spatialaudio)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 install(FILES ${PROJECT_BINARY_DIR}/config.h

cmake/spatialaudio.pc.cmake

@@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
 libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
 includedir=${prefix}/include
 
-Name: libspatialaudio
+Name: spatialaudio
 Description: Spatial audio rendering library
 Version: @PROJECT_VERSION@
 Libs: -L${libdir} -lspatialaudio @MYSOFA_LIB@ -lm -lz

include/AmbisonicBinauralizer.h

@@ -23,10 +23,10 @@
 #include "AmbisonicShelfFilters.h"
 #include "AmbisonicDecoder.h"
 #include "AmbisonicEncoder.h"
-#include "kiss_fftr.h"
+#include "kiss_fft/kiss_fftr.h"
 
-#include "mit_hrtf.h"
-#include "sofa_hrtf.h"
+#include "hrtf/mit_hrtf.h"
+#include "hrtf/sofa_hrtf.h"
 
 namespace spaudio {
 

include/AmbisonicOptimFilters.h

@@ -18,7 +18,7 @@
 
 #include "AmbisonicBase.h"
 #include "BFormat.h"
-#include "LinkwitzRileyIIR.h"
+#include "dsp/LinkwitzRileyIIR.h"
 
 namespace spaudio {
 

include/AmbisonicShelfFilters.h

@@ -18,7 +18,7 @@
 
 #include "AmbisonicBase.h"
 #include "BFormat.h"
-#include "kiss_fftr.h"
+#include "kiss_fft/kiss_fftr.h"
 #include "AmbisonicPsychoacousticFilters.h"
 
 namespace spaudio {

include/Decorrelator.h

@@ -14,7 +14,7 @@
 
 #include "LoudspeakerLayouts.h"
 #include "Tools.h"
-#include "kiss_fftr.h"
+#include "kiss_fft/kiss_fftr.h"
 
 namespace spaudio {
 

include/LoudspeakerLayouts.h

@@ -22,7 +22,7 @@
 #include "RendererMetadata.h"
 #include "Coordinates.h"
 #include "ScreenCommon.h"
-#include "Conversions.h"
+#include "adm/Conversions.h"
 
 namespace spaudio {
 

include/Renderer.h

@@ -20,11 +20,11 @@
 #include "RendererMetadata.h"
 #include "LoudspeakerLayouts.h"
 #include "Tools.h"
-#include "Conversions.h"
+#include "adm/Conversions.h"
 #include "GainInterp.h"
-#include "DirectSpeakerGainCalc.h"
+#include "adm/DirectSpeakerGainCalc.h"
 #include "Decorrelator.h"
-#include "GainCalculator.h"
+#include "adm/GainCalculator.h"
 
 namespace spaudio {
 

include/Screen.h

@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "Conversions.h"
+#include "adm/Conversions.h"
 #include "ScreenCommon.h"
 #include "LoudspeakerLayouts.h"
 #include "Coordinates.h"

include/Tests.h

@@ -16,10 +16,10 @@
 #include <iostream>
 #include <iomanip>
 #include "LoudspeakerLayouts.h"
-#include "LinkwitzRileyIIR.h"
+#include "dsp/LinkwitzRileyIIR.h"
 #include "ObjectPanner.h"
 #include "Renderer.h"
-#include "AllocentricExtent.h"
+#include "adm/AllocentricExtent.h"
 
 using namespace spaudio;
 

include/adm/AllocentricExtent.h

@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "LoudspeakerLayouts.h"
+#include "../LoudspeakerLayouts.h"
 #include "AllocentricPannerGainCalc.h"
 
 namespace spaudio {

include/adm/AllocentricPannerGainCalc.h

@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "LoudspeakerLayouts.h"
+#include "../LoudspeakerLayouts.h"
 
 namespace spaudio {
     namespace adm {

include/adm/Conversions.h

@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include "Tools.h"
-#include "RendererMetadata.h"
+#include "../Tools.h"
+#include "../RendererMetadata.h"
 
 namespace spaudio {
     namespace adm {

include/adm/DirectSpeakerGainCalc.h

@@ -14,12 +14,12 @@
 
 #pragma once
 
-#include "RendererMetadata.h"
-#include "LoudspeakerLayouts.h"
-#include "Tools.h"
+#include "../RendererMetadata.h"
+#include "../LoudspeakerLayouts.h"
+#include "../Tools.h"
 #include "MappingRules.h"
-#include "PointSourcePannerGainCalc.h"
-#include "Screen.h"
+#include "../PointSourcePannerGainCalc.h"
+#include "../Screen.h"
 
 namespace spaudio {
     namespace adm {

include/adm/GainCalculator.h

@@ -12,13 +12,13 @@
 
 #pragma once
 
-#include "Coordinates.h"
-#include "Tools.h"
-#include "RendererMetadata.h"
+#include "../Coordinates.h"
+#include "../Tools.h"
+#include "../RendererMetadata.h"
 #include "PolarExtent.h"
 #include "AllocentricExtent.h"
-#include "AmbisonicEncoder.h"
-#include "Screen.h"
+#include "../AmbisonicEncoder.h"
+#include "../Screen.h"
 
 namespace spaudio {
     namespace adm {

include/adm/PolarExtent.h

@@ -12,10 +12,10 @@
 
 #pragma once
 
-#include "Coordinates.h"
-#include "Tools.h"
-#include "PointSourcePannerGainCalc.h"
-#include "AmbisonicSource.h"
+#include "../Coordinates.h"
+#include "../Tools.h"
+#include "../PointSourcePannerGainCalc.h"
+#include "../AmbisonicSource.h"
 
 namespace spaudio {
     namespace adm {

include/meson.build

@@ -42,35 +42,17 @@ spatialaudio_headers = [files(
     'LoudspeakerLayouts.h',
     'LoudspeakerLayoutHulls.h',
     'ObjectPanner.h',
-    'mit_hrtf_filter.h',
-    'mit_hrtf_lib.h',
-    'normal/mit_hrtf_normal_44100.h',
-    'normal/mit_hrtf_normal_48000.h',
-    'normal/mit_hrtf_normal_88200.h',
-    'normal/mit_hrtf_normal_96000.h',
     'PointSourcePannerGainCalc.h',
     'adm/PolarExtent.h',
     'RegionHandlers.h',
     'Screen.h',
     'ScreenCommon.h',
     'SpeakersBinauralizer.h',
     'Tools.h',
-    't_design_5200.h',
-    '../source/kiss_fft/kiss_fft.h',
-    '../source/kiss_fft/kiss_fftr.h',
+    'kiss_fft/kiss_fft.h',
+    'kiss_fft/kiss_fftr.h',
     'dsp/IIRFilter.h',
     'dsp/LinkwitzRileyIIR.h',
 ), config_h]
 
 spatialaudio_incdirs = include_directories('.')
-
-spatialaudio_incdirs_private = [
-    spatialaudio_incdirs,
-    include_directories(
-        '../source/kiss_fft',
-        'adm',
-        'dsp',
-        'hrtf',
-        'normal',
-    ),
-]

meson.build

@@ -29,20 +29,22 @@ subdir('source')
 
 # Make the library usable as a Meson subproject.
 libspatialaudio_dep = declare_dependency(
-    include_directories : spatialaudio_incdirs_private,
+    include_directories : spatialaudio_incdirs,
     dependencies : dependencies,
     link_with : spatialaudio_lib,
 )
 meson.override_dependency('libspatialaudio', libspatialaudio_dep)
 
 # Make this library properly installable
-install_headers(spatialaudio_headers, subdir : 'spatialaudio')
+install_headers(spatialaudio_headers,
+    subdir : 'spatialaudio',
+    preserve_path : true,
+)
 
 pkg_mod = import('pkgconfig')
 pkg_mod.generate(
     spatialaudio_lib,
     description : 'Spatial audio rendering library',
-    subdirs : 'spatialaudio',
 )
 
 subdir('tests')