Skip to content
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.

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

code formatting #590

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
root = true

# Unix-style newlines with a newline ending every file
[*]
charset = utf-8
trim_trailing_whitespace = true
end_of_line = lf
insert_final_newline = true
indent_style = tab

[*.{c,h,cpp,hpp}]
indent_size = 4
cpp_space_pointer_reference_alignment = left
cpp_space_after_keywords_in_control_flow_statements = true
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Release
*.ipdb
lib/
vcpkg_installed/
.cmake/

# Profiling results
*.vspx
Expand Down
4 changes: 2 additions & 2 deletions Audio/include/Audio/Audio.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ extern class Audio* g_audio;
also handles mixing and DSP's on playing items
*/
class Audio : Unique
{
{
public:
Audio();
~Audio();
Expand All @@ -35,4 +35,4 @@ class Audio : Unique

private:
bool m_initialized = false;
};
};
30 changes: 15 additions & 15 deletions Audio/include/Audio/AudioBase.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class DSP
{
protected:
DSP() = default; // Abstract
DSP(const DSP &) = delete;
DSP(const DSP&) = delete;

uint32 GetStartSample() const;
uint32 GetCurrentSample() const;
Expand All @@ -16,19 +16,19 @@ class DSP
// Only use this for initializing parameters
uint32 m_sampleRate = 0;

class AudioBase *m_audioBase = nullptr;
class AudioBase* m_audioBase = nullptr;

public:
virtual ~DSP();
static bool Sorter(DSP *&a, DSP *&b);
static bool Sorter(DSP*& a, DSP*& b);

void SetAudioBase(class AudioBase *audioBase);
void SetAudioBase(class AudioBase* audioBase);
inline void RemoveAudioBase() { m_audioBase = nullptr; }
inline void SetSampleRate(uint32 sampleRate) { m_sampleRate = sampleRate; }

// Process <numSamples> amount of samples in stereo float format
virtual void Process(float *out, uint32 numSamples) = 0;
virtual const char *GetName() const = 0;
virtual void Process(float* out, uint32 numSamples) = 0;
virtual const char* GetName() const = 0;

float mix = 1.0f;
uint32 priority = 0;
Expand All @@ -46,7 +46,7 @@ class AudioBase
public:
virtual ~AudioBase();
// Process <numSamples> amount of samples in stereo float format
virtual void Process(float *out, uint32 numSamples) = 0;
virtual void Process(float* out, uint32 numSamples) = 0;

// Gets the playback position in millisecond
virtual int32 GetPosition() const = 0;
Expand All @@ -61,16 +61,16 @@ class AudioBase
uint32 GetAudioSampleRate() const;

// Gets pcm data from a decoded stream, nullptr if not available
virtual float *GetPCM() = 0;
virtual float* GetPCM() = 0;
// Gets pcm sample count
virtual uint64 GetPCMCount() const = 0;
virtual void PreRenderDSPs(Vector<DSP *> &DSPs) = 0;
virtual void PreRenderDSPs(Vector<DSP*>& DSPs) = 0;

void ProcessDSPs(float *out, uint32 numSamples);
void ProcessDSPs(float* out, uint32 numSamples);
// Adds a signal processor to the audio
void AddDSP(DSP *dsp);
void AddDSP(DSP* dsp);
// Removes a signal processor from the audio
void RemoveDSP(DSP *dsp);
void RemoveDSP(DSP* dsp);

void Deregister();

Expand All @@ -84,10 +84,10 @@ class AudioBase
return m_volume;
}

Vector<DSP *> DSPs;
Vector<DSP*> DSPs;
float PlaybackSpeed = 1.0;
class Audio_Impl *audio = nullptr;
class Audio_Impl* audio = nullptr;

private:
float m_volume = 1.0f;
};
};
4 changes: 2 additions & 2 deletions Audio/include/Audio/AudioStream.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class Audio;
class AudioStream : public AudioBase
{
public:
static Ref<AudioStream> Create(Audio *audio, const String &path, bool preload);
static Ref<AudioStream> Clone(Audio *audio, Ref<AudioStream> source);
static Ref<AudioStream> Create(Audio* audio, const String& path, bool preload);
static Ref<AudioStream> Clone(Audio* audio, Ref<AudioStream> source);
virtual ~AudioStream() = default;
// Starts playback of the stream or continues a paused stream
virtual void Play() = 0;
Expand Down
10 changes: 5 additions & 5 deletions Audio/include/Audio/Audio_Impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@ class Audio_Impl : public IMixer
protected:
// Used to limit rendering to a fixed number of samples
constexpr static uint32 m_sampleBufferLength = 384;
std::array<float, 2*m_sampleBufferLength> m_sampleBuffer;
std::array<float, 2 * m_sampleBufferLength> m_sampleBuffer;

private:
alignas(sizeof(float))
std::array<float, 2 * m_sampleBufferLength> m_itemBuffer;
std::array<float, 2 * m_sampleBufferLength> m_itemBuffer;

// Check memory corruption during filling m_itemBuffer
#if _DEBUG
constexpr static uint32 m_guardBandSize = 256;

alignas(1)
std::array<uint8, m_guardBandSize> m_guard;
std::array<uint8, m_guardBandSize> m_guard;

void InitMemoryGuard();
void CheckMemoryGuard();
#endif
};
};
62 changes: 31 additions & 31 deletions Audio/include/Audio/DSP.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ class PanDSP : public DSP
public:
// -1 to 1 LR pan value
float panning = 0.0f;
virtual void Process(float *out, uint32 numSamples);
virtual const char *GetName() const { return "PanDSP"; }
virtual void Process(float* out, uint32 numSamples);
virtual const char* GetName() const { return "PanDSP"; }
};

class BQFDSP : public DSP
{
public:
BQFDSP(uint32 sampleRate);

virtual void Process(float *out, uint32 numSamples);
virtual const char *GetName() const { return "BQFDSP"; }
virtual void Process(float* out, uint32 numSamples);
virtual const char* GetName() const { return "BQFDSP"; }

// Sets the filter parameters
void SetPeaking(float q, float freq, float gain);
Expand All @@ -64,9 +64,9 @@ class CombinedFilterDSP : public DSP
CombinedFilterDSP(uint32 sampleRate);
void SetLowPass(float q, float freq, float peakQ, float peakGain);
void SetHighPass(float q, float freq, float peakQ, float peakGain);
virtual const char *GetName() const { return "CombinedFilterDSP"; }
virtual const char* GetName() const { return "CombinedFilterDSP"; }

virtual void Process(float *out, uint32 numSamples);
virtual void Process(float* out, uint32 numSamples);

private:
BQFDSP a;
Expand All @@ -80,8 +80,8 @@ class LimiterDSP : public DSP
LimiterDSP(uint32 sampleRate);

float releaseTime = 0.1f;
virtual void Process(float *out, uint32 numSamples);
virtual const char *GetName() const { return "LimiterDSP"; }
virtual void Process(float* out, uint32 numSamples);
virtual const char* GetName() const { return "LimiterDSP"; }

private:
float m_currentMaxVolume = 1.0f;
Expand All @@ -95,13 +95,13 @@ class BitCrusherDSP : public DSP

// Duration of samples, <1 = disable
void SetPeriod(float period = 0);
virtual void Process(float *out, uint32 numSamples);
virtual const char *GetName() const { return "BitCrusherDSP"; }
virtual void Process(float* out, uint32 numSamples);
virtual const char* GetName() const { return "BitCrusherDSP"; }

private:
uint32 m_period = 1;
uint32 m_increment = 0;
float m_sampleBuffer[2] = {0.0f};
float m_sampleBuffer[2] = { 0.0f };
uint32 m_currentDuration = 0;
};

Expand All @@ -117,8 +117,8 @@ class GateDSP : public DSP
// Low volume
float low = 0.1f;

virtual void Process(float *out, uint32 numSamples);
virtual const char *GetName() const { return "GateDSP"; }
virtual void Process(float* out, uint32 numSamples);
virtual const char* GetName() const { return "GateDSP"; }

private:
float m_gating = 0.5f;
Expand All @@ -136,8 +136,8 @@ class TapeStopDSP : public DSP

void SetLength(double length);

virtual void Process(float *out, uint32 numSamples);
virtual const char *GetName() const { return "TapeStopDSP"; }
virtual void Process(float* out, uint32 numSamples);
virtual const char* GetName() const { return "TapeStopDSP"; }

private:
uint32 m_length = 0;
Expand All @@ -156,8 +156,8 @@ class RetriggerDSP : public DSP
void SetGating(float gating);
void SetMaxLength(uint32 length);

virtual void Process(float *out, uint32 numSamples);
virtual const char *GetName() const { return "RetriggerDSP"; }
virtual void Process(float* out, uint32 numSamples);
virtual const char* GetName() const { return "RetriggerDSP"; }

private:
float m_gating = 0.75f;
Expand All @@ -181,8 +181,8 @@ class WobbleDSP : public DSP
float fmax = 20000.0f;
float q = 1.414f;

virtual void Process(float *out, uint32 numSamples);
virtual const char *GetName() const { return "WobbleDSP"; }
virtual void Process(float* out, uint32 numSamples);
virtual const char* GetName() const { return "WobbleDSP"; }

private:
BQF m_filters[2];
Expand All @@ -206,15 +206,15 @@ class PhaserDSP : public DSP
void SetLength(double length);
void SetStage(uint32 stage);

virtual void Process(float *out, uint32 numSamples);
virtual const char *GetName() const { return "PhaserDSP"; }
virtual void Process(float* out, uint32 numSamples);
virtual const char* GetName() const { return "PhaserDSP"; }

private:
uint32 m_length = 0;
uint32 m_stage = 6;
BQF m_apf[12][2];
BQF m_hiShelf[2];
float za[2] = {0.0f};
float za[2] = { 0.0f };
uint32 m_currentSample = 0;
};

Expand All @@ -229,8 +229,8 @@ class FlangerDSP : public DSP
void SetStereoWidth(float stereoWidth);
void SetVolume(float volume);

virtual void Process(float *out, uint32 numSamples);
virtual const char *GetName() const { return "FlangerDSP"; }
virtual void Process(float* out, uint32 numSamples);
virtual const char* GetName() const { return "FlangerDSP"; }

private:
uint32 m_length = 0;
Expand Down Expand Up @@ -258,8 +258,8 @@ class EchoDSP : public DSP

float feedback = 0.6f;

virtual void Process(float *out, uint32 numSamples);
virtual const char *GetName() const { return "EchoDSP"; }
virtual void Process(float* out, uint32 numSamples);
virtual const char* GetName() const { return "EchoDSP"; }

private:
uint32 m_bufferLength = 0;
Expand All @@ -280,8 +280,8 @@ class SidechainDSP : public DSP

float ratio = 5.0f;

virtual void Process(float *out, uint32 numSamples);
virtual const char *GetName() const { return "SidechainDSP"; }
virtual void Process(float* out, uint32 numSamples);
virtual const char* GetName() const { return "SidechainDSP"; }

private:
uint32 m_length = 0;
Expand All @@ -301,9 +301,9 @@ class PitchShiftDSP : public DSP

~PitchShiftDSP();

virtual void Process(float *out, uint32 numSamples);
virtual const char *GetName() const { return "PitchShiftDSP"; }
virtual void Process(float* out, uint32 numSamples);
virtual const char* GetName() const { return "PitchShiftDSP"; }

private:
class PitchShiftDSP_Impl *m_impl;
class PitchShiftDSP_Impl* m_impl;
};
2 changes: 1 addition & 1 deletion Audio/include/Audio/Sample.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ class SampleRes : public AudioBase
virtual bool IsPlaying() const = 0;
};

typedef Ref<SampleRes> Sample;
typedef Ref<SampleRes> Sample;
Loading