git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1210 0c269be4-1314-0410-8aa9-9f06e86f4224tags/0.58
@@ -26,7 +26,7 @@ extern "C" | |||||
{ | { | ||||
#endif | #endif | ||||
//#include <jack/types.h> | |||||
//#include <jack/types.h> | |||||
#include "types.h" | #include "types.h" | ||||
/** | /** | ||||
@@ -34,10 +34,10 @@ extern "C" | |||||
#include <pthread.h> | #include <pthread.h> | ||||
#endif | #endif | ||||
/* | |||||
#include <jack/types.h> | |||||
#include <jack/transport.h> | |||||
*/ | |||||
/* | |||||
#include <jack/types.h> | |||||
#include <jack/transport.h> | |||||
*/ | |||||
#include "types.h" | #include "types.h" | ||||
#include "transport.h" | #include "transport.h" | ||||
@@ -27,7 +27,7 @@ extern "C" | |||||
{ | { | ||||
#endif | #endif | ||||
//#include <jack/types.h> | |||||
//#include <jack/types.h> | |||||
#include "types.h" | #include "types.h" | ||||
/** | /** | ||||
@@ -27,7 +27,7 @@ extern "C" | |||||
{ | { | ||||
#endif | #endif | ||||
//#include <jack/types.h> | |||||
//#include <jack/types.h> | |||||
#include "types.h" | #include "types.h" | ||||
/** | /** | ||||
@@ -27,7 +27,6 @@ extern "C" | |||||
{ | { | ||||
#endif | #endif | ||||
//#include <jack/types.h> | |||||
#include "types.h" | #include "types.h" | ||||
/** | /** | ||||
@@ -47,11 +47,6 @@ inline void *aligned_calloc(size_t nmemb, size_t size) | |||||
return (void*)((unsigned)(calloc((nmemb*size) + 15, sizeof(char))) + 15 & 0xfffffff0); | return (void*)((unsigned)(calloc((nmemb*size) + 15, sizeof(char))) + 15 & 0xfffffff0); | ||||
} | } | ||||
/****************************************************************************** | /****************************************************************************** | ||||
******************************************************************************* | ******************************************************************************* | ||||
@@ -114,8 +109,7 @@ struct param | |||||
float fMax; | float fMax; | ||||
param(float* z, float a, float b) : fZone(z), fMin(a), fMax(b) | param(float* z, float a, float b) : fZone(z), fMin(a), fMax(b) | ||||
{} | {} | ||||
} | |||||
; | |||||
}; | |||||
class CMDUI : public UI | class CMDUI : public UI | ||||
{ | { | ||||
@@ -289,15 +283,12 @@ class dsp | |||||
virtual void compute(int len, float** inputs, float** outputs) = 0; | virtual void compute(int len, float** inputs, float** outputs) = 0; | ||||
virtual void conclude() | virtual void conclude() | ||||
{} | {} | ||||
} | |||||
; | |||||
}; | |||||
//---------------------------------------------------------------------------- | //---------------------------------------------------------------------------- | ||||
// FAUST generated code | // FAUST generated code | ||||
//---------------------------------------------------------------------------- | //---------------------------------------------------------------------------- | ||||
class mydsp : public dsp | class mydsp : public dsp | ||||
{ | { | ||||
private: | private: | ||||
@@ -47,11 +47,6 @@ inline void *aligned_calloc(size_t nmemb, size_t size) | |||||
return (void*)((unsigned)(calloc((nmemb*size) + 15, sizeof(char))) + 15 & 0xfffffff0); | return (void*)((unsigned)(calloc((nmemb*size) + 15, sizeof(char))) + 15 & 0xfffffff0); | ||||
} | } | ||||
/****************************************************************************** | /****************************************************************************** | ||||
******************************************************************************* | ******************************************************************************* | ||||
@@ -114,8 +109,7 @@ struct param | |||||
float fMax; | float fMax; | ||||
param(float* z, float a, float b) : fZone(z), fMin(a), fMax(b) | param(float* z, float a, float b) : fZone(z), fMin(a), fMax(b) | ||||
{} | {} | ||||
} | |||||
; | |||||
}; | |||||
class CMDUI : public UI | class CMDUI : public UI | ||||
{ | { | ||||
@@ -290,15 +284,13 @@ class dsp | |||||
virtual void compute(int len, float** inputs, float** outputs) = 0; | virtual void compute(int len, float** inputs, float** outputs) = 0; | ||||
virtual void conclude() | virtual void conclude() | ||||
{} | {} | ||||
} | |||||
; | |||||
}; | |||||
//---------------------------------------------------------------------------- | //---------------------------------------------------------------------------- | ||||
// FAUST generated code | // FAUST generated code | ||||
//---------------------------------------------------------------------------- | //---------------------------------------------------------------------------- | ||||
class mydsp : public dsp | class mydsp : public dsp | ||||
{ | { | ||||
private: | private: | ||||
@@ -734,8 +726,6 @@ class mydsp : public dsp | |||||
} | } | ||||
}; | }; | ||||
mydsp DSP; | mydsp DSP; | ||||
@@ -748,7 +738,6 @@ mydsp DSP; | |||||
*******************************************************************************/ | *******************************************************************************/ | ||||
//---------------------------------------------------------------------------- | //---------------------------------------------------------------------------- | ||||
// number of input and output channels | // number of input and output channels | ||||
//---------------------------------------------------------------------------- | //---------------------------------------------------------------------------- | ||||