Skip to content

Commit

Permalink
Fix nekobi tuning parameter
Browse files Browse the repository at this point in the history
See DISTRHO/Nekobi#17

Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Apr 15, 2023
1 parent 8722584 commit dd28fbd
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 14 deletions.
11 changes: 4 additions & 7 deletions plugins/Nekobi/DistrhoPluginNekobi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

#include "DistrhoPluginNekobi.hpp"

extern "C" {

#include "nekobee-src/nekobee_synth.c"
#include "nekobee-src/nekobee_voice.c"
Expand All @@ -31,7 +30,7 @@ extern "C" {
bool dssp_voicelist_mutex_trylock(nekobee_synth_t* const synth)
{
/* Attempt the mutex lock */
if (pthread_mutex_trylock(&synth->voicelist_mutex) != 0)
if (!synth->voicelist_mutex.try_lock())
{
synth->voicelist_mutex_grab_failed = 1;
return false;
Expand All @@ -47,9 +46,9 @@ bool dssp_voicelist_mutex_trylock(nekobee_synth_t* const synth)
return true;
}

bool dssp_voicelist_mutex_unlock(nekobee_synth_t* const synth)
void dssp_voicelist_mutex_unlock(nekobee_synth_t* const synth)
{
return (pthread_mutex_unlock(&synth->voicelist_mutex) == 0);
synth->voicelist_mutex.unlock();
}

// -----------------------------------------------------------------------
Expand Down Expand Up @@ -79,7 +78,6 @@ void nekobee_handle_raw_event(nekobee_synth_t* const synth, const uint8_t size,
}
}

} /* extern "C" */

START_NAMESPACE_DISTRHO

Expand Down Expand Up @@ -109,7 +107,6 @@ DistrhoPluginNekobi::DistrhoPluginNekobi()

fSynth.voice = nekobee_voice_new();
fSynth.voicelist_mutex_grab_failed = 0;
pthread_mutex_init(&fSynth.voicelist_mutex, nullptr);

fSynth.channel_pressure = 0;
fSynth.pitch_wheel_sensitivity = 0;
Expand Down Expand Up @@ -299,7 +296,7 @@ void DistrhoPluginNekobi::setParameterValue(uint32_t index, float value)
break;
case paramTuning:
fParams.tuning = value;
fSynth.tuning = (value+12.0f)/24.0f * 1.5 + 0.5f; // FIXME: log?
fSynth.tuning = exp2f( value / 12.0f );
DISTRHO_SAFE_ASSERT(fSynth.tuning >= 0.5f && fSynth.tuning <= 2.0f);
break;
case paramCutoff:
Expand Down
2 changes: 0 additions & 2 deletions plugins/Nekobi/DistrhoPluginNekobi.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@

#include "DistrhoPlugin.hpp"

extern "C" {
#include "nekobee-src/nekobee_synth.h"
}

START_NAMESPACE_DISTRHO

Expand Down
4 changes: 2 additions & 2 deletions plugins/Nekobi/nekobee-src/nekobee.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@

#else /* !XSYNTH_DEBUG */

#define XDB_MESSAGE(type, fmt...)
#define GDB_MESSAGE(type, fmt...)
#define XDB_MESSAGE(type, fmt, ...)
#define GDB_MESSAGE(type, fmt, ...)
#define XSYNTH_DEBUG_INIT(x)

#endif /* XSYNTH_DEBUG */
Expand Down
2 changes: 1 addition & 1 deletion plugins/Nekobi/nekobee-src/nekobee_synth.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <stdio.h>
#include <string.h>
#include <math.h>
#include <pthread.h>
#include <mutex>

#include "nekobee.h"
#include "nekobee_synth.h"
Expand Down
4 changes: 2 additions & 2 deletions plugins/Nekobi/nekobee-src/nekobee_synth.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#ifndef _XSYNTH_SYNTH_H
#define _XSYNTH_SYNTH_H

#include <pthread.h>
#include <mutex>

#include "nekobee.h"
#include "nekobee_types.h"
Expand Down Expand Up @@ -64,7 +64,7 @@ struct _nekobee_synth_t {

//nekobee_voice_t *voice[XSYNTH_MAX_POLYPHONY];
nekobee_voice_t *voice;
pthread_mutex_t voicelist_mutex;
std::mutex voicelist_mutex;
int voicelist_mutex_grab_failed;

/* current non-paramter-mapped controller values */
Expand Down

0 comments on commit dd28fbd

Please sign in to comment.