sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove sync because pd uses one thread only

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-04-30 07:54:49 +02:00
parent e77444451e
commit 96c0fb0690
2 changed files with 9 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/puredata/CMakeLists.txt
View file

@ -25,7 +25,7 @@ endfunction()
add_library(sfizz_puredata MODULE sfizz_puredata.c) add_library(sfizz_puredata MODULE sfizz_puredata.c)
target_include_directories(sfizz_puredata PRIVATE "${PUREDATA_INCLUDE_DIR}") target_include_directories(sfizz_puredata PRIVATE "${PUREDATA_INCLUDE_DIR}")
target_link_libraries(sfizz_puredata PRIVATE sfizz::sfizz sfizz::spin_mutex) target_link_libraries(sfizz_puredata PRIVATE sfizz::sfizz)
set_target_properties(sfizz_puredata PROPERTIES set_target_properties(sfizz_puredata PROPERTIES
PREFIX "" PREFIX ""

54
plugins/puredata/sfizz_puredata.c
View file

@ -6,7 +6,6 @@
#include <m_pd.h> #include <m_pd.h>
#include <sfizz.h> #include <sfizz.h>
#include <spin_mutex.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -18,7 +17,6 @@ typedef struct _sfizz_tilde {
t_object obj; t_object obj;
t_outlet* outputs[2]; t_outlet* outputs[2];
sfizz_synth_t* synth; sfizz_synth_t* synth;
spin_mutex_t* mutex;
int midi[3]; int midi[3];
int midinum; int midinum;
t_symbol* dir; t_symbol* dir;
@ -44,12 +42,10 @@ static void sfizz_tilde_set_file(t_sfizz_tilde* self, const char* file)
static bool sfizz_tilde_do_load(t_sfizz_tilde* self) static bool sfizz_tilde_do_load(t_sfizz_tilde* self)
{ {
bool loaded; bool loaded;
spin_mutex_lock(self->mutex);
if (self->filepath[0] != '\0') if (self->filepath[0] != '\0')
loaded = sfizz_load_file(self->synth, self->filepath); loaded = sfizz_load_file(self->synth, self->filepath);
else else
loaded = sfizz_load_string(self->synth, "default.sfz", "<region>sample=*sine"); loaded = sfizz_load_string(self->synth, "default.sfz", "<region>sample=*sine");
spin_mutex_unlock(self->mutex);
return loaded; return loaded;
} }
@ -76,8 +72,6 @@ static void* sfizz_tilde_new(t_symbol* sym, int argc, t_atom argv[])
sfizz_synth_t* synth = sfizz_create_synth(); sfizz_synth_t* synth = sfizz_create_synth();
self->synth = synth; self->synth = synth;
self->mutex = spin_mutex_create();
sfizz_set_sample_rate(synth, sys_getsr()); sfizz_set_sample_rate(synth, sys_getsr());
sfizz_set_samples_per_block(synth, sys_getblksize()); sfizz_set_samples_per_block(synth, sys_getblksize());
@ -96,8 +90,6 @@ static void sfizz_tilde_free(t_sfizz_tilde* self)
free(self->filepath); free(self->filepath);
if (self->synth) if (self->synth)
sfizz_free(self->synth); sfizz_free(self->synth);
if (self->mutex)
spin_mutex_destroy(self->mutex);
if (self->outputs[0]) if (self->outputs[0])
outlet_free(self->outputs[0]); outlet_free(self->outputs[0]);
if (self->outputs[1]) if (self->outputs[1])
@ -116,14 +108,7 @@ static t_int* sfizz_tilde_perform(t_int* w)
outputs[1] = (t_sample*)*w++; outputs[1] = (t_sample*)*w++;
nframes = (t_int)*w++; nframes = (t_int)*w++;
if (spin_mutex_trylock(self->mutex)) { sfizz_render_block(self->synth, outputs, 2, nframes);
sfizz_render_block(self->synth, outputs, 2, nframes);
spin_mutex_unlock(self->mutex);
}
else {
memset(outputs[0], 0, nframes * sizeof(t_sample));
memset(outputs[1], 0, nframes * sizeof(t_sample));
}
return w; return w;
} }
@ -158,10 +143,7 @@ static void sfizz_tilde_midiin(t_sfizz_tilde* self, t_float f)
case 2: case 2:
switch (midi[0] & 0xf0) { switch (midi[0] & 0xf0) {
case 0xd0: // channel aftertouch case 0xd0: // channel aftertouch
if (spin_mutex_trylock(self->mutex)) { sfizz_send_channel_aftertouch(self->synth, 0, midi[1]);
sfizz_send_channel_aftertouch(self->synth, 0, midi[1]);
spin_mutex_unlock(self->mutex);
}
break; break;
} }
break; break;
@ -170,35 +152,20 @@ static void sfizz_tilde_midiin(t_sfizz_tilde* self, t_float f)
case 0x90: // note on case 0x90: // note on
if (midi[2] == 0) if (midi[2] == 0)
goto noteoff; goto noteoff;
if (spin_mutex_trylock(self->mutex)) { sfizz_send_note_on(self->synth, 0, midi[1], midi[2]);
sfizz_send_note_on(self->synth, 0, midi[1], midi[2]);
spin_mutex_unlock(self->mutex);
}
break; break;
case 0x80: // note off case 0x80: // note off
noteoff: noteoff:
if (spin_mutex_trylock(self->mutex)) { sfizz_send_note_off(self->synth, 0, midi[1], midi[2]);
sfizz_send_note_off(self->synth, 0, midi[1], midi[2]);
spin_mutex_unlock(self->mutex);
}
break; break;
case 0xb0: // controller case 0xb0: // controller
if (spin_mutex_trylock(self->mutex)) { sfizz_send_cc(self->synth, 0, midi[1], midi[2]);
sfizz_send_cc(self->synth, 0, midi[1], midi[2]);
spin_mutex_unlock(self->mutex);
}
break; break;
case 0xa0: // key aftertouch case 0xa0: // key aftertouch
if (spin_mutex_trylock(self->mutex)) { sfizz_send_poly_aftertouch(self->synth, 0, midi[1], midi[2]);
sfizz_send_poly_aftertouch(self->synth, 0, midi[1], midi[2]);
spin_mutex_unlock(self->mutex);
}
break; break;
case 0xe0: // pitch bend case 0xe0: // pitch bend
if (spin_mutex_trylock(self->mutex)) { sfizz_send_pitch_wheel(self->synth, 0, (midi[1] + (midi[2] << 7)) - 8192);
sfizz_send_pitch_wheel(self->synth, 0, (midi[1] + (midi[2] << 7)) - 8192);
spin_mutex_unlock(self->mutex);
}
break; break;
} }
@ -222,10 +189,7 @@ static void sfizz_tilde_reload(t_sfizz_tilde* self, t_float value)
static void sfizz_tilde_hdcc(t_sfizz_tilde* self, t_float cc, t_float value) static void sfizz_tilde_hdcc(t_sfizz_tilde* self, t_float cc, t_float value)
{ {
if (spin_mutex_trylock(self->mutex)) { sfizz_automate_hdcc(self->synth, 0, (int)cc, value);
sfizz_automate_hdcc(self->synth, 0, (int)cc, value);
spin_mutex_unlock(self->mutex);
}
} }
static void sfizz_tilde_voices(t_sfizz_tilde* self, t_float value) static void sfizz_tilde_voices(t_sfizz_tilde* self, t_float value)
@ -234,9 +198,7 @@ static void sfizz_tilde_voices(t_sfizz_tilde* self, t_float value)
if (numvoices < 1) if (numvoices < 1)
numvoices = 1; numvoices = 1;
spin_mutex_lock(self->mutex);
sfizz_set_num_voices(self->synth, numvoices); sfizz_set_num_voices(self->synth, numvoices);
spin_mutex_unlock(self->mutex);
} }
#if defined(_WIN32) #if defined(_WIN32)