AxioDL
/
amuse
mirror of https://github.com/AxioDL/amuse.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from lioncash/fwd 

General: Clean up inclusions
This commit is contained in:
Phillip Stephens 2019-08-25 09:00:23 -07:00 committed by GitHub
parent db9e911a23 d7aaff25d0
commit 8da26720d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
49 changed files with 286 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/amuse/AudioGroup.hpp
View File

@ -1,10 +1,13 @@
#pragma once #pragma once
#include "AudioGroupPool.hpp" #include <string>
#include "AudioGroupProject.hpp"
#include "AudioGroupSampleDirectory.hpp"
#include <unordered_set> #include <unordered_set>
#include "amuse/AudioGroupPool.hpp"
#include "amuse/AudioGroupProject.hpp"
#include "amuse/AudioGroupSampleDirectory.hpp"
#include "amuse/Common.hpp"
namespace amuse { namespace amuse {
class AudioGroupData; class AudioGroupData;
class ProjectDatabase; class ProjectDatabase;

4
include/amuse/AudioGroupData.hpp
View File

@ -1,6 +1,8 @@
#pragma once #pragma once
#include "Common.hpp" #include <cstddef>
#include "amuse/Common.hpp"
namespace amuse { namespace amuse {

20
include/amuse/AudioGroupPool.hpp
View File

@ -1,13 +1,19 @@
#pragma once #pragma once
#include <cstdint>
#include <vector>
#include <cmath>
#include <unordered_map>
#include <array> #include <array>
#include "Entity.hpp" #include <cmath>
#include "Common.hpp" #include <cstddef>
#include "athena/MemoryReader.hpp" #include <cstdint>
#include <memory>
#include <string>
#include <unordered_map>
#include <vector>
#include "amuse/Common.hpp"
#include "amuse/Entity.hpp"
#include <athena/DNA.hpp>
#include <athena/MemoryReader.hpp>
namespace amuse { namespace amuse {
class AudioGroupData; class AudioGroupData;

10
include/amuse/AudioGroupProject.hpp
View File

@ -1,11 +1,13 @@
#pragma once #pragma once
#include "Entity.hpp"
#include "Common.hpp"
#include <vector>
#include <array> #include <array>
#include <unordered_map>
#include <memory> #include <memory>
#include <unordered_map>
#include <vector>
#include "amuse/Common.hpp"
#include <athena/DNA.hpp>
namespace amuse { namespace amuse {
class AudioGroupData; class AudioGroupData;

8
include/amuse/AudioGroupSampleDirectory.hpp
View File

@ -1,8 +1,12 @@
#pragma once #pragma once
#include <unordered_map>
#include <cstdint> #include <cstdint>
#include "Common.hpp" #include <unordered_map>
#include <vector>
#include "amuse/Common.hpp"
#include <athena/DNA.hpp>
namespace amuse { namespace amuse {
class AudioGroupData; class AudioGroupData;

20
include/amuse/BooBackend.hpp
View File

@ -1,15 +1,21 @@
#pragma once #pragma once
#include <boo/audiodev/IAudioVoiceEngine.hpp> #include <cstddef>
#include <cstdint>
#include <list>
#include <memory>
#include <mutex>
#include <unordered_map>
#include <vector>
#include "amuse/IBackendVoice.hpp"
#include "amuse/IBackendSubmix.hpp"
#include "amuse/IBackendVoiceAllocator.hpp"
#include <boo/audiodev/IAudioSubmix.hpp> #include <boo/audiodev/IAudioSubmix.hpp>
#include <boo/audiodev/IAudioVoiceEngine.hpp>
#include <boo/audiodev/IMIDIReader.hpp> #include <boo/audiodev/IMIDIReader.hpp>
#include <boo/audiodev/MIDIDecoder.hpp> #include <boo/audiodev/MIDIDecoder.hpp>
#include "IBackendVoice.hpp"
#include "IBackendSubmix.hpp"
#include "IBackendVoiceAllocator.hpp"
#include <mutex>
#include <list>
#include <unordered_map>
namespace amuse { namespace amuse {

13
include/amuse/Common.hpp
View File

@ -1,17 +1,16 @@
#pragma once #pragma once
#include <algorithm> #include <algorithm>
#include <limits> #include <atomic>
#include <cstdio>
#include <cstdint> #include <cstdint>
#include <cstdarg> #include <cstdio>
#include <limits>
#include <string> #include <string>
#include <string_view> #include <string_view>
#include <cstring>
#include <atomic>
#include <unordered_map> #include <unordered_map>
#include "athena/DNA.hpp"
#include "logvisor/logvisor.hpp" #include <athena/DNA.hpp>
#include <logvisor/logvisor.hpp>
#ifndef _WIN32 #ifndef _WIN32
#include <strings.h> #include <strings.h>

10
include/amuse/ContainerRegistry.hpp
View File

@ -1,10 +1,12 @@
#pragma once #pragma once
#include "AudioGroupData.hpp" #include <cstddef>
#include "Common.hpp" #include <cstdint>
#include <string>
#include <vector>
#include <memory> #include <memory>
#include <vector>
#include "amuse/AudioGroupData.hpp"
#include "amuse/Common.hpp"
namespace amuse { namespace amuse {

1
include/amuse/DSPCodec.hpp
View File

@ -1,7 +1,6 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include <cfloat>
constexpr int16_t DSPSampClamp(int32_t val) { constexpr int16_t DSPSampClamp(int32_t val) {
if (val < -32768) if (val < -32768)

5
include/amuse/DirectoryEnumerator.hpp
View File

@ -1,8 +1,11 @@
#pragma once #pragma once
#include "Common.hpp" #include <cstring>
#include <string>
#include <vector> #include <vector>
#include "amuse/Common.hpp"
namespace amuse { namespace amuse {
struct CaseInsensitiveCompare { struct CaseInsensitiveCompare {

3
include/amuse/EffectBase.hpp
View File

@ -1,8 +1,5 @@
#pragma once #pragma once
#include <cstdint>
#include <cstdlib>
namespace amuse { namespace amuse {
struct ChannelMap; struct ChannelMap;

5
include/amuse/EffectChorus.hpp
View File

@ -1,9 +1,10 @@
#pragma once #pragma once
#include "EffectBase.hpp"
#include "Common.hpp"
#include <cstdint> #include <cstdint>
#include "amuse/Common.hpp"
#include "amuse/EffectBase.hpp"
namespace amuse { namespace amuse {
template <typename T> template <typename T>
class EffectChorusImp; class EffectChorusImp;

7
include/amuse/EffectDelay.hpp
View File

@ -1,11 +1,12 @@
#pragma once #pragma once
#include "EffectBase.hpp"
#include "IBackendVoice.hpp"
#include "Common.hpp"
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
#include "amuse/Common.hpp"
#include "amuse/EffectBase.hpp"
#include "amuse/IBackendVoice.hpp"
namespace amuse { namespace amuse {
template <typename T> template <typename T>
class EffectDelayImp; class EffectDelayImp;

6
include/amuse/EffectReverb.hpp
View File

@ -1,9 +1,11 @@
#pragma once #pragma once
#include "EffectBase.hpp" #include <cstdint>
#include "amuse/Common.hpp"
#include <memory> #include <memory>
#include "amuse/Common.hpp"
#include "amuse/EffectBase.hpp"
namespace amuse { namespace amuse {
/** Parameters needed to create EffectReverbStd */ /** Parameters needed to create EffectReverbStd */

13
include/amuse/Emitter.hpp
View File

@ -1,11 +1,11 @@
#pragma once #pragma once
#include "Entity.hpp"
#include "Common.hpp"
#include "Voice.hpp"
#include <memory>
#include <cmath>
#include <cfloat> #include <cfloat>
#include <cmath>
#include "amuse/Common.hpp"
#include "amuse/Entity.hpp"
#include "amuse/Voice.hpp"
namespace amuse { namespace amuse {
class Listener; class Listener;
@ -32,6 +32,8 @@ inline float Normalize(Vector3f& out) {
/** Voice wrapper with positional-3D level control */ /** Voice wrapper with positional-3D level control */
class Emitter : public Entity { class Emitter : public Entity {
friend class Engine;
ObjToken<Voice> m_vox; ObjToken<Voice> m_vox;
Vector3f m_pos = {}; Vector3f m_pos = {};
Vector3f m_dir = {}; Vector3f m_dir = {};
@ -43,7 +45,6 @@ class Emitter : public Entity {
bool m_dirty = true; bool m_dirty = true;
Voice::VolumeCache m_attCache; Voice::VolumeCache m_attCache;
friend class Engine;
void _destroy(); void _destroy();
float _attenuationCurve(float dist) const; float _attenuationCurve(float dist) const;
void _update(); void _update();

28
include/amuse/Engine.hpp
View File

@ -1,25 +1,27 @@
#pragma once #pragma once
#include <memory> #include <cstddef>
#include <cstdint>
#include <list> #include <list>
#include <memory>
#include <random> #include <random>
#include <unordered_map> #include <unordered_map>
#include <unordered_set>
#include "Emitter.hpp" #include "amuse/AudioGroupSampleDirectory.hpp"
#include "Listener.hpp" #include "amuse/Emitter.hpp"
#include "AudioGroupSampleDirectory.hpp" #include "amuse/IBackendVoiceAllocator.hpp"
#include "Sequencer.hpp" #include "amuse/Listener.hpp"
#include "Studio.hpp" #include "amuse/Sequencer.hpp"
#include "IBackendVoiceAllocator.hpp" #include "amuse/Studio.hpp"
namespace amuse { namespace amuse {
class IBackendVoiceAllocator;
class Voice;
class Submix;
class Emitter;
class AudioGroup; class AudioGroup;
class AudioGroupData; class AudioGroupData;
class Emitter;
class IBackendVoiceAllocator;
class IMIDIReader; class IMIDIReader;
class Submix;
class Voice;
enum class AmplitudeMode { enum class AmplitudeMode {
PerSample, /**< Per-sample amplitude evaluation (dt = 1.0 / sampleRate, rather CPU demanding) */ PerSample, /**< Per-sample amplitude evaluation (dt = 1.0 / sampleRate, rather CPU demanding) */
@ -28,10 +30,10 @@ enum class AmplitudeMode {
/** Main audio playback system for a single audio output */ /** Main audio playback system for a single audio output */
class Engine { class Engine {
friend class Voice;
friend class Emitter; friend class Emitter;
friend class Sequencer; friend class Sequencer;
friend class Studio; friend class Studio;
friend class Voice;
friend struct Sequencer::ChannelState; friend struct Sequencer::ChannelState;
IBackendVoiceAllocator& m_backend; IBackendVoiceAllocator& m_backend;

6
include/amuse/Entity.hpp
View File

@ -1,13 +1,11 @@
#pragma once #pragma once
#include <cstdint>
#include <functional>
#include <cassert> #include <cassert>
#include "Common.hpp" #include "amuse/Common.hpp"
namespace amuse { namespace amuse {
class Engine;
class AudioGroup; class AudioGroup;
class Engine;
/** Common 'engine child' class */ /** Common 'engine child' class */
class Entity : public IObj { class Entity : public IObj {

5
include/amuse/Envelope.hpp
View File

@ -1,10 +1,13 @@
#pragma once #pragma once
#include "AudioGroupPool.hpp" #include <cstdint>
namespace amuse { namespace amuse {
class Voice; class Voice;
struct ADSR;
struct ADSRDLS;
/** Per-sample state tracker for ADSR envelope data */ /** Per-sample state tracker for ADSR envelope data */
class Envelope { class Envelope {
public: public:

4
include/amuse/IBackendSubmix.hpp
View File

@ -1,10 +1,6 @@
#pragma once #pragma once
#include <memory>
namespace amuse { namespace amuse {
class IBackendVoice;
class Voice;
enum class SubmixFormat { Int16, Int32, Float }; enum class SubmixFormat { Int16, Int32, Float };

9
include/amuse/IBackendVoiceAllocator.hpp
View File

@ -1,15 +1,14 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include <functional>
#include <vector> #include <vector>
namespace amuse { namespace amuse {
class IBackendVoice;
class IBackendSubmix;
class Voice;
class Submix;
class Engine; class Engine;
class IBackendSubmix;
class IBackendVoice;
class Submix;
class Voice;
/** Same enum as boo for describing speaker-configuration */ /** Same enum as boo for describing speaker-configuration */
enum class AudioChannelSet { Stereo, Quad, Surround51, Surround71, Unknown = 0xff }; enum class AudioChannelSet { Stereo, Quad, Surround51, Surround71, Unknown = 0xff };

16
include/amuse/Sequencer.hpp
View File

@ -1,14 +1,16 @@
#pragma once #pragma once
#include "Entity.hpp" #include <cstddef>
#include "AudioGroupProject.hpp" #include <cstdint>
#include "SongState.hpp"
#include "Studio.hpp"
#include "Voice.hpp"
#include <unordered_map> #include <unordered_map>
#include <unordered_set> #include <unordered_set>
#include <memory>
#include <list> #include "amuse/AudioGroupProject.hpp"
#include "amuse/Common.hpp"
#include "amuse/Entity.hpp"
#include "amuse/SongState.hpp"
#include "amuse/Studio.hpp"
#include "amuse/Voice.hpp"
namespace amuse { namespace amuse {

2
include/amuse/SongConverter.hpp
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <vector>
#include <cstdint> #include <cstdint>
#include <vector>
namespace amuse { namespace amuse {

9
include/amuse/SongState.hpp
View File

@ -1,10 +1,9 @@
#pragma once #pragma once
#include <cstdint>
#include <vector>
#include <array> #include <array>
#include <list> #include <cstdint>
#include "Entity.hpp"
#include "amuse/Entity.hpp"
namespace amuse { namespace amuse {
class Sequencer; class Sequencer;
@ -13,8 +12,8 @@ enum class SongPlayState { Stopped, Playing };
/** Real-time state of Song execution */ /** Real-time state of Song execution */
class SongState { class SongState {
friend class Voice;
friend class SongConverter; friend class SongConverter;
friend class Voice;
/** Song header */ /** Song header */
struct Header { struct Header {

9
include/amuse/SoundMacroState.hpp
View File

@ -1,11 +1,12 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include <tuple>
#include <vector> #include <vector>
#include <list>
#include "Entity.hpp" #include "amuse/AudioGroupPool.hpp"
#include "Common.hpp" #include "amuse/Common.hpp"
#include "AudioGroupPool.hpp" #include "amuse/Entity.hpp"
/* Squelch Win32 macro pollution >.< */ /* Squelch Win32 macro pollution >.< */
#undef SendMessage #undef SendMessage

8
include/amuse/Studio.hpp
View File

@ -1,10 +1,10 @@
#pragma once #pragma once
#include <memory>
#include <list> #include <list>
#include "Entity.hpp"
#include "Submix.hpp" #include "amuse/Common.hpp"
#include <type_traits> #include "amuse/Entity.hpp"
#include "amuse/Submix.hpp"
namespace amuse { namespace amuse {
struct StudioSend; struct StudioSend;

18
include/amuse/Submix.hpp
View File

@ -1,14 +1,16 @@
#pragma once #pragma once
#include <cstdint>
#include <memory> #include <memory>
#include "SoundMacroState.hpp" #include <vector>
#include "IBackendSubmix.hpp"
#include "IBackendVoice.hpp" #include "amuse/EffectBase.hpp"
#include "EffectBase.hpp" #include "amuse/EffectChorus.hpp"
#include "EffectChorus.hpp" #include "amuse/EffectDelay.hpp"
#include "EffectDelay.hpp" #include "amuse/EffectReverb.hpp"
#include "EffectReverb.hpp" #include "amuse/IBackendSubmix.hpp"
#include <unordered_set> #include "amuse/SoundMacroState.hpp"
namespace amuse { namespace amuse {
class IBackendSubmix; class IBackendSubmix;

35
include/amuse/Voice.hpp
View File

@ -2,15 +2,16 @@
#include <cstdint> #include <cstdint>
#include <cstdlib> #include <cstdlib>
#include <memory>
#include <list> #include <list>
#include <memory>
#include <queue> #include <queue>
#include "SoundMacroState.hpp"
#include "Entity.hpp" #include "amuse/AudioGroup.hpp"
#include "AudioGroupSampleDirectory.hpp" #include "amuse/AudioGroupSampleDirectory.hpp"
#include "AudioGroup.hpp" #include "amuse/Entity.hpp"
#include "Envelope.hpp" #include "amuse/Envelope.hpp"
#include "Studio.hpp" #include "amuse/SoundMacroState.hpp"
#include "amuse/Studio.hpp"
namespace amuse { namespace amuse {
class IBackendVoice; class IBackendVoice;
@ -26,20 +27,20 @@ enum class VoiceState {
/** Individual source of audio */ /** Individual source of audio */
class Voice : public Entity { class Voice : public Entity {
friend class Engine;
friend class Sequencer;
friend struct SoundMacroState;
friend class Envelope;
friend class Emitter; friend class Emitter;
friend struct SoundMacro::CmdScaleVolume; friend class Engine;
friend struct SoundMacro::CmdKeyOff; friend class Envelope;
friend struct SoundMacro::CmdScaleVolumeDLS; friend class Sequencer;
friend struct SoundMacro::CmdReturn; friend struct SoundMacro::CmdGetMessage;
friend struct SoundMacro::CmdGoSub; friend struct SoundMacro::CmdGoSub;
friend struct SoundMacro::CmdKeyOff;
friend struct SoundMacro::CmdModeSelect;
friend struct SoundMacro::CmdReturn;
friend struct SoundMacro::CmdScaleVolume;
friend struct SoundMacro::CmdScaleVolumeDLS;
friend struct SoundMacro::CmdTrapEvent; friend struct SoundMacro::CmdTrapEvent;
friend struct SoundMacro::CmdUntrapEvent; friend struct SoundMacro::CmdUntrapEvent;
friend struct SoundMacro::CmdGetMessage; friend struct SoundMacroState;
friend struct SoundMacro::CmdModeSelect;
struct VolumeCache { struct VolumeCache {
bool m_curDLS = false; /**< Current DLS status of cached lookup */ bool m_curDLS = false; /**< Current DLS status of cached lookup */

38
include/amuse/amuse.hpp
View File

@ -1,21 +1,21 @@
#pragma once #pragma once
#include "AudioGroup.hpp" #include "amuse/AudioGroup.hpp"
#include "AudioGroupData.hpp" #include "amuse/AudioGroupData.hpp"
#include "AudioGroupPool.hpp" #include "amuse/AudioGroupPool.hpp"
#include "AudioGroupProject.hpp" #include "amuse/AudioGroupProject.hpp"
#include "AudioGroupSampleDirectory.hpp" #include "amuse/AudioGroupSampleDirectory.hpp"
#include "ContainerRegistry.hpp" #include "amuse/ContainerRegistry.hpp"
#include "EffectChorus.hpp" #include "amuse/EffectChorus.hpp"
#include "EffectDelay.hpp" #include "amuse/EffectDelay.hpp"
#include "EffectReverb.hpp" #include "amuse/EffectReverb.hpp"
#include "Emitter.hpp" #include "amuse/Emitter.hpp"
#include "Engine.hpp" #include "amuse/Engine.hpp"
#include "Envelope.hpp" #include "amuse/Envelope.hpp"
#include "Listener.hpp" #include "amuse/Listener.hpp"
#include "Sequencer.hpp" #include "amuse/Sequencer.hpp"
#include "SoundMacroState.hpp" #include "amuse/SoundMacroState.hpp"
#include "SongConverter.hpp" #include "amuse/SongConverter.hpp"
#include "SongState.hpp" #include "amuse/SongState.hpp"
#include "Submix.hpp" #include "amuse/Submix.hpp"
#include "Voice.hpp" #include "amuse/Voice.hpp"

8
lib/AudioGroup.cpp
View File

@ -1,9 +1,13 @@
#include "amuse/AudioGroup.hpp" #include "amuse/AudioGroup.hpp"
#include "amuse/AudioGroupData.hpp"
#include <regex> #include <regex>
#include <sstream>
#include "amuse/AudioGroupData.hpp"
#include <athena/FileReader.hpp> #include <athena/FileReader.hpp>
#include <fmt/ostream.h> #include <fmt/ostream.h>
#include <sstream>
using namespace std::literals; using namespace std::literals;

15
lib/AudioGroupPool.cpp
View File

@ -1,12 +1,15 @@
#include <athena/MemoryWriter.hpp>
#include "amuse/AudioGroupPool.hpp" #include "amuse/AudioGroupPool.hpp"
#include "amuse/AudioGroupData.hpp"
#include "amuse/Common.hpp" #include "amuse/Common.hpp"
#include "amuse/Entity.hpp" #include "amuse/Entity.hpp"
#include "amuse/AudioGroupData.hpp"
#include "logvisor/logvisor.hpp" #include <athena/FileReader.hpp>
#include "athena/FileWriter.hpp" #include <athena/FileWriter.hpp>
#include "athena/FileReader.hpp" #include <athena/MemoryWriter.hpp>
#include "athena/VectorWriter.hpp" #include <athena/VectorWriter.hpp>
#include <logvisor/logvisor.hpp>
using namespace std::literals; using namespace std::literals;

10
lib/AudioGroupProject.cpp
View File

@ -1,11 +1,13 @@
#include <athena/VectorWriter.hpp>
#include "amuse/AudioGroupProject.hpp" #include "amuse/AudioGroupProject.hpp"
#include "amuse/AudioGroupPool.hpp" #include "amuse/AudioGroupPool.hpp"
#include "amuse/AudioGroupSampleDirectory.hpp" #include "amuse/AudioGroupSampleDirectory.hpp"
#include "amuse/AudioGroupData.hpp" #include "amuse/AudioGroupData.hpp"
#include "athena/MemoryReader.hpp"
#include "athena/FileWriter.hpp" #include <athena/MemoryReader.hpp>
#include "athena/FileReader.hpp" #include <athena/FileReader.hpp>
#include <athena/FileWriter.hpp>
#include <athena/VectorWriter.hpp>
namespace amuse { namespace amuse {

20
lib/AudioGroupSampleDirectory.cpp
View File

@ -1,15 +1,19 @@
#include "amuse/AudioGroupSampleDirectory.hpp" #include "amuse/AudioGroupSampleDirectory.hpp"
#include "amuse/Common.hpp"
#include <cstring>
#include "amuse/AudioGroup.hpp"
#include "amuse/AudioGroupData.hpp" #include "amuse/AudioGroupData.hpp"
#include "amuse/Common.hpp"
#include "amuse/DirectoryEnumerator.hpp"
#include "amuse/DSPCodec.hpp" #include "amuse/DSPCodec.hpp"
#include "amuse/N64MusyXCodec.hpp" #include "amuse/N64MusyXCodec.hpp"
#include "amuse/DirectoryEnumerator.hpp"
#include "amuse/AudioGroup.hpp" #include <athena/FileReader.hpp>
#include "athena/MemoryReader.hpp" #include <athena/FileWriter.hpp>
#include "athena/FileWriter.hpp" #include <athena/MemoryReader.hpp>
#include "athena/FileReader.hpp" #include <athena/VectorWriter.hpp>
#include "athena/VectorWriter.hpp"
#include <cstring>
#ifndef _WIN32 #ifndef _WIN32
#include <fcntl.h> #include <fcntl.h>
#else #else

5
lib/BooBackend.cpp
View File

@ -1,7 +1,8 @@
#include "amuse/BooBackend.hpp" #include "amuse/BooBackend.hpp"
#include "amuse/Voice.hpp"
#include "amuse/Submix.hpp"
#include "amuse/Engine.hpp" #include "amuse/Engine.hpp"
#include "amuse/Submix.hpp"
#include "amuse/Voice.hpp"
namespace amuse { namespace amuse {

8
lib/Common.cpp
View File

@ -1,5 +1,11 @@
#include "amuse/Common.hpp" #include "amuse/Common.hpp"
#include "logvisor/logvisor.hpp"
#ifndef _WIN32
#include <cstdio>
#include <memory>
#endif
#include <logvisor/logvisor.hpp>
using namespace std::literals; using namespace std::literals;

7
lib/ContainerRegistry.cpp
View File

@ -1,11 +1,14 @@
#include "amuse/ContainerRegistry.hpp" #include "amuse/ContainerRegistry.hpp"
#include "amuse/Common.hpp"
#include <cstdio> #include <cstdio>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <string>
#include <memory> #include <memory>
#include <string>
#include <unordered_map> #include <unordered_map>
#include "amuse/Common.hpp"
#include <zlib.h> #include <zlib.h>
#include <lzokay.hpp> #include <lzokay.hpp>

4
lib/DSPCodec.cpp
View File

@ -1,7 +1,9 @@
#include "amuse/DSPCodec.hpp" #include "amuse/DSPCodec.hpp"
#include <algorithm> #include <algorithm>
#include <cfloat>
#include <cmath> #include <cmath>
#include <memory.h> #include <cstdlib>
#if __SWITCH__ #if __SWITCH__
#include "switch_math.hpp" #include "switch_math.hpp"

6
lib/EffectChorus.cpp
View File

@ -1,8 +1,10 @@
#include "amuse/EffectChorus.hpp" #include "amuse/EffectChorus.hpp"
#include <cmath>
#include <cstring>
#include "amuse/Common.hpp" #include "amuse/Common.hpp"
#include "amuse/IBackendVoice.hpp" #include "amuse/IBackendVoice.hpp"
#include <cstring>
#include <cmath>
namespace amuse { namespace amuse {

6
lib/EffectDelay.cpp
View File

@ -1,8 +1,10 @@
#include "amuse/EffectDelay.hpp" #include "amuse/EffectDelay.hpp"
#include <cmath>
#include <cstring>
#include "amuse/Common.hpp" #include "amuse/Common.hpp"
#include "amuse/IBackendVoice.hpp" #include "amuse/IBackendVoice.hpp"
#include <cstring>
#include <cmath>
namespace amuse { namespace amuse {

4
lib/EffectReverb.cpp
View File

@ -1,8 +1,10 @@
#include "amuse/EffectReverb.hpp" #include "amuse/EffectReverb.hpp"
#include "amuse/IBackendVoice.hpp"
#include <cmath> #include <cmath>
#include <cstring> #include <cstring>
#include "amuse/IBackendVoice.hpp"
namespace amuse { namespace amuse {
/* clang-format off */ /* clang-format off */

3
lib/Emitter.cpp
View File

@ -1,7 +1,8 @@
#include "amuse/Emitter.hpp" #include "amuse/Emitter.hpp"
#include "amuse/Engine.hpp"
#include "amuse/Listener.hpp" #include "amuse/Listener.hpp"
#include "amuse/Voice.hpp" #include "amuse/Voice.hpp"
#include "amuse/Engine.hpp"
namespace amuse { namespace amuse {

13
lib/Engine.cpp
View File

@ -1,12 +1,13 @@
#include "amuse/Engine.hpp" #include "amuse/Engine.hpp"
#include "amuse/Voice.hpp"
#include "amuse/Submix.hpp" #include "amuse/AudioGroup.hpp"
#include "amuse/Sequencer.hpp" #include "amuse/AudioGroupData.hpp"
#include "amuse/Common.hpp"
#include "amuse/IBackendVoice.hpp" #include "amuse/IBackendVoice.hpp"
#include "amuse/IBackendVoiceAllocator.hpp" #include "amuse/IBackendVoiceAllocator.hpp"
#include "amuse/AudioGroupData.hpp" #include "amuse/Sequencer.hpp"
#include "amuse/AudioGroup.hpp" #include "amuse/Submix.hpp"
#include "amuse/Common.hpp" #include "amuse/Voice.hpp"
namespace amuse { namespace amuse {

2
lib/Envelope.cpp
View File

@ -1,4 +1,6 @@
#include "amuse/Envelope.hpp" #include "amuse/Envelope.hpp"
#include "amuse/AudioGroupPool.hpp"
#include "amuse/Voice.hpp" #include "amuse/Voice.hpp"
namespace amuse { namespace amuse {

6
lib/N64MusyXCodec.cpp
View File

@ -1,7 +1,7 @@
#include "amuse/N64MusyXCodec.hpp" #include "amuse/N64MusyXCodec.hpp"
#include <stdint.h>
#include <string.h> #include <cstdint>
#include <stdio.h> #include <cstring>
/* Acknowledgements: /* Acknowledgements:
* SubDrag for N64 Sound Tool (http://www.goldeneyevault.com/viewfile.php?id=212) * SubDrag for N64 Sound Tool (http://www.goldeneyevault.com/viewfile.php?id=212)

7
lib/Sequencer.cpp
View File

@ -1,9 +1,10 @@
#include "amuse/Sequencer.hpp" #include "amuse/Sequencer.hpp"
#include "amuse/Submix.hpp"
#include "amuse/Voice.hpp"
#include "amuse/Engine.hpp"
#include <map> #include <map>
#include "amuse/Engine.hpp"
#include "amuse/Voice.hpp"
namespace amuse { namespace amuse {
void Sequencer::ChannelState::_bringOutYourDead() { void Sequencer::ChannelState::_bringOutYourDead() {

8
lib/SongConverter.cpp
View File

@ -1,9 +1,13 @@
#include "amuse/SongConverter.hpp" #include "amuse/SongConverter.hpp"
#include "amuse/SongState.hpp"
#include "amuse/Common.hpp" #include <algorithm>
#include <array>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include "amuse/Common.hpp"
#include "amuse/SongState.hpp"
namespace amuse { namespace amuse {
constexpr uint8_t clamp7(uint8_t val) { return std::max(0, std::min(127, int(val))); } constexpr uint8_t clamp7(uint8_t val) { return std::max(0, std::min(127, int(val))); }

4
lib/SongState.cpp
View File

@ -1,7 +1,9 @@
#include "amuse/SongState.hpp" #include "amuse/SongState.hpp"
#include <cmath>
#include "amuse/Common.hpp" #include "amuse/Common.hpp"
#include "amuse/Sequencer.hpp" #include "amuse/Sequencer.hpp"
#include <cmath>
namespace amuse { namespace amuse {

11
lib/SoundMacroState.cpp
View File

@ -1,10 +1,13 @@
#include "amuse/SoundMacroState.hpp" #include "amuse/SoundMacroState.hpp"
#include "amuse/Voice.hpp"
#include "amuse/Engine.hpp" #include <cmath>
#include "amuse/Common.hpp" #include <cstring>
#include "amuse/AudioGroup.hpp" #include "amuse/AudioGroup.hpp"
#include "amuse/AudioGroupPool.hpp" #include "amuse/AudioGroupPool.hpp"
#include <cstring> #include "amuse/Common.hpp"
#include "amuse/Engine.hpp"
#include "amuse/Voice.hpp"
using namespace std::literals; using namespace std::literals;

20
lib/Voice.cpp
View File

@ -1,16 +1,18 @@
#include "amuse/Voice.hpp" #include "amuse/Voice.hpp"
#include "amuse/Submix.hpp"
#include "amuse/IBackendVoice.hpp"
#include "amuse/IBackendVoiceAllocator.hpp"
#include "amuse/AudioGroup.hpp"
#include "amuse/Common.hpp"
#include "amuse/Engine.hpp"
#include "amuse/DSPCodec.hpp"
#include "amuse/N64MusyXCodec.hpp"
#include "amuse/VolumeTable.hpp"
#include <cmath> #include <cmath>
#include <cstring> #include <cstring>
#include "amuse/AudioGroup.hpp"
#include "amuse/Common.hpp"
#include "amuse/DSPCodec.hpp"
#include "amuse/Engine.hpp"
#include "amuse/IBackendVoice.hpp"
#include "amuse/IBackendVoiceAllocator.hpp"
#include "amuse/N64MusyXCodec.hpp"
#include "amuse/Submix.hpp"
#include "amuse/VolumeTable.hpp"
namespace amuse { namespace amuse {
float Voice::VolumeCache::getVolume(float vol, bool dls) { float Voice::VolumeCache::getVolume(float vol, bool dls) {

4
lib/VolumeTable.cpp
View File

@ -1,7 +1,9 @@
#include "amuse/VolumeTable.hpp" #include "amuse/VolumeTable.hpp"
#include "amuse/Common.hpp"
#include <cmath> #include <cmath>
#include "amuse/Common.hpp"
namespace amuse { namespace amuse {
static const float VolumeTable[] = { static const float VolumeTable[] = {