Commit 1e72eb07 authored by thomas's avatar thomas
Browse files

no message


git-svn-id: https://svn.grrrr.org/ext/trunk@316 4d9ac71a-51e6-0310-8455-cad1006bcd31
parent bc0ae5c5
......@@ -212,6 +212,10 @@ SOURCE=.\source\flstdc.h
# End Source File
# Begin Source File
SOURCE=.\source\flsupport.h
# End Source File
# Begin Source File
SOURCE=.\source\flthr.cpp
# End Source File
# Begin Source File
......
......@@ -157,7 +157,7 @@ class FLEXT_EXT flext_obj
//! Check whether construction was successful
bool InitOk() const { return init_ok; }
#ifdef MAXMSP
//#ifdef MAXMSP
//@{
//! Definitions for MaxMSP external libraries
......@@ -169,11 +169,11 @@ class FLEXT_EXT flext_obj
static t_class *lib_class;
static t_symbol *lib_name;
static void libfun_add(const char *name,t_method newfun,void (*freefun)(flext_hdr *),int argtp1,...);
static void libfun_add(const char *name,t_newmethod newfun,void (*freefun)(flext_hdr *),int argtp1,...);
static flext_hdr *libfun_new(t_symbol *s,int argc,t_atom *argv);
static void libfun_free(flext_hdr *o);
//@}
#endif
//#endif
};
......
......@@ -18,6 +18,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
// include the header file declaring the base classes
#include "flbase.h"
#include "flsupport.h"
#ifdef _MSC_VER
#pragma warning(disable: 4786)
......@@ -29,421 +30,8 @@ WARRANTIES, see the file, "license.txt," in this distribution.
#pragma warn -8066 // Unreachable code
#endif
namespace flext {
// --- buffer/array stuff -----------------------------------------
/*! \defgroup FLEXT_N_BUFFER Flext buffer handling
@{
*/
//! Class for platform independent buffer handling
class buffer
{
public:
/*! \brief Construct buffer.
\param delayed = true: only sets name, needs another Set(NULL) to really initialize the buffer
\remark As externals can be created prior to the buffer objects they are pointing to, initialization should be done at loadbang!
*/
buffer(const t_symbol *s = NULL,bool delayed = false);
//! Destroy buffer
~buffer();
/*! \brief Check if the data is valid
*/
bool Ok() const { return sym != NULL && data != NULL; }
/*! \brief Check and update if the buffer has been changed (e.g. resized)
*/
bool Update();
/*! \brief Set to specified buffer.
\param nameonly: if true sets name only, but doesn't look at buffer actually
*/
int Set(const t_symbol *s = NULL,bool nameonly = false);
/*! \brief Declare buffer content as dirty.
\param refr: if true forces immediate graphics refresh
*/
void Dirty(bool refr = false);
//! Get symbol of buffer
t_symbol *Symbol() const { return const_cast<t_symbol *>(sym); }
//! Get literal name of buffer
const char *Name() const { return sym?sym->s_name:""; }
/*! \brief Get pointer to buffer, channel and frame count.
\remark Channels are interleaved
*/
t_sample *Data() { return data; }
//! Get channel count
int Channels() const { return chns; }
//! Get frame count
int Frames() const { return frames; }
//! Set frame count
void Frames(int fr,bool keep = false);
//! Graphic auto refresh interval
void SetRefrIntv(float intv);
protected:
const t_symbol *sym;
t_sample *data;
int chns,frames;
#ifdef PD
t_garray *arr;
float interval;
bool isdirty,ticking;
t_clock *tick;
private:
static void cb_tick(buffer *b);
#endif
};
//! @}
// --- various symbols --------------------------------------------
/*! \defgroup FLEXT_N_SYMBOL Flext atom/symbol handling
@{
*/
//! Symbol constant for "float"
extern const t_symbol *sym_float;
//! Symbol constant for "symbol"
extern const t_symbol *sym_symbol;
//! Symbol constant for "bang"
extern const t_symbol *sym_bang;
//! Symbol constant for "list"
extern const t_symbol *sym_list;
//! Symbol constant for "anything"
extern const t_symbol *sym_anything;
/*! \brief Symbol constant for "int"
\note Only the Max/MSP system has this defined as an internal type
*/
extern const t_symbol *sym_int;
/*! Symbol constant for "pointer"
\note Only PD has this defined as an internal type
*/
extern const t_symbol *sym_pointer;
#ifdef PD
/*! \brief Symbol constant for "signal"
\note PD only
*/
extern const t_symbol *sym_signal;
#endif
//! Make a symbol from a string
inline const t_symbol *MakeSymbol(const char *s) { return gensym(const_cast<char *>(s)); }
//! Get symbol string
inline const char *GetString(const t_symbol *s) { return s->s_name; }
//! Check for symbol and get string
inline const char *GetAString(const t_symbol *s) { return s?s->s_name:""; }
//! @}
// --- utilities --------------------------------------------------
/*! \defgroup FLEXT_C_UTIL Flext utility functions
@{
*/
//! Copy an atom
inline void CopyAtom(t_atom *dst,const t_atom *src) { *dst = *src; }
//! Copy a list of atoms
t_atom *CopyList(int argc,const t_atom *argv);
//! Copy a memory region
void CopyMem(void *dst,const void *src,int bytes);
//! Sleep for an amount of time
void Sleep(float s);
//! @}
// --- atom stuff ----------------------------------------
//! Set atom from another atom
inline void SetAtom(t_atom &a,const t_atom &b) { CopyAtom(&a,&b); }
//! Check whether the atom is nothing
inline bool IsNothing(const t_atom &a) { return a.a_type == A_NULL; }
//! Set the atom to represent nothing
inline void SetNothing(t_atom &a) { a.a_type = A_NULL; }
bool IsInt(const t_atom &);
int GetInt(const t_atom &a);
int GetAInt(const t_atom &a);
//! Check whether the atom is a float
inline bool IsFloat(const t_atom &a) { return a.a_type == A_FLOAT; }
//! Check whether the atom can be represented as a float
inline bool CanbeFloat(const t_atom &a) { return IsFloat(a) || IsInt(a); }
//! Access the float value (without type check)
inline float GetFloat(const t_atom &a) { return a.a_w.w_float; }
//! Set the atom to represent a float
inline void SetFloat(t_atom &a,float v) { a.a_type = A_FLOAT; a.a_w.w_float = v; }
//! Check whether the atom is a symbol
inline bool IsSymbol(const t_atom &a) { return a.a_type == A_SYMBOL; }
//! Access the symbol value (without type check)
inline t_symbol *GetSymbol(const t_atom &a) { return a.a_w.w_symbol; }
//! Check for a symbol and get its value
inline t_symbol *GetASymbol(const t_atom &a) { return IsSymbol(a)?GetSymbol(a):NULL; } // NULL or empty symbol?
//! Set the atom to represent a symbol
inline void SetSymbol(t_atom &a,const t_symbol *s) { a.a_type = A_SYMBOL; a.a_w.w_symbol = const_cast<t_symbol *>(s); }
//! Check whether the atom is a string
inline bool IsString(const t_atom &a) { return IsSymbol(a); }
//! Access the string value (without type check)
inline const char *GetString(const t_atom &a) { t_symbol *s = GetSymbol(a); return s?GetString(s):NULL; }
//! Check for a string and get its value
void GetAString(const t_atom &a,char *buf,int szbuf);
//! Set the atom to represent a string
inline void SetString(t_atom &a,const char *c) { SetSymbol(a,gensym(const_cast<char *>(c))); }
//! Check whether the atom can be represented as an integer
inline bool CanbeInt(const t_atom &a) { return IsFloat(a) || IsInt(a); }
//! Check whether the atom can be represented as a boolean
inline bool CanbeBool(const t_atom &a) { return CanbeInt(a); }
//! Check for an boolean and get its value
inline bool GetABool(const t_atom &a) { return GetAInt(a) != 0; }
#ifdef PD
//! Check for a float and get its value
inline float GetAFloat(const t_atom &a) { return IsFloat(a)?GetFloat(a):0; }
//! Check whether the atom is an integer
inline bool IsInt(const t_atom &) { return false; }
//! Access the integer value (without type check)
inline int GetInt(const t_atom &a) { return (int)GetFloat(a); }
//! Check for an integer and get its value
inline int GetAInt(const t_atom &a) { return (int)GetAFloat(a); }
//! Set the atom to represent a integer (depending on the system)
inline void SetInt(t_atom &a,int v) { a.a_type = A_FLOAT; a.a_w.w_float = (float)v; }
//! Check whether the atom is a pointer
inline bool IsPointer(const t_atom &a) { return a.a_type == A_POINTER; }
//! Access the pointer value (without type check)
inline t_gpointer *GetPointer(const t_atom &a) { return a.a_w.w_gpointer; }
//! Check for a pointer and get its value
inline t_gpointer *GetAPointer(const t_atom &a) { return IsPointer(a)?GetPointer(a):NULL; }
//! Set the atom to represent a pointer
inline void SetPointer(t_atom &a,t_gpointer *p) { a.a_type = A_POINTER; a.a_w.w_gpointer = p; }
#elif defined(MAXMSP)
//! Check for a float and get its value
inline float GetAFloat(const t_atom &a) { return IsFloat(a)?GetFloat(a):(IsInt(a)?GetInt(a):0); }
//! Check whether the atom is an int
inline bool IsInt(const t_atom &a) { return a.a_type == A_INT; }
//! Access the integer value (without type check)
inline int GetInt(const t_atom &a) { return a.a_w.w_long; }
//! Check for an integer and get its value
inline int GetAInt(const t_atom &a) { return IsInt(a)?GetInt(a):(IsFloat(a)?GetFloat(a):0); }
//! Set the atom to represent an integer
inline void SetInt(t_atom &a,int v) { a.a_type = A_INT; a.a_w.w_long = v; }
//! Check whether the atom is a pointer
inline bool IsPointer(const t_atom &) { return false; }
//! Access the pointer value (without type check)
inline void *GetPointer(const t_atom &) { return NULL; }
//! Check for a pointer and get its value
inline void *GetAPointer(const t_atom &) { return NULL; }
// void SetPointer(t_atom &,void *) {}
#endif
// --- atom list stuff -------------------------------------------
/*! \defgroup FLEXT_N_ATOM Flext atom/list handling
@{
*/
//! Class representing a list of atoms
class AtomList
{
public:
//! Construct list
AtomList(int argc = 0,const t_atom *argv = NULL);
//! Construct list
AtomList(const AtomList &a);
//! Destroy list
~AtomList();
//! Clear list
AtomList &Clear() { return operator()(); }
//! Set list
AtomList &operator()(int argc = 0,const t_atom *argv = NULL);
//! Set list by another AtomList
AtomList &operator =(const AtomList &a) { return operator()(a.Count(),a.Atoms()); }
//! Get number of atoms in the list
int Count() const { return cnt; }
//! Get a reference to an indexed atom
t_atom &operator [](int ix) { return lst[ix]; }
//! Get a reference to an indexed atom
const t_atom &operator [](int ix) const { return lst[ix]; }
//! Get a pointer to the list of atoms
t_atom *Atoms() { return lst; }
//! Get a pointer to the list of atoms
const t_atom *Atoms() const { return lst; }
//! Append an atom to the list
AtomList &Append(const t_atom &a);
//! Append an atom list to the list
AtomList &Append(int argc,const t_atom *argv);
//! Append an atom list to the list
AtomList &Append(const AtomList &a) { return Append(a.Count(),a.Atoms()); }
//! Prepend an atom to the list
AtomList &Prepend(const t_atom &a);
//! Prepend an atom list to the list
AtomList &Prepend(int argc,const t_atom *argv);
//! Prepend an atom list to the list
AtomList &Prepend(const AtomList &a) { return Prepend(a.Count(),a.Atoms()); }
//! Get a part of the list
AtomList GetPart(int offs,int len) const;
//! Set to a part of the list
AtomList &Part(int offs,int len) { return (*this = GetPart(offs,len)); }
protected:
int cnt;
t_atom *lst;
};
//! Class representing an "anything"
class AtomAnything:
public AtomList
{
public:
//! Construct anything
AtomAnything(const t_symbol *h = NULL,int argc = 0,t_atom *argv = NULL): AtomList(argc,argv),hdr(h) {}
//! Construct anything
AtomAnything(const char *h,int argc = 0,t_atom *argv = NULL): AtomList(argc,argv),hdr(MakeSymbol(h)) {}
//! Construct anything
AtomAnything(const AtomAnything &a): AtomList(a),hdr(a.hdr) {}
//! Clear anything
AtomAnything &Clear() { return operator()(); }
//! Get header symbol of anything
const t_symbol *Header() const { return hdr; }
//! Set anything
AtomAnything &operator()(const t_symbol *h = NULL,int argc = 0,const t_atom *argv = NULL)
{
hdr = h; AtomList::operator()(argc,argv);
return *this;
}
//! Set list by another AtomAnything
AtomAnything &operator =(const AtomAnything &a) { return operator()(a.Header(),a.Count(),a.Atoms()); }
protected:
const t_symbol *hdr;
};
//! @}
// --- clock stuff ------------------------------------------------
/*! \defgroup FLEXT_N_CLOCK Flext clock functions
At the moment there are none
@{
*/
//! @}
// --- thread stuff -----------------------------------------------
#ifdef FLEXT_THREADS
/*! \defgroup FLEXT_N_THREAD Flext thread handling
@{
*/
/*! \brief Thread mutex
\sa pthreads documentation
*/
class ThrMutex
{
public:
//! Construct thread mutex
ThrMutex(): cnt(0) { pthread_mutex_init(&mutex,NULL); }
//! Destroy thread mutex
~ThrMutex() { pthread_mutex_destroy(&mutex); }
//! Lock thread mutex
int Lock() { cnt = 1; return pthread_mutex_lock(&mutex); }
//! Try to lock, but don't wait
int TryLock() { return pthread_mutex_trylock(&mutex); }
//! Unlock thread mutex
int Unlock() { cnt = 0; return pthread_mutex_unlock(&mutex); }
//! Lock thread mutex (increase lock count by one)
void Push() { if(!cnt++) Lock(); }
//! Unlock thread mutex if lock count reaches zero
void Pop() { if(!--cnt) Unlock(); }
protected:
pthread_mutex_t mutex;
int cnt;
};
/*! \brief Thread conditional
\sa pthreads documentation
*/
class ThrCond:
public ThrMutex
{
public:
//! Construct thread conditional
ThrCond() { pthread_cond_init(&cond,NULL); }
//! Destroy thread conditional
~ThrCond() { pthread_cond_destroy(&cond); }
//! Wait for condition
int Wait() { return pthread_cond_wait(&cond,&mutex); }
/*! \brief Wait for condition (for a certain time)
\param time Wait time in seconds
*/
int TimedWait(float time)
{
timespec tm; tm.tv_sec = (long)time; tm.tv_nsec = (long)((time-(long)time)*1.e9);
return pthread_cond_timedwait(&cond,&mutex,&tm);
}
//! Signal condition
int Signal() { return pthread_cond_signal(&cond); }
//! Broadcast condition
int Broadcast() { return pthread_cond_broadcast(&cond); }
protected:
pthread_cond_t cond;
};
//! @}
#endif // FLEXT_THREADS
namespace flext {
// === flext_base ==================================================
......
......@@ -10,15 +10,19 @@ WARRANTIES, see the file, "license.txt," in this distribution.
// Code for handling of MaxMSP external libraries
#ifdef MAXMSP
//#ifdef MAXMSP
#include "flbase.h"
//#include <string.h>
#include "flsupport.h"
#include <stdarg.h>
enum libargtp { a_null,a_int,a_float,a_sym };
class libfunction {
public:
libfunction(t_symbol *n,t_method newf,void (*freef)(flext_hdr *));
libfunction(t_symbol *n,t_newmethod newf,void (*freef)(flext_hdr *));
~libfunction();
void add(libfunction *n);
......@@ -45,8 +49,10 @@ void flext_obj::libfun_add(const char *name,t_newmethod newfun,void (*freefun)(f
const char *c = flext::extract(name,ix);
if(!c || !*c) break;
#ifdef MAXMSP
alias(const_cast<char *>(c)); // make object name available to Max
#endif
libfunction *l = new libfunction(gensym(const_cast<char *>(c)),newfun,freefun);
if(argtp1 == A_GIMME)
......@@ -74,7 +80,7 @@ void flext_obj::libfun_add(const char *name,t_newmethod newfun,void (*freefun)(f
}
}
typedef flext_hdr *(*libfunG)(t_symbol *,int,t_atom *);
typedef flext_hdr *(*libfunV)(t_symbol *,int,t_atom *);
typedef flext_hdr *(*libfun0)();
typedef flext_hdr *(*libfun1)(flext_obj::lib_arg &a1);
typedef flext_hdr *(*libfun2)(flext_obj::lib_arg &a1,flext_obj::lib_arg &a2);
......@@ -90,7 +96,7 @@ flext_hdr *flext_obj::libfun_new(t_symbol *s,int argc,t_atom *argv)
if(l) {
if(l->argc < 0)
return ((libfunG)l->newfun)(s,argc,argv); // A_GIMME
return ((libfunV)l->newfun)(s,argc,argv); // A_GIMME
else {
if(argc < l->argc)
error("%s: Not enough creation arguments",s->s_name);
......@@ -99,18 +105,20 @@ flext_hdr *flext_obj::libfun_new(t_symbol *s,int argc,t_atom *argv)
bool ok = true;
for(int i = 0; /*ok &&*/ i < l->argc; ++i) {
switch(l->argv[i]) {
case A_LONG:
if(argv[i].a_type == A_LONG) args[i].i = argv[i].a_w.w_long;
else if(argv[i].a_type == A_FLOAT) args[i].i = argv[i].a_w.w_float;
#ifdef MAXMSP
case A_INT:
if(flext::IsInt(argv[i])) args[i].i = flext::GetInt(argv[i]);
else if(flext::IsFloat(argv[i])) args[i].i = (int)flext::GetFloat(argv[i]);
else ok = false;
break;
#endif
case A_FLOAT:
if(argv[i].a_type == A_LONG) args[i].f = argv[i].a_w.w_long;
else if(argv[i].a_type == A_FLOAT) args[i].f = argv[i].a_w.w_float;
if(flext::IsInt(argv[i])) args[i].f = (float)flext::GetInt(argv[i]);
else if(flext::IsFloat(argv[i])) args[i].f = flext::GetFloat(argv[i]);
else ok = false;
break;
case A_SYM:
if(argv[i].a_type == A_SYM) args[i].s = argv[i].a_w.w_sym;
case A_SYMBOL:
if(flext::IsSymbol(argv[i])) args[i].s = flext::GetSymbol(argv[i]);
else ok = false;
break;
}
......@@ -153,5 +161,5 @@ void flext_obj::libfun_free(flext_hdr *hdr)
if(name != lib_name) error("Class %s not found in library!",name);
}
#endif
//#endif
......@@ -435,4 +435,6 @@ namespace flext {
//! @}
#endif // FLEXT_THREADS
} // namespace flext
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment