Skip to content

Commit

Permalink
upgrade libfaust to 2.60.3
Browse files Browse the repository at this point in the history
  • Loading branch information
DBraun committed Jul 13, 2023
1 parent 0df0ff5 commit dcfcd4b
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 24 deletions.
13 changes: 5 additions & 8 deletions TD-Faust/FaustCHOP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ void FaustCHOP::execute(CHOP_Output* output, const OP_Inputs* inputs,
return;
}

bool polyEnable = inputs->getParDouble("Polyphony");
bool polyEnable = inputs->getParInt("Polyphony");

inputs->enablePar("Nvoices", polyEnable);
inputs->enablePar("Groupvoices", polyEnable);
Expand All @@ -758,8 +758,8 @@ void FaustCHOP::execute(CHOP_Output* output, const OP_Inputs* inputs,
m_groupVoices = inputs->getParInt("Groupvoices");
m_dynamicVoices = inputs->getParInt("Dynamicvoices");

m_midi_enable = inputs->getParDouble("Midi");
m_midi_virtual = inputs->getParDouble("Midiinvirtual");
m_midi_enable = inputs->getParInt("Midi");
m_midi_virtual = inputs->getParInt("Midiinvirtual");
m_midi_virtual_name = inputs->getParString("Midiinvirtualname");

const OP_DATInput* dat = inputs->getParDAT("Code");
Expand Down Expand Up @@ -1034,7 +1034,6 @@ void FaustCHOP::setupParameters(OP_ParameterManager* manager, void* reserved1) {

np.name = "Polyphony";
np.label = "Polyphony";
np.defaultValues[0] = 0.;

OP_ParAppendResult res = manager->appendToggle(np);
assert(res == OP_ParAppendResult::Success);
Expand Down Expand Up @@ -1063,7 +1062,7 @@ void FaustCHOP::setupParameters(OP_ParameterManager* manager, void* reserved1) {

np.name = "Groupvoices";
np.label = "Group Voices";
np.defaultValues[0] = 1.;
np.defaultValues[0] = true;

OP_ParAppendResult res = manager->appendToggle(np);
assert(res == OP_ParAppendResult::Success);
Expand All @@ -1075,7 +1074,7 @@ void FaustCHOP::setupParameters(OP_ParameterManager* manager, void* reserved1) {

np.name = "Dynamicvoices";
np.label = "Dynamic Voices";
np.defaultValues[0] = 1.;
np.defaultValues[0] = true;

OP_ParAppendResult res = manager->appendToggle(np);
assert(res == OP_ParAppendResult::Success);
Expand All @@ -1087,7 +1086,6 @@ void FaustCHOP::setupParameters(OP_ParameterManager* manager, void* reserved1) {

np.name = "Midi";
np.label = "MIDI";
np.defaultValues[0] = 0.;

OP_ParAppendResult res = manager->appendToggle(np);
assert(res == OP_ParAppendResult::Success);
Expand All @@ -1099,7 +1097,6 @@ void FaustCHOP::setupParameters(OP_ParameterManager* manager, void* reserved1) {

np.name = "Midiinvirtual";
np.label = "MIDI In Virtual";
np.defaultValues[0] = 0.;

OP_ParAppendResult res = manager->appendToggle(np);
assert(res == OP_ParAppendResult::Success);
Expand Down
23 changes: 9 additions & 14 deletions thirdparty/TouchDesigner/CPlusPlus_Common.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@ stays the same, otherwise changes won't be backwards compatible
#define NOMINMAX
#include <windows.h>
#include <stdint.h>
#include "GL_Extensions.h"
#define DLLEXPORT __declspec (dllexport)
#else
#include <OpenGL/gltypes.h>
#define DLLEXPORT
#endif

Expand Down Expand Up @@ -105,10 +103,6 @@ enum class OP_PixelFormat : int32_t
MonoA16Float,
MonoA32Float,

// RGBX, Alpha channel is ignored, will be treated a 1.0 for operations.
RGBX16Float = 500,
RGBX32Float,

// sRGB. use SBGRA if possible since that's what most GPUs use
SBGRA8Fixed = 600,
SRGBA8Fixed,
Expand Down Expand Up @@ -378,12 +372,14 @@ class OP_CustomOPInfo
// The python documentation string for the class
const char* pythonDoc = nullptr;

// If you want this node to have a Callback DAT parameter and feature that allows
// your custom OP to call python callbacks the end-users fill in
// If you want this node to have a Callback DAT parameter and
// your custom OP to be able call python callbacks the end-users fill in,
// then fill in the stub code for the DAT here.
// This will cause a Callbacks DAT parameter to be added to the first page of your node's parameters.
// This should be setup with empty/stub functions along with comments, similar to the way other
// Callback DATs are pre-filled in other nodes in TouchDesigner.
// This will cause a Callbacks DAT parameter to be added to the first page of
// your node's parameters.
// This should be setup with empty/stub functions along with comments,
// similar to the way other Callback DATs are pre-filled in other nodes in TouchDesigner.
// Note: This only works when the .dll is installed as a Custom OP, not as a C++ OP.
const char* pythonCallbacksDAT = nullptr;

int32_t reserved[88];
Expand Down Expand Up @@ -1220,9 +1216,8 @@ class SOP_CustomAttribData : public SOP_CustomAttribInfo
intData = nullptr;
}

const float* floatData;
const int32_t* intData;

float* floatData;
int32_t* intData;
};

// SOP_PrimitiveInfo, all the required data for each primitive
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/libfaust/download_libfaust.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
set VERSION=2.59.6
set VERSION=2.60.3
curl -L https://github.com/grame-cncm/faust/releases/download/%VERSION%/Faust-%VERSION%-win64.exe -o Faust-%VERSION%-win64.exe
call Faust-%VERSION%-win64.exe /S /D=%cd%\win64\Release
2 changes: 1 addition & 1 deletion thirdparty/libfaust/download_libfaust.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

VERSION=2.59.6
VERSION=2.60.3

if [ "$(uname)" = "Darwin" ]; then
echo "You are running macOS"
Expand Down

0 comments on commit dcfcd4b

Please sign in to comment.