Skip to content

Commit b4c68d0

Browse files
capocasacapocasa
committed
faust for supernova mods
1 parent 957369f commit b4c68d0

File tree

2 files changed

+47
-38
lines changed

2 files changed

+47
-38
lines changed

‎source/DEINDUGens/JPverbRaw.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// license: "none"
66
// copyright: "(c) Julian Parker 2013"
77
//
8-
// Code generated with Faust 0.9.62 (http://faust.grame.fr)
8+
// Code generated with JPverbRaw 0.9.62 (http://faust.grame.fr)
99
//-----------------------------------------------------
1010
/* link with : "primes" */
1111
#include <jprev.h>
@@ -19,9 +19,9 @@ template <int N> inline int faustpower(int x) { return faustpower<N
1919
template <> inline int faustpower<0>(int x) { return 1; }
2020
template <> inline int faustpower<1>(int x) { return x; }
2121
#endif
22-
// If other than 'faust2sc --prefix Faust' is used, sed this as well:
22+
// If other than 'faust2sc --prefix JPverbRaw' is used, sed this as well:
2323
#if !defined(SC_FAUST_PREFIX)
24-
# define SC_FAUST_PREFIX "Faust"
24+
# define SC_FAUST_PREFIX "JPverbRaw"
2525
#endif
2626

2727
//-------------------------------------------------------------------
@@ -409,7 +409,7 @@ class mydsp : public dsp {
409409
m->declare("author", "Julian Parker");
410410
m->declare("license", "none");
411411
m->declare("copyright", "(c) Julian Parker 2013");
412-
m->declare("oscillator.lib/name", "Faust Oscillator Library");
412+
m->declare("oscillator.lib/name", "JPverbRaw Oscillator Library");
413413
m->declare("oscillator.lib/author", "Julius O. Smith (jos at ccrma.stanford.edu)");
414414
m->declare("oscillator.lib/copyright", "Julius O. Smith III");
415415
m->declare("oscillator.lib/version", "1.11");
@@ -424,7 +424,7 @@ class mydsp : public dsp {
424424
m->declare("math.lib/copyright", "GRAME");
425425
m->declare("math.lib/version", "1.0");
426426
m->declare("math.lib/license", "LGPL with exception");
427-
m->declare("filter.lib/name", "Faust Filter Library");
427+
m->declare("filter.lib/name", "JPverbRaw Filter Library");
428428
m->declare("filter.lib/author", "Julius O. Smith (jos at ccrma.stanford.edu)");
429429
m->declare("filter.lib/copyright", "Julius O. Smith III");
430430
m->declare("filter.lib/version", "1.29");
@@ -1302,12 +1302,12 @@ class mydsp : public dsp {
13021302

13031303

13041304
//----------------------------------------------------------------------------
1305-
// SuperCollider/Faust interface
1305+
// SuperCollider/JPverbRaw interface
13061306
//----------------------------------------------------------------------------
13071307

13081308
struct Faust : public Unit
13091309
{
1310-
// Faust dsp instance
1310+
// JPverbRaw dsp instance
13111311
FAUSTCLASS mDSP;
13121312
// Buffers for control to audio rate conversion
13131313
float** mInBufCopy;
@@ -1470,7 +1470,7 @@ void Faust_next_clear(Faust* unit, int inNumSamples)
14701470

14711471
void Faust_Ctor(Faust* unit) // module constructor
14721472
{
1473-
// init dsp
1473+
// init dsp
14741474
unit->mDSP.instanceInit((int)SAMPLERATE);
14751475

14761476
// allocate controls
@@ -1515,15 +1515,15 @@ void Faust_Ctor(Faust* unit) // module constructor
15151515
SETCALC(Faust_next_copy);
15161516
}
15171517
#if !defined(NDEBUG)
1518-
Print("Faust[%s]:\n", g_unitName);
1518+
Print("JPverbRaw[%s]:\n", g_unitName);
15191519
Print(" Inputs: %d\n"
15201520
" Outputs: %d\n"
15211521
" Callback: %s\n",
15221522
numInputs, numOutputs,
15231523
unit->mCalcFunc == (UnitCalcFunc)Faust_next ? "zero-copy" : "copy");
15241524
#endif
15251525
} else {
1526-
Print("Faust[%s]:\n", g_unitName);
1526+
Print("JPverbRaw[%s]:\n", g_unitName);
15271527
Print(" Input/Output channel mismatch\n"
15281528
" Inputs: faust %d, unit %d\n"
15291529
" Outputs: faust %d, unit %d\n",
@@ -1567,12 +1567,12 @@ FAUST_EXPORT void load(InterfaceTable* inTable)
15671567
name = normalizeClassName(name);
15681568

15691569
#if !defined(NDEBUG) & defined(SC_API_EXPORT)
1570-
Print("Faust: supercollider.cpp: sc_api_version = %d\n",sc_api_version);
1570+
Print("JPverbRaw: supercollider.cpp: sc_api_version = %d\n",sc_api_version);
15711571
#endif
15721572

15731573
if (name.empty()) {
15741574
// Catch empty name
1575-
Print("Faust [supercollider.cpp]:\n"
1575+
Print("JPverbRaw [supercollider.cpp]:\n"
15761576
" Could not create unit-generator module name from filename\n"
15771577
" bailing out ...\n");
15781578
return;

‎source/DEINDUGens/faust_src/JPverbRaw.cpp‎

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// license: "none"
66
// copyright: "(c) Julian Parker 2013"
77
//
8-
// Code generated with Faust 0.9.62 (http://faust.grame.fr)
8+
// Code generated with JPverbRaw 0.9.62 (http://faust.grame.fr)
99
//-----------------------------------------------------
1010
/* link with : "primes" */
1111
#include <jprev.h>
@@ -19,9 +19,9 @@ template <int N> inline int faustpower(int x) { return faustpower<N
1919
template <> inline int faustpower<0>(int x) { return 1; }
2020
template <> inline int faustpower<1>(int x) { return x; }
2121
#endif
22-
// If other than 'faust2sc --prefix Faust' is used, sed this as well:
22+
// If other than 'faust2sc --prefix JPverbRaw' is used, sed this as well:
2323
#if !defined(SC_FAUST_PREFIX)
24-
# define SC_FAUST_PREFIX "Faust"
24+
# define SC_FAUST_PREFIX "JPverbRaw"
2525
#endif
2626

2727
//-------------------------------------------------------------------
@@ -55,6 +55,10 @@ template <> inline int faustpower<1>(int x) { return x; }
5555

5656
using namespace std;
5757

58+
#if !defined(NDEBUG)
59+
#define NDEBUG 1
60+
#endif
61+
5862
#if defined(__GNUC__) && __GNUC__ >= 4
5963
# define FAUST_EXPORT __attribute__((visibility("default")))
6064
#else
@@ -409,7 +413,7 @@ class mydsp : public dsp {
409413
m->declare("author", "Julian Parker");
410414
m->declare("license", "none");
411415
m->declare("copyright", "(c) Julian Parker 2013");
412-
m->declare("oscillator.lib/name", "Faust Oscillator Library");
416+
m->declare("oscillator.lib/name", "JPverbRaw Oscillator Library");
413417
m->declare("oscillator.lib/author", "Julius O. Smith (jos at ccrma.stanford.edu)");
414418
m->declare("oscillator.lib/copyright", "Julius O. Smith III");
415419
m->declare("oscillator.lib/version", "1.11");
@@ -424,7 +428,7 @@ class mydsp : public dsp {
424428
m->declare("math.lib/copyright", "GRAME");
425429
m->declare("math.lib/version", "1.0");
426430
m->declare("math.lib/license", "LGPL with exception");
427-
m->declare("filter.lib/name", "Faust Filter Library");
431+
m->declare("filter.lib/name", "JPverbRaw Filter Library");
428432
m->declare("filter.lib/author", "Julius O. Smith (jos at ccrma.stanford.edu)");
429433
m->declare("filter.lib/copyright", "Julius O. Smith III");
430434
m->declare("filter.lib/version", "1.29");
@@ -1302,12 +1306,12 @@ class mydsp : public dsp {
13021306

13031307

13041308
//----------------------------------------------------------------------------
1305-
// SuperCollider/Faust interface
1309+
// SuperCollider/JPverbRaw interface
13061310
//----------------------------------------------------------------------------
13071311

1308-
struct Faust : public Unit
1312+
struct JPverbRaw : public Unit
13091313
{
1310-
// Faust dsp instance
1314+
// JPverbRaw dsp instance
13111315
FAUSTCLASS mDSP;
13121316
// Buffers for control to audio rate conversion
13131317
float** mInBufCopy;
@@ -1357,7 +1361,7 @@ void initState(const std::string& name, int sampleRate)
13571361

13581362
size_t unitSize()
13591363
{
1360-
return sizeof(Faust) + g_numControls * sizeof(Control);
1364+
return sizeof(JPverbRaw) + g_numControls * sizeof(Control);
13611365
}
13621366

13631367
std::string fileNameToUnitName(const std::string& fileName)
@@ -1400,11 +1404,11 @@ extern "C"
14001404
int api_version(void);
14011405
#endif
14021406
void load(InterfaceTable*);
1403-
void Faust_next(Faust*, int);
1404-
void Faust_next_copy(Faust*, int);
1405-
void Faust_next_clear(Faust*, int);
1406-
void Faust_Ctor(Faust*);
1407-
void Faust_Dtor(Faust*);
1407+
void Faust_next(JPverbRaw*, int);
1408+
void Faust_next_copy(JPverbRaw*, int);
1409+
void Faust_next_clear(JPverbRaw*, int);
1410+
void Faust_Ctor(JPverbRaw*);
1411+
void Faust_Dtor(JPverbRaw*);
14081412
};
14091413

14101414
inline static void fillBuffer(float* dst, int n, float v)
@@ -1422,7 +1426,7 @@ inline static void copyBuffer(float* dst, int n, float* src)
14221426
Copy(n, dst, src);
14231427
}
14241428

1425-
inline static void Faust_updateControls(Faust* unit)
1429+
inline static void Faust_updateControls(JPverbRaw* unit)
14261430
{
14271431
Control* controls = unit->mControls;
14281432
int numControls = unit->mNumControls;
@@ -1434,15 +1438,15 @@ inline static void Faust_updateControls(Faust* unit)
14341438
}
14351439
}
14361440

1437-
void Faust_next(Faust* unit, int inNumSamples)
1441+
void Faust_next(JPverbRaw* unit, int inNumSamples)
14381442
{
14391443
// update controls
14401444
Faust_updateControls(unit);
14411445
// dsp computation
14421446
unit->mDSP.compute(inNumSamples, unit->mInBuf, unit->mOutBuf);
14431447
}
14441448

1445-
void Faust_next_copy(Faust* unit, int inNumSamples)
1449+
void Faust_next_copy(JPverbRaw* unit, int inNumSamples)
14461450
{
14471451
// update controls
14481452
Faust_updateControls(unit);
@@ -1463,14 +1467,14 @@ void Faust_next_copy(Faust* unit, int inNumSamples)
14631467
unit->mDSP.compute(inNumSamples, unit->mInBufCopy, unit->mOutBuf);
14641468
}
14651469

1466-
void Faust_next_clear(Faust* unit, int inNumSamples)
1470+
void Faust_next_clear(JPverbRaw* unit, int inNumSamples)
14671471
{
14681472
ClearUnitOutputs(unit, inNumSamples);
14691473
}
14701474

1471-
void Faust_Ctor(Faust* unit) // module constructor
1475+
void Faust_Ctor(JPverbRaw* unit) // module constructor
14721476
{
1473-
// init dsp
1477+
// init dsp
14741478
unit->mDSP.instanceInit((int)SAMPLERATE);
14751479

14761480
// allocate controls
@@ -1515,15 +1519,15 @@ void Faust_Ctor(Faust* unit) // module constructor
15151519
SETCALC(Faust_next_copy);
15161520
}
15171521
#if !defined(NDEBUG)
1518-
Print("Faust[%s]:\n", g_unitName);
1522+
Print("JPverbRaw[%s]:\n", g_unitName);
15191523
Print(" Inputs: %d\n"
15201524
" Outputs: %d\n"
15211525
" Callback: %s\n",
15221526
numInputs, numOutputs,
15231527
unit->mCalcFunc == (UnitCalcFunc)Faust_next ? "zero-copy" : "copy");
15241528
#endif
15251529
} else {
1526-
Print("Faust[%s]:\n", g_unitName);
1530+
Print("JPverbRaw[%s]:\n", g_unitName);
15271531
Print(" Input/Output channel mismatch\n"
15281532
" Inputs: faust %d, unit %d\n"
15291533
" Outputs: faust %d, unit %d\n",
@@ -1534,7 +1538,7 @@ void Faust_Ctor(Faust* unit) // module constructor
15341538
}
15351539
}
15361540

1537-
void Faust_Dtor(Faust* unit) // module destructor
1541+
void Faust_Dtor(JPverbRaw* unit) // module destructor
15381542
{
15391543
if (unit->mInBufValue) {
15401544
RTFree(unit->mWorld, unit->mInBufValue);
@@ -1567,12 +1571,12 @@ FAUST_EXPORT void load(InterfaceTable* inTable)
15671571
name = normalizeClassName(name);
15681572

15691573
#if !defined(NDEBUG) & defined(SC_API_EXPORT)
1570-
Print("Faust: supercollider.cpp: sc_api_version = %d\n",sc_api_version);
1574+
Print("JPverbRaw: supercollider.cpp: sc_api_version = %d\n",sc_api_version);
15711575
#endif
15721576

15731577
if (name.empty()) {
15741578
// Catch empty name
1575-
Print("Faust [supercollider.cpp]:\n"
1579+
Print("JPverbRaw [supercollider.cpp]:\n"
15761580
" Could not create unit-generator module name from filename\n"
15771581
" bailing out ...\n");
15781582
return;
@@ -1596,8 +1600,13 @@ FAUST_EXPORT void load(InterfaceTable* inTable)
15961600
);
15971601

15981602
#if !defined(NDEBUG)
1599-
Print("Faust: %s numControls=%d\n", name.c_str(), g_numControls);
1603+
Print("JPverbRaw: %s numControls=%d\n", name.c_str(), g_numControls);
16001604
#endif // NDEBUG
16011605
}
16021606

1607+
#ifdef SUPERNOVA
1608+
extern "C" FAUST_EXPORT int server_type(void) { return sc_server_supernova; }
1609+
#else
1610+
extern "C" FAUST_EXPORT int server_type(void) { return sc_server_scsynth; }
1611+
#endif
16031612
// EOF

0 commit comments

Comments
 (0)