Skip to content

Commit 6e02ce5

Browse files
committed
Support for includes w/o use for external libraries
1 parent 84d530a commit 6e02ce5

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

src/AudioEffects/STKEffects.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#pragma once
22

33
#include "AudioConfig.h"
4-
#ifdef USE_STK
54
#include "AudioEffects/AudioEffect.h"
65
#include "Effect.h"
76
#include "Stk.h"
@@ -165,5 +164,3 @@ class STKPitShift : public AudioEffect, public stk::PitShift {
165164
};
166165

167166
} // namespace audio_tools
168-
169-
#endif

src/AudioLibs/AudioA2DP.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#pragma once
99

1010
#include "AudioConfig.h"
11-
#ifdef USE_A2DP
1211

1312
#include "AudioTools.h"
1413
#include "BluetoothA2DPSink.h"
@@ -383,9 +382,4 @@ class A2DPStream : public AudioStream, public AudioBaseInfoSource {
383382

384383
};
385384

386-
387-
388-
389385
}
390-
391-
#endif

src/AudioLibs/AudioESP8266.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#pragma once
22

33
#include "AudioConfig.h"
4-
#ifdef USE_ESP8266_AUDIO
54
#include "AudioTools.h"
65
#include "AudioOutput.h"
76
#include "SoundData.h"
@@ -67,4 +66,3 @@ class AudioOutputWithCallback : public AudioOutput, public BufferedStream {
6766

6867
}
6968

70-
#endif

src/AudioLibs/AudioMozzi.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#pragma once
22

33
#include "AudioConfig.h"
4-
#ifdef USE_MOZZI
5-
64
#include "mozzi_config.h"
75
#include "hardware_defines.h"
86
#include "mozzi_analog.h"
@@ -295,4 +293,3 @@ class MozziStream : public AudioStream {
295293

296294
} // Namespace
297295

298-
#endif // USE_MOZZI

src/AudioTools.h

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,29 @@
2727
#include "AudioHttp/AudioHttp.h"
2828
#include "AudioTools/AudioPlayer.h"
2929
#include "AudioEffects/AudioEffects.h"
30+
#include "AudioExperiments/AudioExperiments.h"
31+
32+
/**
33+
* -------------------------------------------------------------------------
34+
* @brief Optional external libraries
35+
*
36+
*/
37+
38+
#ifdef USE_MOZZI
3039
#include "AudioLibs/AudioMozzi.h"
40+
#endif
41+
42+
#ifdef USE_STK
3143
#include "AudioLibs/AudioSTK.h"
44+
#endif
45+
46+
#ifdef USE_ESP8266_AUDIO
3247
#include "AudioLibs/AudioESP8266.h"
48+
#endif
49+
50+
#ifdef USE_A2DP
3351
#include "AudioLibs/AudioA2DP.h"
34-
#include "AudioExperiments/AudioExperiments.h"
52+
#endif
3553

3654

3755
/**

0 commit comments

Comments
 (0)