Skip to content

Header cleanups #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ePirat merged 4 commits into from
Nov 11, 2025
Merged

Header cleanups #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4a7eb8
AmbisonicBinauralizer: Do not include specific hrtf headers
ePirat Nov 10, 2025
60b979c
Prefix all include guard macros
ePirat Nov 10, 2025
a735d7c
Do not use #pragma once in public headers
ePirat Nov 10, 2025
61ae2cc
Rename DirectSpeakerGainCalc files to DirectSpeakersGainCalc
ePirat Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ target_sources(spatialaudio
source/AmbisonicEncoderDist.cpp
source/AmbisonicZoomer.cpp
source/Decorrelator.cpp
source/adm/DirectSpeakerGainCalc.cpp
source/adm/DirectSpeakersGainCalc.cpp
source/Renderer.cpp
source/adm/AllocentricPannerGainCalc.cpp
source/adm/AllocentricExtent.cpp
Expand All @@ -92,7 +92,7 @@ target_sources(spatialaudio
include/adm/Conversions.h
include/adm/MappingRules.h
include/adm/CartesianLoudspeakerLayouts.h
include/adm/DirectSpeakerGainCalc.h
include/adm/DirectSpeakersGainCalc.h
include/RendererMetadata.h
include/Renderer.h
include/adm/AllocentricPannerGainCalc.h
Expand Down
6 changes: 3 additions & 3 deletions include/AmbisonicAllRAD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
/*############################################################################*/


#ifndef _AMBISONIC_ALLRAD_H
#define _AMBISONIC_ALLRAD_H
#ifndef SPATIALAUDIO_AMBISONIC_ALLRAD_H
#define SPATIALAUDIO_AMBISONIC_ALLRAD_H

#include <string>
#include "SpatialaudioAPI.h"
Expand Down Expand Up @@ -97,4 +97,4 @@ namespace spaudio {
};
} // namespace spaudio

#endif // _AMBISONIC_ALLRAD_H
#endif // SPATIALAUDIO_AMBISONIC_ALLRAD_H
6 changes: 3 additions & 3 deletions include/AmbisonicBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
/*############################################################################*/


#ifndef _AMBISONIC_BASE_H
#define _AMBISONIC_BASE_H
#ifndef SPATIALAUDIO_AMBISONIC_BASE_H
#define SPATIALAUDIO_AMBISONIC_BASE_H

#include "SpatialaudioAPI.h"
#include "AmbisonicCommons.h"
Expand Down Expand Up @@ -77,4 +77,4 @@ namespace spaudio {

} // namespace spaudio

#endif //_AMBISONIC_BASE_H
#endif // SPATIALAUDIO_AMBISONIC_BASE_H
9 changes: 4 additions & 5 deletions include/AmbisonicBinauralizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
/*############################################################################*/


#ifndef _AMBISONIC_BINAURALIZER_H
#define _AMBISONIC_BINAURALIZER_H
#ifndef SPATIALAUDIO_AMBISONIC_BINAURALIZER_H
#define SPATIALAUDIO_AMBISONIC_BINAURALIZER_H

#include <string>
#include <vector>
Expand All @@ -26,8 +26,7 @@
#include "AmbisonicEncoder.h"
#include "kiss_fft/kiss_fftr.h"

#include "hrtf/mit_hrtf.h"
#include "hrtf/sofa_hrtf.h"
#include "hrtf/hrtf.h"

namespace spaudio {

Expand Down Expand Up @@ -115,4 +114,4 @@ namespace spaudio {

} // namespace spaudio

#endif // _AMBISONIC_BINAURALIZER_H
#endif // SPATIALAUDIO_AMBISONIC_BINAURALIZER_H
6 changes: 3 additions & 3 deletions include/AmbisonicCommons.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
/*############################################################################*/


#ifndef _AMBISONICCOMMONS_H
#define _AMBISONICCOMMONS_H
#ifndef SPATIALAUDIO_AMBISONIC_COMMONS_H
#define SPATIALAUDIO_AMBISONIC_COMMONS_H

#define _USE_MATH_DEFINES
#include <math.h>
Expand Down Expand Up @@ -143,4 +143,4 @@ namespace spaudio {

} // namespace spaudio

#endif //_AMBISONICCOMMONS_H
#endif // SPATIALAUDIO_AMBISONIC_COMMONS_H
6 changes: 3 additions & 3 deletions include/AmbisonicDecoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
/*############################################################################*/


#ifndef _AMBISONIC_DECODER_H
#define _AMBISONIC_DECODER_H
#ifndef SPATIALAUDIO_AMBISONIC_DECODER_H
#define SPATIALAUDIO_AMBISONIC_DECODER_H

#include "SpatialaudioAPI.h"
#include "AmbisonicBase.h"
Expand Down Expand Up @@ -186,4 +186,4 @@ namespace spaudio {

} // namespace spaudio

#endif // _AMBISONIC_DECODER_H
#endif // SPATIALAUDIO_AMBISONIC_DECODER_H
6 changes: 3 additions & 3 deletions include/AmbisonicEncoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
/*############################################################################*/


#ifndef _AMBISONIC_ENCODER_H
#define _AMBISONIC_ENCODER_H
#ifndef SPATIALAUDIO_AMBISONIC_ENCODER_H
#define SPATIALAUDIO_AMBISONIC_ENCODER_H

#include "SpatialaudioAPI.h"
#include "AmbisonicSource.h"
Expand Down Expand Up @@ -91,4 +91,4 @@ namespace spaudio {

} // namespace spaudio

#endif // _AMBISONIC_ENCODER_H
#endif // SPATIALAUDIO_AMBISONIC_ENCODER_H
6 changes: 3 additions & 3 deletions include/AmbisonicEncoderDist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
/*############################################################################*/


#ifndef _AMBISONIC_ENCODER_DIST_H
#define _AMBISONIC_ENCODER_DIST_H
#ifndef SPATIALAUDIO_AMBISONIC_ENCODER_DIST_H
#define SPATIALAUDIO_AMBISONIC_ENCODER_DIST_H

#include "SpatialaudioAPI.h"
#include "AmbisonicEncoder.h"
Expand Down Expand Up @@ -87,4 +87,4 @@ namespace spaudio {

} // namespace spaudio

#endif // _AMBISONIC_ENCODER_DIST_H
#endif // SPATIALAUDIO_AMBISONIC_ENCODER_DIST_H
6 changes: 3 additions & 3 deletions include/AmbisonicMicrophone.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
/*############################################################################*/


#ifndef _AMBISONIC_MICROPHONE_H
#define _AMBISONIC_MICROPHONE_H
#ifndef SPATIALAUDIO_AMBISONIC_MICROPHONE_H
#define SPATIALAUDIO_AMBISONIC_MICROPHONE_H

#include "SpatialaudioAPI.h"
#include "AmbisonicSource.h"
Expand Down Expand Up @@ -59,4 +59,4 @@ namespace spaudio {

} // namespace spaudio

#endif // _AMBISONIC_MICROPHONE_H
#endif // SPATIALAUDIO_AMBISONIC_MICROPHONE_H
6 changes: 3 additions & 3 deletions include/AmbisonicOptimFilters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
/*############################################################################*/


#ifndef _AMBISONIC_OPTIM_FILTERS_H
#define _AMBISONIC_OPTIM_FILTERS_H
#ifndef SPATIALAUDIO_AMBISONIC_OPTIM_FILTERS_H
#define SPATIALAUDIO_AMBISONIC_OPTIM_FILTERS_H

#include "SpatialaudioAPI.h"
#include "AmbisonicBase.h"
Expand Down Expand Up @@ -84,4 +84,4 @@ namespace spaudio {

} // namespace spaudio

#endif // _AMBISONIC_OPTIM_FILTERS_H
#endif // SPATIALAUDIO_AMBISONIC_OPTIM_FILTERS_H
6 changes: 3 additions & 3 deletions include/AmbisonicProcessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
/*############################################################################*/


#ifndef _AMBISONIC_PROCESSOR_H
#define _AMBISONIC_PROCESSOR_H
#ifndef SPATIALAUDIO_AMBISONIC_PROCESSOR_H
#define SPATIALAUDIO_AMBISONIC_PROCESSOR_H

#include "SpatialaudioAPI.h"
#include "AmbisonicBase.h"
Expand Down Expand Up @@ -183,4 +183,4 @@ namespace spaudio {

} // namespace spaudio

#endif // _AMBISONIC_PROCESSOR_H
#endif // SPATIALAUDIO_AMBISONIC_PROCESSOR_H
6 changes: 3 additions & 3 deletions include/AmbisonicRotator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
/*############################################################################*/


#ifndef _AMBISONIC_ROTATOR_H
#define _AMBISONIC_ROTATOR_H
#ifndef SPATIALAUDIO_AMBISONIC_ROTATOR_H
#define SPATIALAUDIO_AMBISONIC_ROTATOR_H

#include "SpatialaudioAPI.h"
#include "AmbisonicBase.h"
Expand Down Expand Up @@ -149,4 +149,4 @@ namespace spaudio {

} // namespace spaudio

#endif // _AMBISONIC_ROTATOR_H
#endif // SPATIALAUDIO_AMBISONIC_ROTATOR_H
6 changes: 3 additions & 3 deletions include/AmbisonicShelfFilters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
/*############################################################################*/


#ifndef _AMBISONIC_SHELF_FILTERS_H
#define _AMBISONIC_SHELF_FILTERS_H
#ifndef SPATIALAUDIO_AMBISONIC_SHELF_FILTERS_H
#define SPATIALAUDIO_AMBISONIC_SHELF_FILTERS_H

#include "SpatialaudioAPI.h"
#include "AmbisonicBase.h"
Expand Down Expand Up @@ -80,4 +80,4 @@ namespace spaudio {

} // namespace spaudio

#endif // _AMBISONIC_SHELF_FILTERS_H
#endif // SPATIALAUDIO_AMBISONIC_SHELF_FILTERS_H
6 changes: 3 additions & 3 deletions include/AmbisonicSource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
/*############################################################################*/


#ifndef _AMBISONIC_SOURCE_H
#define _AMBISONIC_SOURCE_H
#ifndef SPATIALAUDIO_AMBISONIC_SOURCE_H
#define SPATIALAUDIO_AMBISONIC_SOURCE_H

#include "SpatialaudioAPI.h"
#include "AmbisonicBase.h"
Expand Down Expand Up @@ -117,4 +117,4 @@ namespace spaudio {

} // namespace spaudio

#endif // _AMBISONIC_SOURCE_H
#endif // SPATIALAUDIO_AMBISONIC_SOURCE_H
6 changes: 3 additions & 3 deletions include/AmbisonicSpeaker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
/*############################################################################*/


#ifndef _AMBISONIC_SPEAKER_H
#define _AMBISONIC_SPEAKER_H
#ifndef SPATIALAUDIO_AMBISONIC_SPEAKER_H
#define SPATIALAUDIO_AMBISONIC_SPEAKER_H

#include "SpatialaudioAPI.h"
#include "AmbisonicSource.h"
Expand Down Expand Up @@ -55,4 +55,4 @@ namespace spaudio {

} // namespace spaudio

#endif // _AMBISONIC_SPEAKER_H
#endif // SPATIALAUDIO_AMBISONIC_SPEAKER_H
6 changes: 3 additions & 3 deletions include/AmbisonicZoomer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
/*############################################################################*/


#ifndef _AMBISONIC_ZOOMER_H
#define _AMBISONIC_ZOOMER_H
#ifndef SPATIALAUDIO_AMBISONIC_ZOOMER_H
#define SPATIALAUDIO_AMBISONIC_ZOOMER_H

#include "SpatialaudioAPI.h"
#include "AmbisonicBase.h"
Expand Down Expand Up @@ -93,4 +93,4 @@ namespace spaudio {

} // namespace spaudio

#endif // _AMBISONIC_ZOOMER_H
#endif // SPATIALAUDIO_AMBISONIC_ZOOMER_H
6 changes: 3 additions & 3 deletions include/Ambisonics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
/*############################################################################*/


#ifndef _AMBISONICS_H
#define _AMBISONICS_H
#ifndef SPATIALAUDIO_AMBISONICS_H
#define SPATIALAUDIO_AMBISONICS_H

#include "AmbisonicCommons.h"
#include "AmbisonicBase.h"
Expand All @@ -31,4 +31,4 @@
#include "AmbisonicShelfFilters.h"
#include "AmbisonicAllRAD.h"

#endif //_AMBISONICS_H
#endif // SPATIALAUDIO_AMBISONICS_H
6 changes: 3 additions & 3 deletions include/BFormat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
/*############################################################################*/


#ifndef _BFORMAT_H
#define _BFORMAT_H
#ifndef SPATIALAUDIO_BFORMAT_H
#define SPATIALAUDIO_BFORMAT_H

#include "SpatialaudioAPI.h"
#include "AmbisonicBase.h"
Expand Down Expand Up @@ -133,4 +133,4 @@ namespace spaudio {

} // namespace spaudio

#endif //_BFORMAT_H
#endif // SPATIALAUDIO_BFORMAT_H
5 changes: 4 additions & 1 deletion include/Coordinates.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
/*# #*/
/*############################################################################*/

#pragma once
#ifndef SPATIALAUDIO_COORDINATES_H
#define SPATIALAUDIO_COORDINATES_H

namespace spaudio {

Expand Down Expand Up @@ -54,3 +55,5 @@ namespace spaudio {
}

} // namespace spaudio

#endif // SPATIALAUDIO_COORDINATES_H
5 changes: 4 additions & 1 deletion include/Decorrelator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
/*# #*/
/*############################################################################*/

#pragma once
#ifndef SPATIALAUDIO_DECORRELATOR_H
#define SPATIALAUDIO_DECORRELATOR_H

#include "SpatialaudioAPI.h"
#include "LoudspeakerLayouts.h"
Expand Down Expand Up @@ -117,3 +118,5 @@ namespace spaudio {
};

} // namespace spaudio

#endif // SPATIALAUDIO_DECORRELATOR_H
5 changes: 4 additions & 1 deletion include/GainInterp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
/*# #*/
/*############################################################################*/

#pragma once
#ifndef SPATIALAUDIO_GAIN_INTERP_H
#define SPATIALAUDIO_GAIN_INTERP_H

#include <vector>
#include "SpatialaudioAPI.h"
Expand Down Expand Up @@ -81,3 +82,5 @@ namespace spaudio {
};

} // namespace spaudio

#endif // SPATIALAUDIO_GAIN_INTERP_H
6 changes: 4 additions & 2 deletions include/LoudspeakerLayouts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
/*# #*/
/*############################################################################*/


#pragma once
#ifndef SPATIALAUDIO_LOUDSPEAKER_LAYOUTS_H
#define SPATIALAUDIO_LOUDSPEAKER_LAYOUTS_H

#include <string>
#include <vector>
Expand Down Expand Up @@ -587,3 +587,5 @@ namespace spaudio {
}

} // namespace spaudio

#endif // SPATIALAUDIO_LOUDSPEAKER_LAYOUTS_H
6 changes: 4 additions & 2 deletions include/ObjectPanner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
/*# #*/
/*############################################################################*/


#pragma once
#ifndef SPATIALAUDIO_OBJECT_PANNER_H
#define SPATIALAUDIO_OBJECT_PANNER_H

#include <memory>

Expand Down Expand Up @@ -94,3 +94,5 @@ namespace spaudio {
};

} // namespace spaudio

#endif // SPATIALAUDIO_OBJECT_PANNER_H
Loading
Loading