Skip to content

Commit

Permalink
some more symbol fixes?
Browse files Browse the repository at this point in the history
  • Loading branch information
dromer committed May 3, 2024
1 parent 82c5b8c commit 101ed79
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
6 changes: 3 additions & 3 deletions plugins/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ PLUGIN_FILES += AS/freeverb/revmodel.cpp

# modules/types which are present in other plugins
AS_CUSTOM = ADSR BpmDisplayWidget LabelDisplayWidget LedLight LowFrequencyOscillator SigDisplayWidget VCA WaveShaper YellowRedLight allpass comb revmodel
AS_CUSTOM_PER_FILE = NumberDisplayWidget
AS_CUSTOM_PER_FILE = NumberDisplayWidget MsDisplayWidget

# --------------------------------------------------------------
# AudibleInstruments
Expand Down Expand Up @@ -846,7 +846,7 @@ LILACLOOP_CUSTOM = AudioFile Mode
PLUGIN_FILES += $(filter-out LittleUtils/src/plugin.cpp,$(wildcard LittleUtils/src/*.cpp))

# modules/types which are present in other plugins
LITTLEUTILS_CUSTOM = MsDisplayWidget MAX_POLY_CHANNELS
LITTLEUTILS_CUSTOM = CustomTrimpot MsDisplayWidget MAX_POLY_CHANNELS

# --------------------------------------------------------------
# LomasModules
Expand Down Expand Up @@ -976,7 +976,7 @@ PATHSET_CUSTOM = PitchShifter
PLUGIN_FILES += $(filter-out PdArray/src/plugin.cpp,$(wildcard PdArray/src/*.cpp))

# modules/types which are present in other plugins
PDARRAY_CUSTOM = $(DRWAV) MAX_POLY_CHANNELS TextBox
PDARRAY_CUSTOM = $(DRWAV) MAX_POLY_CHANNELS TextBox CustomTrimpot MsDisplayWidget

# --------------------------------------------------------------
# PinkTrombone
Expand Down
8 changes: 8 additions & 0 deletions plugins/plugins.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -779,9 +779,13 @@ extern Model* modelBlankPanel;
// PdArray
#define MAX_POLY_CHANNELS PDARRAYMAX_POLY_CHANNELS
#define TextBox PdArrayTextBox
#define CustomTrimpot PdArrayCustomTrimpot
#define MsDisplayWidget PdArrayMsDisplayWidget
#include "PdArray/src/plugin.hpp"
#undef PDARRAYMAX_POLY_CHANNELS
#undef Textbox
#undef CustomTrimpot
#undef MsDisplayWidget

// PinkTrombone
#include "PinkTrombone/src/plugin.hpp"
Expand Down Expand Up @@ -2932,11 +2936,15 @@ static void initStatic__PdArray()
{
#define MAX_POLY_CHANNELS PDARRAYMAX_POLY_CHANNELS
#define TextBox PdArrayTextBox
#define CustomTrimpot PdArrayCustomTrimpot
#define MsDisplayWidget PdArrayMsDisplayWidget

This comment has been minimized.

Copy link
@falkTX

falkTX May 3, 2024

Contributor

these defines do nothing, they are unused in the lines before they are undef'ed again

This comment has been minimized.

Copy link
@dromer

dromer May 3, 2024

Author Collaborator

I never know exactly where to put these, so I always put them both around the include and here :#

p->addModel(modelArray);
p->addModel(modelMiniramp);
p->addModel(modelMinistep);
#undef PDARRAYMAX_POLY_CHANNELS
#undef TextBox
#undef CustomTrimpot
#undef MsDisplayWidget
}
}

Expand Down

0 comments on commit 101ed79

Please sign in to comment.