fix(note): semitone shift overflow

This commit is contained in:
2023-06-17 19:37:02 +04:00
parent 0cdac55d27
commit d7f4538418

44
main.c
View File

@@ -25,6 +25,9 @@ typedef struct SynthSound {
size_t sample_count; size_t sample_count;
} SynthSound; } SynthSound;
float synth_buffer[1024];
SynthSound synth_sound;
// frees the original sounds // frees the original sounds
SynthSound concat_sounds(SynthSound* sounds, size_t count) { SynthSound concat_sounds(SynthSound* sounds, size_t count) {
size_t total_count = 0; size_t total_count = 0;
@@ -181,6 +184,20 @@ static SynthSound freq(float duration, OscillatorParameterList osc) {
} }
*/ */
// if (samples.sample_count > 1024) {
// samples.sample_count = 1024;
// }
// //todo: move to somewhere
// for (size_t i = 0; i < 1024; i++) {
// synth_sound.samples[i] = 0.0f;
// }
// for (size_t i = 0; i < samples.sample_count; i++) {
// synth_sound.samples[i] = output[i];
// }
// synth_sound.sample_count = samples.sample_count;
// return zipped array // return zipped array
SynthSound res = { SynthSound res = {
.samples = output, .samples = output,
@@ -217,7 +234,7 @@ static SynthSound get_attack_samples() {
// Synth // Synth
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
static size_t get_semitone_shift_internal(char* root_note, char* target_note) { static int get_semitone_shift_internal(char* root_note, char* target_note) {
char* pitch_classes[12] = char* pitch_classes[12] =
{ "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B" }; { "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B" };
@@ -261,21 +278,21 @@ static size_t get_semitone_shift_internal(char* root_note, char* target_note) {
(target_pitch_class - root_pitch_class); (target_pitch_class - root_pitch_class);
} }
static float get_hz_by_semitone(size_t semitone) { static float get_hz_by_semitone(int semitone) {
return PITCH_STANDARD * powf(powf(2.f, (1.f / 12.f)), semitone); return PITCH_STANDARD * powf(powf(2.f, (1.f / 12.f)), semitone);
} }
size_t get_semitone_shift(char* target_note) { int get_semitone_shift(char* target_note) {
return get_semitone_shift_internal("A4", target_note); return get_semitone_shift_internal("A4", target_note);
} }
SynthSound note(size_t semitone, float beats) { SynthSound note(int semitone, float beats) {
float hz = get_hz_by_semitone(semitone); float hz = get_hz_by_semitone(semitone);
float duration = beats * BEAT_DURATION; float duration = beats * BEAT_DURATION;
OscillatorParameter first = { OscillatorParameter first = {
.osc = Saw, .osc = Saw,
.freq = hz/4.f .freq = hz
}; };
OscillatorParameter second = { OscillatorParameter second = {
@@ -288,10 +305,10 @@ SynthSound note(size_t semitone, float beats) {
.freq = hz - 1.f .freq = hz - 1.f
}; };
OscillatorParameter oscArray[] = { first, second, third }; OscillatorParameter oscArray[] = { first/*, second, third */};
OscillatorParameterList parameters = { OscillatorParameterList parameters = {
.array = oscArray, .array = oscArray,
.count = 3 .count = 1
}; };
return freq(duration, parameters); return freq(duration, parameters);
@@ -299,7 +316,7 @@ SynthSound note(size_t semitone, float beats) {
SynthSound get_note_sound(Note input) { SynthSound get_note_sound(Note input) {
float length = 1.f / input.length; float length = 1.f / input.length;
size_t semitone_shift = get_semitone_shift(input.name); int semitone_shift = get_semitone_shift(input.name);
return note(semitone_shift, length); return note(semitone_shift, length);
} }
@@ -420,25 +437,31 @@ int main(int argc, char **argv) {
const size_t height = 480; const size_t height = 480;
InitWindow(width, height, "SeeSynth - v0.1"); InitWindow(width, height, "SeeSynth - v0.1");
SetTargetFPS(60); SetTargetFPS(120);
Note current_note = { Note current_note = {
.length = 1, .length = 1,
.name = malloc(sizeof(char) * 3) .name = malloc(sizeof(char) * 3)
}; };
synth_sound = (SynthSound){.sample_count = 1024, .samples = synth_buffer};
InitAudioDevice(); InitAudioDevice();
SetMasterVolume(SYNTH_VOLUME); SetMasterVolume(SYNTH_VOLUME);
AudioStream synth_stream = LoadAudioStream(SAMPLE_RATE, sizeof(float) * 8, 1);//float*8 AudioStream synth_stream = LoadAudioStream(SAMPLE_RATE, sizeof(float) * 8, 1);//float*8
SetAudioStreamVolume(synth_stream, 0.01f); SetAudioStreamVolume(synth_stream, 0.5f);
PlayAudioStream(synth_stream); PlayAudioStream(synth_stream);
// Main game loop // Main game loop
while (!WindowShouldClose()) // Detect window close button or ESC key while (!WindowShouldClose()) // Detect window close button or ESC key
{ {
// Update // Update
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
if (detect_note_pressed(&current_note)) { if (detect_note_pressed(&current_note)) {
//get_note_sound(current_note);
SynthSound sound = get_note_sound(current_note); SynthSound sound = get_note_sound(current_note);
//sound_buffer.sample_count = sound.sample_count;
//memcpy(sound_buffer.samples, sound.samples, sound.sample_count);
if (IsAudioStreamReady(synth_stream)) { if (IsAudioStreamReady(synth_stream)) {
if (IsAudioStreamProcessed(synth_stream)) { if (IsAudioStreamProcessed(synth_stream)) {
printf("Samples to play:%zu \n", sound.sample_count); printf("Samples to play:%zu \n", sound.sample_count);
@@ -448,6 +471,7 @@ int main(int argc, char **argv) {
//} //}
printf("Note played: %s\n", current_note.name); printf("Note played: %s\n", current_note.name);
} }
//UpdateAudioStream(synth_stream, synth_sound.samples, synth_sound.sample_count);
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Draw // Draw