Skip to content

Commit

Permalink
Fix issue #4 Crashing on M1 Mac 13.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@brummer10
brummer10 committed Sep 22, 2023
1 parent a127fe6 commit 1576b5d
Show file tree
Hide file tree
Showing 6 changed files with 213 additions and 72 deletions.
214 changes: 162 additions & 52 deletions plugins/NeuralRecord/CairoWidgets.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,72 @@

START_NAMESPACE_DISTRHO

class CairoColourTheme
{
public:
CairoColourTheme()
{
init();
}

struct CairoColour{
double r;
double g;
double b;
double a;
};

void setCairoColour(cairo_t* const cr, const CairoColour idColour, bool darken = false)
{
double darker = 1.0;
if (darken) darker = 0.8;
cairo_set_source_rgba(cr, idColour.r * darker, idColour.g * darker,
idColour.b * darker, idColour.a);
}

void setIdColour(CairoColour &idColour, double r, double g, double b, double a) {
idColour = CairoColour {r, g, b, a};
}

CairoColour idColourBackground;
CairoColour idColourBackgroundNormal;
CairoColour idColourBackgroundPrelight;
CairoColour idColourBackgroundActive;
CairoColour idColourBackgroundProgress;

CairoColour idColourForground;
CairoColour idColourForgroundNormal;
CairoColour idColourForgroundActive;

CairoColour idColourFrame;

CairoColour idColourShadow;
CairoColour idColourLight;

protected:

void init()
{
setIdColour(idColourBackground, 0.13, 0.13, 0.13, 1);
setIdColour(idColourBackgroundNormal, 0.13, 0.13, 0.13, 1.0);
setIdColour(idColourBackgroundPrelight, 0.63, 0.63, 0.63, 0.03);
setIdColour(idColourBackgroundActive, 0.63, 0.13, 0.13, 1.0);
setIdColour(idColourBackgroundProgress, 0.4, 0.4, 0.4, 1.0);

setIdColour(idColourForground, 0.63, 0.63, 0.63, 1.0);
setIdColour(idColourForgroundNormal, 0.63, 0.63, 0.63, 1.0);
setIdColour(idColourForgroundActive, 0.93, 0.63, 0.63, 1.0);

setIdColour(idColourFrame, 0.03, 0.03, 0.03, 1.0);

setIdColour(idColourShadow, 0.05, 0.05, 0.05, 1.0);
setIdColour(idColourLight, 0.33, 0.33, 0.33, 1.0);
}

private:
DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CairoColourTheme)
};

// -----------------------------------------------------------------------

class CairoShadows
Expand Down Expand Up @@ -115,24 +181,27 @@ class CairoShadows
class CairoButton : public CairoSubWidget, public CairoShadows
{
public:
explicit CairoButton(SubWidget* const parent, const char* lab, const uint32_t index)

explicit CairoButton(SubWidget* const parent, CairoColourTheme &theme_,
UI *ui, const char* lab, const uint32_t index)
: CairoSubWidget(parent),
setParameterValue([parent] (const uint32_t index, float value)
{dynamic_cast<UI*>(parent)->setParameterValue(index, value);}),
label(lab), port(index) {
value = 0.0f;
state = 0;
prelight = false;
theme(theme_),
setParameterValue([ui] (const uint32_t index, float value)
{ui->setParameterValue(index, value);}),
label(lab), port(index)
{
init();
}

explicit CairoButton(TopLevelWidget* const parent, const char* lab, const uint32_t index)
explicit CairoButton(TopLevelWidget* const parent, CairoColourTheme &theme_,
UI *ui, const char* lab, const uint32_t index)
: CairoSubWidget(parent),
setParameterValue([parent] (const uint32_t index, float value)
{dynamic_cast<UI*>(parent)->setParameterValue(index, value);}),
label(lab), port(index) {
value = 0.0f;
state = 0;
prelight = false;
theme(theme_),
setParameterValue([ui] (const uint32_t index, float value)
{ui->setParameterValue(index, value);}),
label(lab), port(index)
{
init();
}

void setValue(float v)
Expand All @@ -143,6 +212,14 @@ class CairoButton : public CairoSubWidget, public CairoShadows
}

protected:

void init()
{
value = 0.0f;
state = 0;
prelight = false;
}

void onCairoDisplay(const CairoGraphicsContext& context) override
{
cairo_t* const cr = context.handle;
Expand All @@ -153,13 +230,13 @@ class CairoButton : public CairoSubWidget, public CairoShadows
cairo_push_group (cr);

if (!state)
cairo_set_source_rgba(cr, 0.13, 0.13, 0.13, 1.0);
theme.setCairoColour(cr, theme.idColourBackgroundNormal);
else
cairo_set_source_rgba(cr, 0.63, 0.13, 0.13, 1.0);
theme.setCairoColour(cr, theme.idColourBackgroundActive);
cairo_paint(cr);

if (prelight) {
cairo_set_source_rgba(cr, 0.63, 0.63, 0.63, 0.03);
theme.setCairoColour(cr, theme.idColourBackgroundPrelight);
cairo_paint(cr);
}

Expand All @@ -171,9 +248,9 @@ class CairoButton : public CairoSubWidget, public CairoShadows
int offset = 0;
cairo_text_extents_t extents;
if(state==0) {
cairo_set_source_rgba(cr, 0.63, 0.63, 0.63, 1.0);
theme.setCairoColour(cr, theme.idColourForgroundNormal);
} else if(state==1) {
cairo_set_source_rgba(cr, 0.93, 0.63, 0.63, 1.0);
theme.setCairoColour(cr, theme.idColourForgroundActive);
offset = 2;
}
cairo_set_font_size (cr, h/2.2);
Expand Down Expand Up @@ -220,6 +297,7 @@ class CairoButton : public CairoSubWidget, public CairoShadows
}

private:
CairoColourTheme &theme;
std::function<void(const uint32_t, float) > setParameterValue;
float value;
uint state;
Expand All @@ -234,14 +312,19 @@ class CairoButton : public CairoSubWidget, public CairoShadows
class CairoProgressBar : public CairoSubWidget, public CairoShadows
{
public:
explicit CairoProgressBar(SubWidget* const parent)
: CairoSubWidget(parent) {
value = 0.0f;

explicit CairoProgressBar(SubWidget* const parent, CairoColourTheme &theme_)
: CairoSubWidget(parent),
theme(theme_)
{
init();
}

explicit CairoProgressBar(TopLevelWidget* const parent)
: CairoSubWidget(parent) {
value = 0.0f;
explicit CairoProgressBar(TopLevelWidget* const parent, CairoColourTheme &theme_)
: CairoSubWidget(parent),
theme(theme_)
{
init();
}

void setValue(float v)
Expand All @@ -251,6 +334,11 @@ class CairoProgressBar : public CairoSubWidget, public CairoShadows
}

protected:
void init()
{
value = 0.0f;
}

void onCairoDisplay(const CairoGraphicsContext& context) override
{
cairo_t* const cr = context.handle;
Expand All @@ -260,12 +348,12 @@ class CairoProgressBar : public CairoSubWidget, public CairoShadows
const int width = sz.getWidth();
const int height = sz.getHeight();

cairo_set_source_rgba(cr, 0.03, 0.03, 0.03, 1.0);
theme.setCairoColour(cr,theme.idColourFrame);
cairo_rectangle(cr,0, 0, width, height);
cairo_set_line_width(cr,2);
cairo_stroke(cr);

cairo_set_source_rgba(cr, 0.4, 0.4, 0.4, 1.0);
theme.setCairoColour(cr, theme.idColourBackgroundProgress);
cairo_rectangle(cr,0, 0, width * value, height);
cairo_fill(cr);

Expand All @@ -275,7 +363,7 @@ class CairoProgressBar : public CairoSubWidget, public CairoShadows
snprintf(s, 63,"%d%%", (int) (value * 100.0));
cairo_text_extents(cr,s , &extents);
cairo_move_to (cr, width * 0.5 - extents.width * 0.5, height * 0.5 + extents.height * 0.5 );
cairo_set_source_rgba(cr, 0.63, 0.63, 0.63, 1.0);
theme.setCairoColour(cr, theme.idColourForground);
cairo_set_operator(cr, CAIRO_OPERATOR_ADD);
cairo_show_text(cr, s);
cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
Expand All @@ -286,6 +374,7 @@ class CairoProgressBar : public CairoSubWidget, public CairoShadows
}

private:
CairoColourTheme &theme;
float value;
DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CairoProgressBar)
};
Expand All @@ -295,20 +384,21 @@ class CairoProgressBar : public CairoSubWidget, public CairoShadows
class CairoPeekMeter : public CairoSubWidget, public CairoShadows
{
public:
explicit CairoPeekMeter(SubWidget* const parent)

explicit CairoPeekMeter(SubWidget* const parent, CairoColourTheme &theme_)
: CairoSubWidget(parent),
image(nullptr) {
old_value = -70.0f;
std_value = -70.0f;
value = -70.0f;
image(nullptr),
theme(theme_)
{
init();
}

explicit CairoPeekMeter(TopLevelWidget* const parent)
explicit CairoPeekMeter(TopLevelWidget* const parent, CairoColourTheme &theme_)
: CairoSubWidget(parent),
image(nullptr) {
old_value = -70.0f;
std_value = -70.0f;
value = -70.0f;
image(nullptr),
theme(theme_)
{
init();
}

void setValue(float v)
Expand All @@ -322,6 +412,13 @@ class CairoPeekMeter : public CairoSubWidget, public CairoShadows
}

protected:
void init()
{
old_value = -70.0f;
std_value = -70.0f;
value = -70.0f;
}

float power2db(float power)
{
const float falloff = 27 * 60 * 0.0005;
Expand Down Expand Up @@ -381,7 +478,7 @@ class CairoPeekMeter : public CairoSubWidget, public CairoShadows
cairo_t *cri = cairo_create (image);
cairo_push_group (cri);

cairo_set_source_rgba(cri, 0.03, 0.03, 0.03, 1);
theme.setCairoColour(cri, theme.idColourFrame);
cairo_paint(cri);

cairo_pattern_t *pat = cairo_pattern_create_linear (0, 0, width, 0.0);
Expand Down Expand Up @@ -438,7 +535,7 @@ class CairoPeekMeter : public CairoSubWidget, public CairoShadows
char buf[32];

cairo_set_font_size (cr, (float)rect_height * 0.5);
cairo_set_source_rgba(cr, 0.6, 0.6, 0.6, 0.6);
theme.setCairoColour(cr, theme.idColourForground);

for (unsigned int i = 0; i < sizeof (db_points)/sizeof (db_points[0]); ++i)
{
Expand All @@ -460,7 +557,7 @@ class CairoPeekMeter : public CairoSubWidget, public CairoShadows
cairo_show_text (cr, buf);
}

cairo_set_source_rgba(cr, 0.6, 0.6, 0.6, 0.6);
theme.setCairoColour(cr, theme.idColourForground);
cairo_set_line_width(cr, 1.5);
cairo_stroke(cr);
}
Expand Down Expand Up @@ -500,6 +597,7 @@ class CairoPeekMeter : public CairoSubWidget, public CairoShadows

private:
cairo_surface_t* image;
CairoColourTheme &theme;
float value;
float old_value;
float std_value;
Expand All @@ -511,18 +609,23 @@ class CairoPeekMeter : public CairoSubWidget, public CairoShadows
class CairoToolTip : public CairoSubWidget, public Runner
{
public:
explicit CairoToolTip(SubWidget* const parent_, const char* lab)

explicit CairoToolTip(SubWidget* const parent_, CairoColourTheme &theme_, const char* lab)
: CairoSubWidget(parent_),
parent(parent_), label(lab) {
hide();
state.store(false, std::memory_order_release);
parent(parent_),
theme(theme_),
label(lab)
{
init();
}

explicit CairoToolTip(TopLevelWidget* const parent_, const char* lab)
explicit CairoToolTip(TopLevelWidget* const parent_, CairoColourTheme &theme_, const char* lab)
: CairoSubWidget(parent_),
parent(parent_), label(lab) {
hide();
state.store(false, std::memory_order_release);
parent(parent_),
theme(theme_),
label(lab)
{
init();
}

~CairoToolTip() {if (isRunnerActive()) stopRunner();}
Expand All @@ -545,6 +648,12 @@ class CairoToolTip : public CairoSubWidget, public Runner
}

protected:
void init()
{
hide();
state.store(false, std::memory_order_release);
}

void onCairoDisplay(const CairoGraphicsContext& context) override
{
cairo_t* const cr = context.handle;
Expand All @@ -553,14 +662,14 @@ class CairoToolTip : public CairoSubWidget, public Runner
const Size<uint> sz = getSize();
const int w = sz.getWidth();
const int h = sz.getHeight();
cairo_set_source_rgba(cr, 0.13, 0.13, 0.13, 1.0);
theme.setCairoColour(cr, theme.idColourBackground);

cairo_rectangle(cr, 0, 0, w, h);
cairo_fill_preserve(cr);
cairo_set_source_rgba(cr, 0., 0., 0., 1.0);
theme.setCairoColour(cr, theme.idColourFrame);
cairo_stroke(cr);
cairo_text_extents_t extents;
cairo_set_source_rgba(cr, 0.63, 0.63, 0.63, 1.0);
theme.setCairoColour(cr, theme.idColourForground);
cairo_set_font_size (cr, h * 0.24);
cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_BOLD);
Expand All @@ -587,6 +696,7 @@ class CairoToolTip : public CairoSubWidget, public Runner

private:
Widget * const parent;
CairoColourTheme &theme;
const char* label;
std::atomic<bool> state;
DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CairoToolTip)
Expand Down
2 changes: 1 addition & 1 deletion plugins/NeuralRecord/PluginNeuralCapture.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void PluginNeuralCapture::initParameter(uint32_t index, Parameter& parameter) {
parameter.shortName = "Error";
parameter.symbol = "ERRORS";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 3.0f;
parameter.ranges.max = 4.0f;
parameter.hints = kParameterIsOutput;
break;
}
Expand Down
Loading

0 comments on commit 1576b5d

Please sign in to comment.