e1lama/SeeSynth
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

[refactor]: formatting

Browse Source
This commit is contained in:
HiveBeats
2023-08-08 23:24:26 +04:00
parent a445fc44b3
commit 268103d7da
14 changed files with 495 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

216
.clang-format Normal file
View File

@@ -0,0 +1,216 @@
---
Language: Cpp
# BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignArrayOfStructures: None
AlignConsecutiveAssignments:
Enabled: false
AcrossEmptyLines: false
AcrossComments: false
AlignCompound: false
PadOperators: true
AlignConsecutiveBitFields:
Enabled: false
AcrossEmptyLines: false
AcrossComments: false
AlignCompound: false
PadOperators: false
AlignConsecutiveDeclarations:
Enabled: false
AcrossEmptyLines: false
AcrossComments: false
AlignCompound: false
PadOperators: false
AlignConsecutiveMacros:
Enabled: false
AcrossEmptyLines: false
AcrossComments: false
AlignCompound: false
PadOperators: false
AlignEscapedNewlines: Right
AlignOperands: Align
AlignTrailingComments: true
AllowAllArgumentsOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortEnumsOnASingleLine: true
AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortLambdasOnASingleLine: All
AllowShortIfStatementsOnASingleLine: Never
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: MultiLine
AttributeMacros:
- __capability
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
AfterCaseLabel: false
AfterClass: false
AfterControlStatement: Never
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
BeforeLambdaBody: false
BeforeWhile: false
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: None
BreakBeforeConceptDeclarations: Always
BreakBeforeBraces: Attach
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 80
CommentPragmas: '^ IWYU pragma:'
QualifierAlignment: Leave
CompactNamespaces: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DeriveLineEnding: true
DerivePointerAlignment: false
DisableFormat: false
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: LogicalBlock
ExperimentalAutoDetectBinPacking: false
PackConstructorInitializers: BinPack
BasedOnStyle: ''
ConstructorInitializerAllOnOneLineOrOnePerLine: false
AllowAllConstructorInitializersOnNextLine: true
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IfMacros:
- KJ_IF_MAYBE
IncludeBlocks: Preserve
IncludeCategories:
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
Priority: 2
SortPriority: 0
CaseSensitive: false
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
Priority: 3
SortPriority: 0
CaseSensitive: false
- Regex: '.*'
Priority: 1
SortPriority: 0
CaseSensitive: false
IncludeIsMainRegex: '(Test)?$'
IncludeIsMainSourceRegex: ''
IndentAccessModifiers: false
IndentCaseLabels: true
IndentCaseBlocks: false
IndentGotoLabels: true
IndentPPDirectives: None
IndentExternBlock: AfterExternBlock
IndentRequiresClause: true
IndentWidth: 4
IndentWrappedFunctionNames: false
InsertBraces: false
InsertTrailingCommas: None
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: true
LambdaBodyIndentation: Signature
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBinPackProtocolList: Auto
ObjCBlockIndentWidth: 2
ObjCBreakBeforeNestedBlockParam: true
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakOpenParenthesis: 0
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PenaltyIndentedWhitespace: 0
PointerAlignment: Left
PPIndentWidth: -1
ReferenceAlignment: Pointer
ReflowComments: true
RemoveBracesLLVM: false
RequiresClausePosition: OwnLine
SeparateDefinitionBlocks: Leave
ShortNamespaceLines: 1
SortIncludes: CaseSensitive
SortJavaStaticImport: Before
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceBeforeParensOptions:
AfterControlStatements: true
AfterForeachMacros: true
AfterFunctionDefinitionName: false
AfterFunctionDeclarationName: false
AfterIfMacros: true
AfterOverloadedOperator: false
AfterRequiresInClause: false
AfterRequiresInExpression: false
BeforeNonEmptyParentheses: false
SpaceAroundPointerQualifiers: Default
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: Never
SpacesInConditionalStatement: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInLineCommentPrefix:
Minimum: 1
Maximum: -1
SpacesInParentheses: false
SpacesInSquareBrackets: false
SpaceBeforeSquareBrackets: false
BitFieldColonSpacing: Both
Standard: Latest
StatementAttributeLikeMacros:
- Q_EMIT
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
TabWidth: 8
UseCRLF: false
UseTab: Never
WhitespaceSensitiveMacros:
- STRINGIZE
- PP_STRINGIZE
- BOOST_PP_STRINGIZE
- NS_SWIFT_NAME
- CF_SWIFT_NAME
...

16
inc/Adder.h
View File

@@ -1,24 +1,22 @@
#pragma once #pragma once
#include <vector>
#include "Oscillator.h" #include "Oscillator.h"
#include "Settings.h" #include "Settings.h"
#include <numeric> #include <numeric>
#include <vector>
struct Adder struct Adder {
{ static std::vector<float>&
static std::vector<float> & SumOscillators(const std::vector<Oscillator*> & oscillators, float duration) SumOscillators(const std::vector<Oscillator*>& oscillators,
{ float duration) {
size_t sample_count = (size_t)(duration * SAMPLE_RATE); size_t sample_count = (size_t)(duration * SAMPLE_RATE);
std::vector<float>* output = new std::vector<float>(); std::vector<float>* output = new std::vector<float>();
output->reserve(sample_count); output->reserve(sample_count);
for (size_t i = 0; i < sample_count; i++) for (size_t i = 0; i < sample_count; i++) {
{
float sample = 0.0f; float sample = 0.0f;
for (Oscillator* osc : oscillators) for (Oscillator* osc : oscillators) {
{
sample += osc->GenerateSample(duration); sample += osc->GenerateSample(duration);
} }

10
inc/Application.h
View File

@@ -1,13 +1,12 @@
#pragma once #pragma once
#include "Note.h" #include "Note.h"
#include "Synth.h"
#include "raylib.h"
#include "RingBuffer.h"
#include "Renderer.h" #include "Renderer.h"
#include "RingBuffer.h"
#include "Synth.h"
#include "SynthGuiState.h" #include "SynthGuiState.h"
#include "raylib.h"
class Application class Application {
{
private: private:
Synth m_synth; Synth m_synth;
SynthGuiState m_synth_gui_state; SynthGuiState m_synth_gui_state;
@@ -29,4 +28,3 @@ public:
~Application(); ~Application();
void Run(); void Run();
}; };

24
inc/KeyBoard.h
View File

@@ -1,22 +1,23 @@
#pragma once #pragma once
#include "Settings.h" #include "Settings.h"
#include <cmath> #include <cmath>
#include <cstring>
#include <cstdlib> #include <cstdlib>
#include <cstring>
#include <string> #include <string>
class KeyBoard class KeyBoard {
{
private: private:
/* data */ /* data */
static int get_semitone_shift_internal(const char* root_note, char* target_note) { static int get_semitone_shift_internal(const char* root_note,
const char* pitch_classes[12] = char* target_note) {
{ "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B" }; const char* pitch_classes[12] = {"C", "C#", "D", "D#", "E", "F",
"F#", "G", "G#", "A", "A#", "B"};
// Extract the note number and pitch class for the root note // Extract the note number and pitch class for the root note
int root_note_num = (int)root_note[strlen(root_note) - 1] - '0'; int root_note_num = (int)root_note[strlen(root_note) - 1] - '0';
char* root_pitch_class_str = (char*)malloc((strlen(root_note) - 1) * sizeof(char)); char* root_pitch_class_str =
(char*)malloc((strlen(root_note) - 1) * sizeof(char));
strncpy(root_pitch_class_str, root_note, strlen(root_note) - 1); strncpy(root_pitch_class_str, root_note, strlen(root_note) - 1);
int root_pitch_class = -1; int root_pitch_class = -1;
@@ -52,6 +53,7 @@ private:
return (target_note_num - root_note_num) * 12 + return (target_note_num - root_note_num) * 12 +
(target_pitch_class - root_pitch_class); (target_pitch_class - root_pitch_class);
} }
public: public:
KeyBoard(/* args */); KeyBoard(/* args */);
~KeyBoard(); ~KeyBoard();
@@ -71,10 +73,6 @@ public:
} }
}; };
KeyBoard::KeyBoard(/* args */) KeyBoard::KeyBoard(/* args */) {}
{
}
KeyBoard::~KeyBoard() KeyBoard::~KeyBoard() {}
{
}

11
inc/Oscillator.h
View File

@@ -1,20 +1,14 @@
#pragma once #pragma once
#include<vector>
#include "OscillatorType.h" #include "OscillatorType.h"
#include <vector>
class Oscillator {
class Oscillator
{
//typedef float (Oscillator::*OscFunction)(void);
//typedef float (Oscillator::*DtFunction)(float);
private: private:
OscillatorType m_osc; OscillatorType m_osc;
float m_freq; float m_freq;
float m_volume; float m_volume;
float m_phase; float m_phase;
float m_phase_dt; float m_phase_dt;
//значение типа "float (Oscillator::*)()" нельзя присвоить сущности типа "float (*)()"
float (Oscillator::*m_osc_function)(void); float (Oscillator::*m_osc_function)(void);
float (Oscillator::*m_dt_function)(float freq); float (Oscillator::*m_dt_function)(float freq);
void sine_osc_phase_incr(); void sine_osc_phase_incr();
@@ -26,6 +20,7 @@ class Oscillator
float squareosc(); float squareosc();
float sign(float v); float sign(float v);
float sineosc(); float sineosc();
public: public:
Oscillator(OscillatorType osc, float freq, float volume); Oscillator(OscillatorType osc, float freq, float volume);
~Oscillator(); ~Oscillator();

7
inc/OscillatorType.h
View File

@@ -1,7 +1,2 @@
#pragma once #pragma once
typedef enum { typedef enum { Sine, Triangle, Saw, Square } OscillatorType;
Sine,
Triangle,
Saw,
Square
} OscillatorType;

19
inc/Renderer.h
View File

@@ -1,27 +1,26 @@
#pragma once #pragma once
#include "Synth.h" #include "Synth.h"
#include "SynthGuiState.h" #include "SynthGuiState.h"
#include <vector>
#include "raylib.h" #include "raylib.h"
#include <vector>
class Renderer class Renderer {
{
private: private:
void DrawMainPanel(const Rectangle& panel_bounds); void DrawMainPanel(const Rectangle& panel_bounds);
void DrawAddOscillatorButton(Synth & synth, SynthGuiState & synthGui, Rectangle panel_bounds); void DrawAddOscillatorButton(Synth& synth, SynthGuiState& synthGui,
void DrawOscillatorsPanels(const std::vector<Oscillator*>& oscillators, Rectangle panel_bounds);
void DrawOscillatorsPanels(
const std::vector<Oscillator*>& oscillators,
const std::vector<OscillatorGuiState*>& guiOscillators, const std::vector<OscillatorGuiState*>& guiOscillators,
const Rectangle& panel_bounds); const Rectangle& panel_bounds);
void DrawOscillatorsShapeInputs(const std::vector<Oscillator*>& oscillators, void DrawOscillatorsShapeInputs(
const std::vector<Oscillator*>& oscillators,
const std::vector<OscillatorGuiState*>& guiOscillators); const std::vector<OscillatorGuiState*>& guiOscillators);
void DrawUi(Synth& synth, SynthGuiState& synthGui); void DrawUi(Synth& synth, SynthGuiState& synthGui);
void DrawSignal(Synth& synth, SynthGuiState& synthGui); void DrawSignal(Synth& synth, SynthGuiState& synthGui);
public: public:
Renderer(/* args */); Renderer(/* args */);
~Renderer(); ~Renderer();
void Draw(Synth& synth, SynthGuiState& synthGui); void Draw(Synth& synth, SynthGuiState& synthGui);
}; };

54
inc/RingBuffer.h
View File

@@ -1,9 +1,7 @@
#pragma once #pragma once
#include <cstddef>
#include "Logger.h" #include "Logger.h"
template <typename T> #include <cstddef>
class RingBuffer template <typename T> class RingBuffer {
{
private: private:
T* m_items; /* data */ T* m_items; /* data */
std::size_t m_head; std::size_t m_head;
@@ -13,6 +11,7 @@ private:
std::size_t m_size; std::size_t m_size;
void advance_pointer(); void advance_pointer();
void retreat_pointer(); void retreat_pointer();
public: public:
RingBuffer(std::size_t size); RingBuffer(std::size_t size);
~RingBuffer(); ~RingBuffer();
@@ -26,8 +25,7 @@ public:
void Print(); void Print();
}; };
template <typename T> RingBuffer<T>::RingBuffer(std::size_t size) template <typename T> RingBuffer<T>::RingBuffer(std::size_t size) {
{
m_items = new T[size]; m_items = new T[size];
m_head = 0; m_head = 0;
m_tail = 0; m_tail = 0;
@@ -36,20 +34,15 @@ template <typename T> RingBuffer<T>::RingBuffer(std::size_t size)
m_size = size; m_size = size;
} }
template <typename T> RingBuffer<T>::~RingBuffer() template <typename T> RingBuffer<T>::~RingBuffer() { delete[] m_items; }
{
delete[] m_items;
}
template <typename T> void RingBuffer<T>::Reset() template <typename T> void RingBuffer<T>::Reset() {
{
m_head = 0; m_head = 0;
m_tail = 0; m_tail = 0;
m_is_full = 0; m_is_full = 0;
} }
template <typename T> void RingBuffer<T>::advance_pointer() template <typename T> void RingBuffer<T>::advance_pointer() {
{
if (m_is_full) { if (m_is_full) {
m_tail++; m_tail++;
if (m_tail == m_size) { if (m_tail == m_size) {
@@ -64,8 +57,7 @@ template <typename T> void RingBuffer<T>::advance_pointer()
m_is_full = p_is_full; m_is_full = p_is_full;
} }
template <typename T> void RingBuffer<T>::retreat_pointer() template <typename T> void RingBuffer<T>::retreat_pointer() {
{
m_is_full = 0; m_is_full = 0;
m_tail++; m_tail++;
if (m_tail == m_size) { if (m_tail == m_size) {
@@ -73,13 +65,11 @@ template <typename T> void RingBuffer<T>::retreat_pointer()
} }
} }
template <typename T> void RingBuffer<T>::Write(T* data, std::size_t count) template <typename T> void RingBuffer<T>::Write(T* data, std::size_t count) {
{
if (m_is_full || m_head + count > m_size) { if (m_is_full || m_head + count > m_size) {
write_log("[WARN] Trying to overfill the ring buffer: \n\tIsFull:%d\n\tHead:%zu\n\tCount:%zu\n\t", write_log("[WARN] Trying to overfill the ring buffer: "
m_is_full, "\n\tIsFull:%d\n\tHead:%zu\n\tCount:%zu\n\t",
m_head, m_is_full, m_head, count);
count);
return; return;
} }
m_is_empty = 0; m_is_empty = 0;
@@ -91,8 +81,7 @@ template <typename T> void RingBuffer<T>::Write(T* data, std::size_t count)
// m_is_empty = m_is_full && (m_head == m_tail); // m_is_empty = m_is_full && (m_head == m_tail);
} }
template <typename T> bool RingBuffer<T>::Read(T* output, std::size_t count) template <typename T> bool RingBuffer<T>::Read(T* output, std::size_t count) {
{
if (m_is_empty) { if (m_is_empty) {
write_log("[WARN] Trying to read empty buffer"); write_log("[WARN] Trying to read empty buffer");
return 0; return 0;
@@ -106,14 +95,12 @@ template <typename T> bool RingBuffer<T>::Read(T* output, std::size_t count)
return 1; return 1;
} }
template <typename T> std::size_t RingBuffer<T>::GetSize() template <typename T> std::size_t RingBuffer<T>::GetSize() {
{
size_t p_size = m_size; size_t p_size = m_size;
if (!m_is_full) { if (!m_is_full) {
if (m_head >= m_tail) { if (m_head >= m_tail) {
p_size = (m_head - m_tail); p_size = (m_head - m_tail);
} } else {
else {
p_size = (m_size + m_head - m_tail); p_size = (m_size + m_head - m_tail);
} }
} }
@@ -121,11 +108,8 @@ template <typename T> std::size_t RingBuffer<T>::GetSize()
return p_size; return p_size;
} }
template <typename T> void RingBuffer<T>::Print() template <typename T> void RingBuffer<T>::Print() {
{ write_log("[INFO] The ring buffer: "
write_log("[INFO] The ring buffer: \n\tIsFull:%d\n\tIsEmpty:%d\n\tHead:%zu\n\tTail:%zu\n\t", "\n\tIsFull:%d\n\tIsEmpty:%d\n\tHead:%zu\n\tTail:%zu\n\t",
m_is_full, m_is_full, m_is_empty, m_head, m_tail);
m_is_empty,
m_head,
m_tail);
} }

9
inc/Synth.h
View File

@@ -1,13 +1,12 @@
#pragma once #pragma once
#include <vector>
#include "Oscillator.h"
#include "Note.h"
#include "Adder.h" #include "Adder.h"
#include "Note.h"
#include "Oscillator.h"
#include "Settings.h" #include "Settings.h"
#include <vector>
class Synth class Synth {
{
private: private:
std::vector<Oscillator*> m_oscillators; std::vector<Oscillator*> m_oscillators;
Adder m_adder; Adder m_adder;

95
src/Application.cpp
View File

@@ -1,18 +1,16 @@
#include "Application.h" #include "Application.h"
#include "Settings.h"
#include "Logger.h" #include "Logger.h"
#include "Settings.h"
#include <string> #include <string>
Application::Application(/* args */) Application::Application(/* args */) {
{
m_ring_buffer = new RingBuffer<float>((std::size_t)STREAM_BUFFER_SIZE); m_ring_buffer = new RingBuffer<float>((std::size_t)STREAM_BUFFER_SIZE);
m_temp_buffer = new float[STREAM_BUFFER_SIZE]; m_temp_buffer = new float[STREAM_BUFFER_SIZE];
init_synth(); init_synth();
init_audio(); init_audio();
} }
Application::~Application() Application::~Application() {
{
StopAudioStream(m_synth_stream); StopAudioStream(m_synth_stream);
UnloadAudioStream(m_synth_stream); UnloadAudioStream(m_synth_stream);
CloseAudioDevice(); CloseAudioDevice();
@@ -25,8 +23,7 @@ Application::~Application()
} }
} }
void Application::init_audio() void Application::init_audio() {
{
m_sound_played_count = 0; m_sound_played_count = 0;
InitAudioDevice(); InitAudioDevice();
@@ -38,69 +35,54 @@ void Application::init_audio()
PlayAudioStream(m_synth_stream); PlayAudioStream(m_synth_stream);
} }
void Application::init_synth() void Application::init_synth() {
{
// todo: move that variables to Synth declaration // todo: move that variables to Synth declaration
std::string* nameString = new std::string(std::string(new char[3])); std::string* nameString = new std::string(std::string(new char[3]));
m_current_note = new Note m_current_note = new Note{.length = 1, .name = (*nameString)};
{
.length = 1,
.name = (*nameString)
};
// todo: move somewhere in initialization // todo: move somewhere in initialization
std::vector<Oscillator*> oscillators = m_synth.GetOscillators(); std::vector<Oscillator*> oscillators = m_synth.GetOscillators();
m_synth_gui_state.oscillators.reserve(oscillators.size()); m_synth_gui_state.oscillators.reserve(oscillators.size());
for (size_t i = 0; i < oscillators.size(); i++) for (size_t i = 0; i < oscillators.size(); i++) {
{
Oscillator* osc = oscillators[i]; Oscillator* osc = oscillators[i];
assert(osc); assert(osc);
OscillatorGuiState* ui = new OscillatorGuiState { OscillatorGuiState* ui =
.freq = osc->GetFreq(), new OscillatorGuiState{.freq = osc->GetFreq(),
.waveshape = osc->GetType(), .waveshape = osc->GetType(),
.volume = osc->GetVolume() .volume = osc->GetVolume()};
};
m_synth_gui_state.oscillators.push_back(ui); m_synth_gui_state.oscillators.push_back(ui);
} }
} }
std::size_t Application::detect_note_pressed(Note* note) std::size_t Application::detect_note_pressed(Note* note) {
{
std::size_t is_pressed = 0; std::size_t is_pressed = 0;
note->length = 8; note->length = 8;
if (IsKeyPressed(KEY_A)) if (IsKeyPressed(KEY_A)) {
{
note->name.assign("A4"); note->name.assign("A4");
is_pressed = 1; is_pressed = 1;
} }
if (IsKeyPressed(KEY_B)) if (IsKeyPressed(KEY_B)) {
{
note->name.assign("B4"); note->name.assign("B4");
is_pressed = 1; is_pressed = 1;
} }
if (IsKeyPressed(KEY_C)) if (IsKeyPressed(KEY_C)) {
{
note->name.assign("C4"); note->name.assign("C4");
is_pressed = 1; is_pressed = 1;
} }
if (IsKeyPressed(KEY_D)) if (IsKeyPressed(KEY_D)) {
{
note->name.assign("D4"); note->name.assign("D4");
is_pressed = 1; is_pressed = 1;
} }
if (IsKeyPressed(KEY_E)) if (IsKeyPressed(KEY_E)) {
{
note->name.assign("E4"); note->name.assign("E4");
is_pressed = 1; is_pressed = 1;
} }
if (IsKeyPressed(KEY_F)) if (IsKeyPressed(KEY_F)) {
{
note->name.assign("F4"); note->name.assign("F4");
is_pressed = 1; is_pressed = 1;
} }
if (IsKeyPressed(KEY_G)) if (IsKeyPressed(KEY_G)) {
{
note->name.assign("G4"); note->name.assign("G4");
is_pressed = 1; is_pressed = 1;
} }
@@ -108,10 +90,8 @@ std::size_t Application::detect_note_pressed(Note* note)
} }
// Update On Input // Update On Input
void Application::update_on_note_input() void Application::update_on_note_input() {
{ if (detect_note_pressed(m_current_note)) {
if (detect_note_pressed(m_current_note))
{
m_synth.ProduceNoteSound((*m_current_note)); m_synth.ProduceNoteSound((*m_current_note));
m_sound_played_count = 0; m_sound_played_count = 0;
write_log("Note played: %s\n", m_current_note->name.c_str()); write_log("Note played: %s\n", m_current_note->name.c_str());
@@ -119,49 +99,43 @@ void Application::update_on_note_input()
} }
// Play ring-buffered audio // Play ring-buffered audio
void Application::play_buffered_audio() void Application::play_buffered_audio() {
{ if (IsAudioStreamProcessed(m_synth_stream) && !m_ring_buffer->IsEmpty()) {
if (IsAudioStreamProcessed(m_synth_stream) && !m_ring_buffer->IsEmpty())
{
std::size_t size_to_read = m_ring_buffer->GetSize(); std::size_t size_to_read = m_ring_buffer->GetSize();
write_log("Samples to play:%zu \n", size_to_read); write_log("Samples to play:%zu \n", size_to_read);
//todo: try to start reading directly from ring buffer, avoiding temp_buffer // todo: try to start reading directly from ring buffer, avoiding
// temp_buffer
m_ring_buffer->Read(m_temp_buffer, size_to_read); m_ring_buffer->Read(m_temp_buffer, size_to_read);
// can try the SetAudioStreamCallback // can try the SetAudioStreamCallback
UpdateAudioStream(m_synth_stream, m_temp_buffer, size_to_read); UpdateAudioStream(m_synth_stream, m_temp_buffer, size_to_read);
// can overwrite the ring buffer to avoid that // can overwrite the ring buffer to avoid that
if (m_synth.GetOutSignal().size() == m_sound_played_count) if (m_synth.GetOutSignal().size() == m_sound_played_count) {
{
m_ring_buffer->Reset(); m_ring_buffer->Reset();
} }
} }
} }
// Fill ring buffer from current sound // Fill ring buffer from current sound
void Application::fill_audio_buffer() void Application::fill_audio_buffer() {
{ if (!m_ring_buffer->IsFull() &&
if (!m_ring_buffer->IsFull() && m_synth.GetOutSignal().size() != m_sound_played_count) m_synth.GetOutSignal().size() != m_sound_played_count) {
{
write_log("[INFO] IsFull:%d Samples:%zu Played:%d\n", write_log("[INFO] IsFull:%d Samples:%zu Played:%d\n",
m_ring_buffer->IsFull(), m_ring_buffer->IsFull(), m_synth.GetOutSignal().size(),
m_synth.GetOutSignal().size(),
m_sound_played_count); m_sound_played_count);
// how many samples need write // how many samples need write
std::size_t size_to_fill = 0; std::size_t size_to_fill = 0;
if ((m_synth.GetOutSignal().size() - m_sound_played_count) > m_ring_buffer->GetCapacity()) if ((m_synth.GetOutSignal().size() - m_sound_played_count) >
{ m_ring_buffer->GetCapacity()) {
size_to_fill = m_ring_buffer->GetCapacity(); size_to_fill = m_ring_buffer->GetCapacity();
} else } else {
{
size_to_fill = m_synth.GetOutSignal().size() - m_sound_played_count; size_to_fill = m_synth.GetOutSignal().size() - m_sound_played_count;
} }
write_log("[INFO] SizeToFill:%zu\n", size_to_fill); write_log("[INFO] SizeToFill:%zu\n", size_to_fill);
for (size_t i = 0; i < size_to_fill; i++) for (size_t i = 0; i < size_to_fill; i++) {
{
m_temp_buffer[i] = m_synth.GetOutSignal()[i]; m_temp_buffer[i] = m_synth.GetOutSignal()[i];
} }
@@ -170,8 +144,7 @@ void Application::fill_audio_buffer()
} }
} }
void Application::Run() void Application::Run() {
{
// Main game loop // Main game loop
while (!WindowShouldClose()) // Detect window close button or ESC key while (!WindowShouldClose()) // Detect window close button or ESC key
{ {

50
src/Oscillator.cpp
View File

@@ -3,26 +3,21 @@
#define TWO_PI 2 * SYNTH_PI #define TWO_PI 2 * SYNTH_PI
Oscillator::Oscillator(OscillatorType osc, float freq, float volume) Oscillator::Oscillator(OscillatorType osc, float freq, float volume) {
{
SetType(osc); SetType(osc);
m_freq = freq; m_freq = freq;
m_volume = volume; m_volume = volume;
} }
Oscillator::~Oscillator() Oscillator::~Oscillator() {}
{
}
void Oscillator::Reset() void Oscillator::Reset() {
{
m_volume = 0; m_volume = 0;
m_phase = 0; m_phase = 0;
m_phase_dt = 0; m_phase_dt = 0;
} }
void Oscillator::SetType(OscillatorType osc) void Oscillator::SetType(OscillatorType osc) {
{
m_osc = osc; m_osc = osc;
switch (m_osc) { switch (m_osc) {
case Sine: case Sine:
@@ -44,68 +39,53 @@ void Oscillator::SetType(OscillatorType osc)
} }
} }
void Oscillator::SetFreq(float freq) void Oscillator::SetFreq(float freq) {
{
m_freq = freq; m_freq = freq;
m_phase = 0; m_phase = 0;
m_phase_dt = (this->*m_dt_function)(freq); m_phase_dt = (this->*m_dt_function)(freq);
} }
float Oscillator::GenerateSample(float duration) float Oscillator::GenerateSample(float duration) {
{
return (this->*m_osc_function)() * m_volume; return (this->*m_osc_function)() * m_volume;
} }
void Oscillator::sine_osc_phase_incr() void Oscillator::sine_osc_phase_incr() {
{
m_phase += m_phase_dt; m_phase += m_phase_dt;
if (m_phase >= TWO_PI) if (m_phase >= TWO_PI)
m_phase -= TWO_PI; m_phase -= TWO_PI;
} }
void Oscillator::saw_osc_phase_incr() void Oscillator::saw_osc_phase_incr() {
{
m_phase += m_phase_dt; m_phase += m_phase_dt;
if (m_phase >= 1.0f) if (m_phase >= 1.0f)
m_phase -= 1.0f; m_phase -= 1.0f;
} }
float Oscillator::calc_saw_phase_delta(float freq) float Oscillator::calc_saw_phase_delta(float freq) {
{
return freq / SAMPLE_RATE; return freq / SAMPLE_RATE;
} }
float Oscillator::calc_sine_phase_delta(float freq) float Oscillator::calc_sine_phase_delta(float freq) {
{
return (TWO_PI * freq) / SAMPLE_RATE; return (TWO_PI * freq) / SAMPLE_RATE;
} }
float Oscillator::sineosc() float Oscillator::sineosc() {
{
float result = sinf(m_phase); float result = sinf(m_phase);
sine_osc_phase_incr(); sine_osc_phase_incr();
return result; return result;
} }
float Oscillator::sign(float v) float Oscillator::sign(float v) { return (v > 0.0) ? 1.f : -1.f; }
{
return (v > 0.0) ? 1.f : -1.f;
}
float Oscillator::squareosc() float Oscillator::squareosc() { return sign(sineosc()); }
{
return sign(sineosc());
}
float Oscillator::triangleosc() float Oscillator::triangleosc() {
{
float result = 1.f - fabsf(m_phase - 0.5f) * 4.f; float result = 1.f - fabsf(m_phase - 0.5f) * 4.f;
saw_osc_phase_incr(); saw_osc_phase_incr();
return result; return result;
} }
float Oscillator::sawosc() float Oscillator::sawosc() {
{
float result = m_phase * 2.f - 1.f; float result = m_phase * 2.f - 1.f;
saw_osc_phase_incr(); saw_osc_phase_incr();
return result; return result;

129
src/Renderer.cpp
View File

@@ -1,55 +1,51 @@
#include "Renderer.h" #include "Renderer.h"
#define RAYGUI_IMPLEMENTATION #define RAYGUI_IMPLEMENTATION
#include "raygui.h"
#include "Settings.h"
#include "Logger.h" #include "Logger.h"
#include "Settings.h"
#include "raygui.h"
Renderer::Renderer(/* args */) Renderer::Renderer(/* args */) {
{
InitWindow(WINDOW_WIDTH, WINDOW_HEIGHT, "SeeSynth - v0.2"); InitWindow(WINDOW_WIDTH, WINDOW_HEIGHT, "SeeSynth - v0.2");
SetTargetFPS(60); SetTargetFPS(60);
} }
Renderer::~Renderer() Renderer::~Renderer() {}
{
}
void Renderer::Draw(Synth& synth, SynthGuiState& synthGui) void Renderer::Draw(Synth& synth, SynthGuiState& synthGui) {
{
BeginDrawing(); BeginDrawing();
ClearBackground(RAYWHITE); ClearBackground(RAYWHITE);
// todo: implement renderer // todo: implement renderer
DrawUi(synth, synthGui); DrawUi(synth, synthGui);
DrawSignal(synth, synthGui); DrawSignal(synth, synthGui);
//DrawText("Congrats! You created your first window!", 190, 200, 20, LIGHTGRAY); // DrawText("Congrats! You created your first window!", 190, 200, 20,
//DrawFPS(0,0); // LIGHTGRAY); DrawFPS(0,0);
EndDrawing(); EndDrawing();
} }
void Renderer::DrawSignal(Synth & synth, SynthGuiState & synthGui) void Renderer::DrawSignal(Synth& synth, SynthGuiState& synthGui) {
{ GuiGrid((Rectangle){0, 0, WINDOW_WIDTH, WINDOW_HEIGHT}, "",
GuiGrid((Rectangle){0, 0, WINDOW_WIDTH, WINDOW_HEIGHT}, "", WINDOW_HEIGHT / 8, 2); WINDOW_HEIGHT / 8, 2);
auto signal = synth.GetOutSignal(); auto signal = synth.GetOutSignal();
Vector2* signal_points = new Vector2[signal.size()]; Vector2* signal_points = new Vector2[signal.size()];
const float screen_vertical_midpoint = (WINDOW_HEIGHT / 2); const float screen_vertical_midpoint = (WINDOW_HEIGHT / 2);
for (int point_idx = 0; point_idx < signal.size(); point_idx++) for (int point_idx = 0; point_idx < signal.size(); point_idx++) {
{
signal_points[point_idx].x = (float)point_idx + OSCILLATOR_PANEL_WIDTH; signal_points[point_idx].x = (float)point_idx + OSCILLATOR_PANEL_WIDTH;
signal_points[point_idx].y = screen_vertical_midpoint + (int)(signal[point_idx] * 300); signal_points[point_idx].y =
screen_vertical_midpoint + (int)(signal[point_idx] * 300);
} }
DrawLineStrip(signal_points, signal.size(), RED); DrawLineStrip(signal_points, signal.size(), RED);
delete[] signal_points; delete[] signal_points;
} }
void Renderer::DrawOscillatorsShapeInputs(const std::vector<Oscillator*>& oscillators, const std::vector<OscillatorGuiState*>& guiOscillators) void Renderer::DrawOscillatorsShapeInputs(
{ const std::vector<Oscillator*>& oscillators,
const std::vector<OscillatorGuiState*>& guiOscillators) {
#define WAVE_SHAPE_OPTIONS "Sine;Triangle;Sawtooth;Square" #define WAVE_SHAPE_OPTIONS "Sine;Triangle;Sawtooth;Square"
// DRAW OSCILLATOR SHAPE INPUTS // DRAW OSCILLATOR SHAPE INPUTS
for (int i = 0; i < oscillators.size(); i += 1) for (int i = 0; i < oscillators.size(); i += 1) {
{
OscillatorGuiState* ui_osc = guiOscillators[i]; OscillatorGuiState* ui_osc = guiOscillators[i];
assert(ui_osc); assert(ui_osc);
@@ -58,31 +54,28 @@ void Renderer::DrawOscillatorsShapeInputs(const std::vector<Oscillator*>& oscill
// Shape select // Shape select
int shape_index = (int)(ui_osc->waveshape); int shape_index = (int)(ui_osc->waveshape);
bool is_dropdown_click = GuiDropdownBox(ui_osc->shape_dropdown_rect, bool is_dropdown_click =
WAVE_SHAPE_OPTIONS, GuiDropdownBox(ui_osc->shape_dropdown_rect, WAVE_SHAPE_OPTIONS,
&shape_index, &shape_index, ui_osc->is_dropdown_open);
ui_osc->is_dropdown_open
);
if (is_dropdown_click) if (is_dropdown_click) {
{
write_log("Dropdown clicked!\n"); write_log("Dropdown clicked!\n");
ui_osc->is_dropdown_open = !ui_osc->is_dropdown_open; ui_osc->is_dropdown_open = !ui_osc->is_dropdown_open;
ui_osc->waveshape = (OscillatorType)(shape_index); ui_osc->waveshape = (OscillatorType)(shape_index);
// APPLY STATE TO REAL OSC // APPLY STATE TO REAL OSC
osc->SetType(ui_osc->waveshape); osc->SetType(ui_osc->waveshape);
} }
if (ui_osc->is_dropdown_open) break; if (ui_osc->is_dropdown_open)
break;
} }
} }
void Renderer::DrawOscillatorsPanels(const std::vector<Oscillator*>& oscillators, void Renderer::DrawOscillatorsPanels(
const std::vector<Oscillator*>& oscillators,
const std::vector<OscillatorGuiState*>& guiOscillators, const std::vector<OscillatorGuiState*>& guiOscillators,
const Rectangle& panel_bounds) const Rectangle& panel_bounds) {
{
float panel_y_offset = 0; float panel_y_offset = 0;
for (int i = 0; i < oscillators.size(); i++) for (int i = 0; i < oscillators.size(); i++) {
{
OscillatorGuiState* ui_osc = guiOscillators[i]; OscillatorGuiState* ui_osc = guiOscillators[i];
assert(ui_osc); assert(ui_osc);
@@ -97,34 +90,24 @@ void Renderer::DrawOscillatorsPanels(const std::vector<Oscillator*>& oscillators
const int osc_panel_x = panel_bounds.x + 10; const int osc_panel_x = panel_bounds.x + 10;
const int osc_panel_y = panel_bounds.y + 50 + panel_y_offset; const int osc_panel_y = panel_bounds.y + 50 + panel_y_offset;
panel_y_offset += osc_panel_height + 5; panel_y_offset += osc_panel_height + 5;
GuiPanel((Rectangle){ GuiPanel((Rectangle){(float)osc_panel_x, (float)osc_panel_y,
(float)osc_panel_x, (float)osc_panel_width, (float)osc_panel_height},
(float)osc_panel_y,
(float)osc_panel_width,
(float)osc_panel_height
},
""); "");
const float slider_padding = 50.f; const float slider_padding = 50.f;
const float el_spacing = 5.f; const float el_spacing = 5.f;
Rectangle el_rect = { Rectangle el_rect = {.x = (float)osc_panel_x + slider_padding + 30,
.x = (float)osc_panel_x + slider_padding + 30,
.y = (float)osc_panel_y + 10, .y = (float)osc_panel_y + 10,
.width = (float)osc_panel_width - (slider_padding * 2), .width =
.height = 25.f (float)osc_panel_width - (slider_padding * 2),
}; .height = 25.f};
// Volume slider // Volume slider
float decibels = (20.f * log10f(osc->GetVolume())); float decibels = (20.f * log10f(osc->GetVolume()));
char amp_slider_label[32]; char amp_slider_label[32];
sprintf(amp_slider_label, "%.1f dB", decibels); sprintf(amp_slider_label, "%.1f dB", decibels);
decibels = GuiSlider(el_rect, decibels =
amp_slider_label, GuiSlider(el_rect, amp_slider_label, "", decibels, -60.0f, 0.0f);
"",
decibels,
-60.0f,
0.0f
);
ui_osc->volume = powf(10.f, decibels * (1.f / 20.f)); ui_osc->volume = powf(10.f, decibels * (1.f / 20.f));
osc->SetVolume(ui_osc->volume); osc->SetVolume(ui_osc->volume);
@@ -144,47 +127,47 @@ void Renderer::DrawOscillatorsPanels(const std::vector<Oscillator*>& oscillators
memmove( memmove(
synth->ui_oscillator + ui_osc_i, synth->ui_oscillator + ui_osc_i,
synth->ui_oscillator + ui_osc_i + 1, synth->ui_oscillator + ui_osc_i + 1,
(synth->ui_oscillator_count - ui_osc_i) * sizeof(UiOscillator) (synth->ui_oscillator_count - ui_osc_i) *
sizeof(UiOscillator)
); );
synth->ui_oscillator_count -= 1; synth->ui_oscillator_count -= 1;
} }
*/ */
} }
} }
void Renderer::DrawMainPanel(const Rectangle& panel_bounds) void Renderer::DrawMainPanel(const Rectangle& panel_bounds) {
{
bool is_shape_dropdown_open = false; bool is_shape_dropdown_open = false;
int shape_index = 0; int shape_index = 0;
GuiPanel(panel_bounds, ""); GuiPanel(panel_bounds, "");
} }
void Renderer::DrawAddOscillatorButton(Synth & synth, SynthGuiState & synthGui, Rectangle panel_bounds) void Renderer::DrawAddOscillatorButton(Synth& synth, SynthGuiState& synthGui,
{ Rectangle panel_bounds) {
bool click_add_oscillator = GuiButton((Rectangle){ //clang-format off
panel_bounds.x + 10, bool click_add_oscillator =
panel_bounds.y + 10, GuiButton((Rectangle){panel_bounds.x + 10, panel_bounds.y + 10,
panel_bounds.width - 20, panel_bounds.width - 20, 25.f},
25.f "Add Oscillator");
}, "Add Oscillator"); //clang-format on
if (click_add_oscillator)
{ if (click_add_oscillator) {
synth.AddOscillator(); synth.AddOscillator();
Oscillator* osc = synth.GetOscillators().back(); Oscillator* osc = synth.GetOscillators().back();
OscillatorGuiState* ui = new OscillatorGuiState { OscillatorGuiState* ui =
.freq = osc->GetFreq(), new OscillatorGuiState{.freq = osc->GetFreq(),
.waveshape = osc->GetType(), .waveshape = osc->GetType(),
.volume = osc->GetVolume() .volume = osc->GetVolume()};
};
synthGui.oscillators.push_back(ui); synthGui.oscillators.push_back(ui);
} }
} }
void Renderer::DrawUi(Synth & synth, SynthGuiState & synthGui) void Renderer::DrawUi(Synth& synth, SynthGuiState& synthGui) {
{ Rectangle panel_bounds = {.x = 0,
Rectangle panel_bounds = {.x = 0, .y = 0, .width = OSCILLATOR_PANEL_WIDTH, .height = WINDOW_HEIGHT }; .y = 0,
.width = OSCILLATOR_PANEL_WIDTH,
.height = WINDOW_HEIGHT};
DrawMainPanel(panel_bounds); DrawMainPanel(panel_bounds);
DrawAddOscillatorButton(synth, synthGui, panel_bounds); DrawAddOscillatorButton(synth, synthGui, panel_bounds);
// Draw Oscillators // Draw Oscillators

29
src/Synth.cpp
View File

@@ -1,39 +1,32 @@
#include "Synth.h" #include "Synth.h"
#include "Settings.h"
#include "KeyBoard.h" #include "KeyBoard.h"
#include "OscillatorType.h" #include "OscillatorType.h"
#include "Settings.h"
Synth::Synth(/* args */) Synth::Synth(/* args */) { AddOscillator(); }
{
AddOscillator();
}
Synth::~Synth() Synth::~Synth() {}
{
}
std::vector<float> & Synth::get_note(int semitone, float beats) std::vector<float>& Synth::get_note(int semitone, float beats) {
{
float hz = KeyBoard::GetHzBySemitone(semitone); float hz = KeyBoard::GetHzBySemitone(semitone);
float duration = beats * BEAT_DURATION; float duration = beats * BEAT_DURATION;
// will change after oscillator starts to be more autonomous // will change after oscillator starts to be more autonomous
for (Oscillator* osc : m_oscillators) for (Oscillator* osc : m_oscillators) {
{
osc->SetFreq(hz); osc->SetFreq(hz);
} }
return m_adder.SumOscillators(m_oscillators, duration); //todo: add other pipeline steps (e.g ADSR, Filters, FX); // todo: add other pipeline steps (e.g ADSR, Filters, FX);
return m_adder.SumOscillators(m_oscillators, duration);
} }
void Synth::ProduceNoteSound(Note input) void Synth::ProduceNoteSound(Note input) {
{
float length = 1.f / input.length; float length = 1.f / input.length;
int semitone_shift = KeyBoard::GetSemitoneShift(input.name); int semitone_shift = KeyBoard::GetSemitoneShift(input.name);
m_out_signal = get_note(semitone_shift, length); m_out_signal = get_note(semitone_shift, length);
} }
void Synth::AddOscillator() void Synth::AddOscillator() {
{ m_oscillators.push_back(
m_oscillators.push_back(new Oscillator(OscillatorType::Sine, 440.f, VOLUME)); new Oscillator(OscillatorType::Sine, 440.f, VOLUME));
} }