Pd-cvs October 2005

pd-cvs@lists.iem.at

15 participants
477 discussions

pd/src m_pd.c,1.3.8.1,1.3.8.2
by Mathieu Bouchard 07 Oct '05

07 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11175 Modified Files: Tag: devel_0_39 m_pd.c Log Message: fixed syntax error when desire=1 Index: m_pd.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.c,v retrieving revision 1.3.8.1 retrieving revision 1.3.8.2 diff -C2 -d -r1.3.8.1 -r1.3.8.2 *** m_pd.c 22 May 2005 12:51:10 -0000 1.3.8.1 --- m_pd.c 7 Oct 2005 15:02:52 -0000 1.3.8.2 *************** *** 213,216 **** --- 213,220 ---- */ + #ifdef DESIRE + #undef g_next + #endif + typedef struct _gstack {

1 0

externals/grill/flext changes.txt,1.87,1.88
by Thomas Grill 07 Oct '05

07 Oct '05

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9515 Modified Files: changes.txt Log Message: bugfixes and optimizations, especially for DSP under Max/MSP fixed dsp vector offset bug preprocessed class names now also reflect debug mode (to avoid name clashes) Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/changes.txt,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** changes.txt 26 Sep 2005 13:59:34 -0000 1.87 --- changes.txt 7 Oct 2005 12:58:48 -0000 1.88 *************** *** 19,22 **** --- 19,23 ---- - fixed severe Altivec bug (load unaligned)... thanks to Ian Ollmann - restructured initialization and finalization (esp. Max DSP stuff) + - real class names now also reflect debug mode (like in flext_base_shared_d) 0.5.0:

1 0

[PD-cvs] externals/grill/flext/source fldsp.h, 1.17, 1.18 flprefix.h, 1.35, 1.36
by Thomas Grill 07 Oct '05

07 Oct '05

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9515/source Modified Files: fldsp.h flprefix.h Log Message: bugfixes and optimizations, especially for DSP under Max/MSP fixed dsp vector offset bug preprocessed class names now also reflect debug mode (to avoid name clashes) Index: flprefix.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flprefix.h,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** flprefix.h 19 Jul 2005 23:08:33 -0000 1.35 --- flprefix.h 7 Oct 2005 12:58:48 -0000 1.36 *************** *** 367,376 **** #ifdef __DOXYGEN__ #define FLEXT_CLASSDEF(CL) CL ! #elif defined(FLEXT_SHARED) ! #define FLEXT_CLASSDEF(CL) CL##_shared ! #elif defined(FLEXT_THREADS) ! #define FLEXT_CLASSDEF(CL) CL##_multi #else ! #define FLEXT_CLASSDEF(CL) CL##_single #endif --- 367,386 ---- #ifdef __DOXYGEN__ #define FLEXT_CLASSDEF(CL) CL ! #elif defined(FLEXT_DEBUG) ! #if defined(FLEXT_SHARED) ! #define FLEXT_CLASSDEF(CL) CL##_shared_d ! #elif defined(FLEXT_THREADS) ! #define FLEXT_CLASSDEF(CL) CL##_multi_d ! #else ! #define FLEXT_CLASSDEF(CL) CL##_single_d ! #endif #else ! #if defined(FLEXT_SHARED) ! #define FLEXT_CLASSDEF(CL) CL##_shared ! #elif defined(FLEXT_THREADS) ! #define FLEXT_CLASSDEF(CL) CL##_multi ! #else ! #define FLEXT_CLASSDEF(CL) CL##_single ! #endif #endif Index: fldsp.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/fldsp.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** fldsp.h 26 Sep 2005 13:59:34 -0000 1.17 --- fldsp.h 7 Oct 2005 12:58:48 -0000 1.18 *************** *** 56,66 **** //! returns input vector ! t_sample *InSig(int i) const { return vecs[i]; } //! returns array of output vectors (CntOutSig() vectors) ! t_sample *const *OutSig() const { return vecs+CntInSig(); } //! returns output vector ! t_sample *OutSig(int i) const { return vecs[CntInSig()+i]; } //! typedef describing a signal vector --- 56,72 ---- //! returns input vector ! t_sample *InSig(int i) const { return InSig()[i]; } //! returns array of output vectors (CntOutSig() vectors) ! // \todo cache that returned pointer ! t_sample *const *OutSig() const ! { ! int i = CntInSig(); ! // we have at least one actual dsp in vector ! return vecs+(i?i:1); ! } //! returns output vector ! t_sample *OutSig(int i) const { return OutSig()[i]; } //! typedef describing a signal vector

1 0

externals/tb/chaos package.txt,1.1,1.2
by Thomas Grill 07 Oct '05

07 Oct '05

Update of /cvsroot/pure-data/externals/tb/chaos In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9586/tb/chaos Modified Files: package.txt Log Message: updated for added files Index: package.txt =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/package.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** package.txt 11 May 2005 20:28:00 -0000 1.1 --- package.txt 7 Oct 2005 10:36:22 -0000 1.2 *************** *** 1,5 **** NAME=chaos - SRCDIR=src #PRECOMPILE=chaos.hpp --- 1,5 ---- NAME=chaos SRCDIR=src + BUILDTYPE=multi #PRECOMPILE=chaos.hpp *************** *** 9,57 **** --- 9,89 ---- bernoulli_dsp.cpp \ bernoulli_msg.cpp \ + bernoulli_search.cpp \ bungalow_tent_dsp.cpp \ bungalow_tent_msg.cpp \ + bungalow_tent_search.cpp \ chaos_base.cpp \ chaos_dsp.cpp \ chua_dsp.cpp \ chua_msg.cpp \ + chua_search.cpp \ circle_map_dsp.cpp \ circle_map_msg.cpp \ + circle_map_search.cpp \ coupled_logistic_dsp.cpp \ coupled_logistic_msg.cpp \ + coupled_logistic_search.cpp \ + delayed_logistic_dsp.cpp \ + delayed_logistic_msg.cpp \ + delayed_logistic_search.cpp \ driven_anharmonic_dsp.cpp \ driven_anharmonic_msg.cpp \ + driven_anharmonic_search.cpp \ driven_van_der_pol_dsp.cpp \ driven_van_der_pol_msg.cpp \ + driven_van_der_pol_search.cpp \ duffing_map_dsp.cpp \ duffing_map_msg.cpp \ + duffing_map_search.cpp \ gauss_map_dsp.cpp \ gauss_map_msg.cpp \ + gauss_map_search.cpp \ + gaussian_map_dsp.cpp \ + gaussian_map_msg.cpp \ + gaussian_map_search.cpp \ henon_map_dsp.cpp \ henon_map_msg.cpp \ + henon_map_search.cpp \ + hydrogen_dsp.cpp \ + hydrogen_msg.cpp \ + hydrogen_search.cpp \ ikeda_laser_map_dsp.cpp \ ikeda_laser_map_msg.cpp \ + ikeda_laser_map_search.cpp \ latoocarfian_dsp.cpp \ latoocarfian_msg.cpp \ + latoocarfian_search.cpp \ latoomutalpha_dsp.cpp \ latoomutalpha_msg.cpp \ + latoomutalpha_search.cpp \ latoomutbeta_dsp.cpp \ latoomutbeta_msg.cpp \ + latoomutbeta_search.cpp \ latoomutgamma_dsp.cpp \ latoomutgamma_msg.cpp \ + latoomutgamma_search.cpp \ logistic_dsp.cpp \ logistic_msg.cpp \ + logistic_search.cpp \ lorenz_dsp.cpp \ lorenz_msg.cpp \ + lorenz_search.cpp \ lozi_map_dsp.cpp \ lozi_map_msg.cpp \ + lozi_map_search.cpp \ ode_base.cpp \ roessler_dsp.cpp \ roessler_msg.cpp \ + roessler_search.cpp \ sine_map_dsp.cpp \ sine_map_msg.cpp \ + sine_map_search.cpp \ standard_map_dsp.cpp \ standard_map_msg.cpp \ + standard_map_search.cpp \ tent_map_dsp.cpp \ tent_map_msg.cpp \ + tent_map_search.cpp \ + HDRS= \ *************** *** 63,74 **** --- 95,110 ---- chaos_dsp.hpp \ chaos_msg.hpp \ + chaos_search.hpp \ chua.hpp \ circle_map.hpp \ coupled_logistic.hpp \ + delayed_logistic.hpp \ driven_anharmonic.hpp \ driven_van_der_pol.hpp \ duffing_map.hpp \ gauss_map.hpp \ + gaussian_map.hpp \ henon_map.hpp \ + hydrogen.hpp \ ikeda_laser_map.hpp \ latoocarfian.hpp \

1 0

externals/iem/iemmatrix/src Makefile.in, 1.6, 1.7 configure.ac, 1.5, 1.6 iemmatrix.c, 1.10, 1.11
by IOhannes m zmölnig 07 Oct '05

07 Oct '05

Update of /cvsroot/pure-data/externals/iem/iemmatrix/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1211 Modified Files: Makefile.in configure.ac iemmatrix.c Log Message: don't include c-files (iemmatrix.c used to include iemmatrix_sources.c) instead compile all c-files into objects and link them together Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 19 Sep 2005 13:25:17 -0000 1.6 --- Makefile.in 7 Oct 2005 09:54:22 -0000 1.7 *************** *** 27,31 **** LIBS = @LIBS@ ! SOURCES=$(sort $(filter %.c, $(wildcard mtx_*.c))) iemmatrix.c TARGETS = $(SOURCES:.c=.o) --- 27,31 ---- LIBS = @LIBS@ ! SOURCES=$(sort $(filter %.c, $(wildcard *.c))) TARGETS = $(SOURCES:.c=.o) Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/configure.ac,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure.ac 20 Sep 2005 08:14:41 -0000 1.5 --- configure.ac 7 Oct 2005 09:54:22 -0000 1.6 *************** *** 16,20 **** AC_SUBST(PDLIBDIR) AC_SUBST(INCLUDES) - AC_SUBST(SOURCES) --- 16,19 ---- *************** *** 273,283 **** fi - echo "SOURCES = \\"> Make.source - for i in `ls mtx_*.c iemmatrix.c` - do - echo " $i\\">> Make.source - done - echo >> Make.source - AC_OUTPUT(Makefile) --- 272,275 ---- Index: iemmatrix.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/iemmatrix.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** iemmatrix.c 19 Sep 2005 13:13:59 -0000 1.10 --- iemmatrix.c 7 Oct 2005 09:54:22 -0000 1.11 *************** *** 14,18 **** #include "iemmatrix.h" ! #include "iemmatrix_sources.c" void iemmatrix_setup(){ --- 14,18 ---- #include "iemmatrix.h" ! void iemmatrix_sources_setup(void); void iemmatrix_setup(){

1 0

externals/grill/flext/source flatom_pr.cpp, 1.21, 1.22 flsupport.h, 1.97, 1.98
by Thomas Grill 06 Oct '05

06 Oct '05

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29940/source Modified Files: flatom_pr.cpp flsupport.h Log Message: more robust string->atom conversion eliminate jmax code Index: flatom_pr.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flatom_pr.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** flatom_pr.cpp 26 Jan 2005 05:01:24 -0000 1.21 --- flatom_pr.cpp 6 Oct 2005 19:53:34 -0000 1.22 *************** *** 89,128 **** ! bool flext::ScanAtom(t_atom &a,const char *buf) { ! // skip whitespace ! while(*buf && isspace(*buf)) ++buf; ! if(!*buf) return false; ! char tmp[1024]; ! strcpy(tmp,buf); ! char *c = tmp; ! // check for word type (s = 0,1,2 ... int,float,symbol) ! int s = 0; ! for(; *c && !isspace(*c); ++c) { ! if(!isdigit(*c)) ! s = (*c != '.' || s == 1)?2:1; } ! switch(s) { ! case 0: // integer ! #if FLEXT_SYS == FLEXT_SYS_MAX ! SetInt(a,atol(tmp)); ! break; ! #endif ! case 1: // float ! SetFloat(a,(float)atof(tmp)); ! break; ! default: { // anything else is a symbol ! char t = *c; *c = 0; ! SetString(a,tmp); ! *c = t; ! break; ! } ! } ! return true; } - - --- 89,121 ---- ! const char *flext::ScanAtom(t_atom &a,const char *c) { ! // skip leading whitespace ! while(*c && isspace(*c)) ++c; ! if(!*c) return NULL; ! // go to next space and save character ! char *end = const_cast<char *>(c); ! while(*end && !isspace(*end)) ++end; ! char sv = *end; ! float fres; ! // first try float ! char *endp; ! // see if it's a float - thanks to Frank Barknecht ! fres = (float)strtod(c,&endp); ! if(!*c && endp != c) { ! int ires = (int)fres; // try a cast ! if(fres == ires) ! SetInt(a,ires); ! else ! SetFloat(a,fres); } + // no, it's a symbol + else + SetString(a,c); ! *end = sv; ! return c; } Index: flsupport.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** flsupport.h 12 Sep 2005 10:27:40 -0000 1.97 --- flsupport.h 6 Oct 2005 19:53:34 -0000 1.98 *************** *** 171,177 **** */ - // not for Jmax at the moment - #if FLEXT_SYS != FLEXT_SYS_JMAX - //! Class for platform independent buffer handling class FLEXT_SHARE buffer: --- 171,174 ---- *************** *** 315,319 **** }; - #endif // jmax //! @} FLEXT_S_BUFFER --- 312,315 ---- *************** *** 330,335 **** //! Print an atom static bool PrintAtom(const t_atom &a,char *buf,size_t bufsz); ! //! Scan an atom ! static bool ScanAtom(t_atom &a,const char *buf); //! Copy a list of atoms --- 326,334 ---- //! Print an atom static bool PrintAtom(const t_atom &a,char *buf,size_t bufsz); ! ! /*! Scan an atom until whitespace ! \return next token position, or NULL on failure ! */ ! static const char *ScanAtom(t_atom &a,const char *buf); //! Copy a list of atoms *************** *** 390,404 **** static const t_symbol *MakeSymbol(const t_symbol *s) { return s; } - #if FLEXT_SYS == FLEXT_SYS_JMAX - //! Make a symbol from a string - static const t_symbol *MakeSymbol(const char *s) { return ::fts_new_symbol(s); } - //! Get symbol string - static const char *GetString(const t_symbol *s); // ** TODO ** - #else //! Make a symbol from a string static const t_symbol *MakeSymbol(const char *s) { return ::gensym(const_cast<char *>(s)); } //! Get symbol string static const char *GetString(const t_symbol *s) { return s->s_name; } - #endif //! Check for symbol and get string static const char *GetAString(const t_symbol *s,const char *def = NULL) { return s?GetString(s):def; } --- 389,396 ---- *************** *** 413,428 **** // there are some more comparison functions for t_atom types outside the class - #if FLEXT_SYS == FLEXT_SYS_JMAX - //! Set atom from another atom - static int GetType(const t_atom &a); // ** TODO ** - - //! Check whether the atom is nothing - static bool IsNothing(const t_atom &a) { return fts_is_a(&a,fts_void_class); } - //! Set the atom to represent nothing - static void SetNothing(t_atom &a) { fts_set_void(&a); } - - //! Check whether the atom is a float - static bool IsFloat(const t_atom &a) { return fts_is_a(&a,fts_float_class); } - #else //! Set atom from another atom static int GetType(const t_atom &a) { return a.a_type; } --- 405,408 ---- *************** *** 435,452 **** //! Check whether the atom is a float static bool IsFloat(const t_atom &a) { return a.a_type == A_FLOAT; } - #endif //! Check whether the atom can be represented as a float static bool CanbeFloat(const t_atom &a) { return IsFloat(a) || IsInt(a); } - #if FLEXT_SYS == FLEXT_SYS_JMAX - //! Access the float value (without type check) - static float GetFloat(const t_atom &a) { return fts_get_float(&a); } - //! Set the atom to represent a float - static void SetFloat(t_atom &a,float v) { fts_set_float(&a,v); } - - //! Check whether the atom is a symbol - static bool IsSymbol(const t_atom &a) { return fts_is_a(&a,fts_symbol_class); } - #else //! Access the float value (without type check) static float GetFloat(const t_atom &a) { return a.a_w.w_float; } --- 415,422 ---- *************** *** 456,460 **** //! Check whether the atom is a symbol static bool IsSymbol(const t_atom &a) { return a.a_type == A_SYMBOL; } - #endif #if FLEXT_SYS == FLEXT_SYS_PD --- 426,429 ---- *************** *** 468,476 **** //! Set the atom to represent a symbol static void SetSymbol(t_atom &a,const t_symbol *s) { a.a_type = A_SYMBOL; a.a_w.w_sym = const_cast<t_symbol *>(s); } - #elif FLEXT_SYS == FLEXT_SYS_JMAX - //! Access the symbol value (without type check) - static t_symbol *GetSymbol(const t_atom &a); // ** TODO ** - //! Set the atom to represent a symbol - static void SetSymbol(t_atom &a,const t_symbol *s) { fts_set_symbol(&a,s); } #else #error --- 437,440 ---- *************** *** 540,566 **** //! Set the atom to represent a pointer static void SetPointer(t_atom &a,void *p) { SetInt(a,(int)p); } - #elif FLEXT_SYS == FLEXT_SYS_JMAX - //! Check for a float and get its value - static float GetAFloat(const t_atom &a,float def = 0) { return IsFloat(a)?GetFloat(a):(IsInt(a)?GetInt(a):def); } - - //! Check whether the atom is an int - static bool IsInt(const t_atom &a) { return fts_is_a(&a,fts_int_class); } - //! Access the integer value (without type check) - static int GetInt(const t_atom &a) { return fts_get_int(&a); } - //! Check for an integer and get its value - static int GetAInt(const t_atom &a,int def = 0) { return IsInt(a)?GetInt(a):(IsFloat(a)?(int)GetFloat(a):def); } - //! Set the atom to represent an integer - static void SetInt(t_atom &a,int v) { fts_set_int(&a,v); } - - //! Check whether the atom strictly is a pointer - static bool IsPointer(const t_atom &a) { return fts_is_a(&a,fts_pointer_class); } - //! Check whether the atom can be a pointer - static bool CanbePointer(const t_atom &a) { return IsPointer(a); } - //! Access the pointer value (without type check) - static void *GetPointer(const t_atom &a) { return fts_get_pointer(&a); } - //! Check for a pointer and get its value - static void *GetAPointer(const t_atom &a,void *def = NULL) { return IsPointer(a)?GetPointer(a):def; } - //! Set the atom to represent a pointer - static void SetPointer(t_atom &a,void *p) { fts_set_pointer(&a,p); } #else #error "Platform not supported" --- 504,507 ---- *************** *** 711,721 **** public: explicit AtomAnything(): hdr(NULL) {} ! #if FLEXT_SYS != FLEXT_SYS_JMAX ! //! Construct anything explicit AtomAnything(const t_symbol *h,int argc = 0,const t_atom *argv = NULL) : AtomList(argc,argv),hdr(h?h:sym__) {} ! #endif ! //! Construct anything explicit AtomAnything(const char *h,int argc = 0,const t_atom *argv = NULL) : AtomList(argc,argv),hdr(MakeSymbol(h)) --- 652,662 ---- public: explicit AtomAnything(): hdr(NULL) {} ! ! //! Construct anything explicit AtomAnything(const t_symbol *h,int argc = 0,const t_atom *argv = NULL) : AtomList(argc,argv),hdr(h?h:sym__) {} ! ! //! Construct anything explicit AtomAnything(const char *h,int argc = 0,const t_atom *argv = NULL) : AtomList(argc,argv),hdr(MakeSymbol(h))

1 0

pd/src s_midi_alsa.c,1.1.2.2.2.3,1.1.2.2.2.4
by Tim Blechmann 06 Oct '05

06 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9653/src Modified Files: Tag: devel_0_39 s_midi_alsa.c Log Message: iohannes's autoconnect patch Index: s_midi_alsa.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_midi_alsa.c,v retrieving revision 1.1.2.2.2.3 retrieving revision 1.1.2.2.2.4 diff -C2 -d -r1.1.2.2.2.3 -r1.1.2.2.2.4 *** s_midi_alsa.c 21 Aug 2005 11:28:24 -0000 1.1.2.2.2.3 --- s_midi_alsa.c 6 Oct 2005 18:41:42 -0000 1.1.2.2.2.4 *************** *** 48,53 **** --- 48,61 ---- int i; snd_seq_client_info_t *alsainfo; + /* do we want to connect pd automatically with other devices ?; see below! */ + /* LATER: think about a flag to enable/disable automatic connection + * (sometimes it could be a pain) + */ + int autoconnect = 1; alsa_nmidiin = 0; alsa_nmidiout = 0; + + if (nmidiout == 0 && nmidiin == 0) return; + if(nmidiin>MAXMIDIINDEV ) { *************** *** 74,96 **** return; } ! for (i=0;i<nmidiout;i++) { int port; sprintf(portname,"Pure Data Midi-In %d",i+1); ! port = snd_seq_create_simple_port(midi_handle,portname,SND_SEQ_PORT_CAP_WRITE |SND_SEQ_PORT_CAP_SUBS_WRITE , SND_SEQ_PORT_TYPE_APPLICATION); ! alsa_midiinfd[i] = port; if (port < 0) goto error; } ! for (i=0;i<nmidiin;i++) { int port; sprintf(portname,"Pure Data Midi-Out %d",i+1); ! port = snd_seq_create_simple_port(midi_handle,portname, SND_SEQ_PORT_CAP_SUBS_READ | SND_SEQ_PORT_CAP_READ, SND_SEQ_PORT_TYPE_APPLICATION); ! alsa_midioutfd[i] = port; if (port < 0) goto error; } - if (nmidiout == 0 && nmidiin == 0) return; snd_seq_client_info_malloc(&alsainfo); snd_seq_get_client_info(midi_handle,alsainfo); --- 82,107 ---- return; } ! for (i=0;i<nmidiin;i++) { int port; sprintf(portname,"Pure Data Midi-In %d",i+1); ! port = snd_seq_create_simple_port(midi_handle,portname, ! SND_SEQ_PORT_CAP_WRITE |SND_SEQ_PORT_CAP_SUBS_WRITE, ! SND_SEQ_PORT_TYPE_APPLICATION); ! alsa_midiinfd[i] = port; if (port < 0) goto error; } ! for (i=0;i<nmidiout;i++) { int port; sprintf(portname,"Pure Data Midi-Out %d",i+1); ! port = snd_seq_create_simple_port(midi_handle,portname, ! SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ, ! SND_SEQ_PORT_TYPE_APPLICATION); ! alsa_midioutfd[i] = port; if (port < 0) goto error; } snd_seq_client_info_malloc(&alsainfo); snd_seq_get_client_info(midi_handle,alsainfo); *************** *** 104,109 **** alsa_nmidiout = nmidiout; alsa_nmidiin = nmidiin; return; ! error: sys_setalarm(1000000); post("couldn't open alsa MIDI output device"); --- 115,179 ---- alsa_nmidiout = nmidiout; alsa_nmidiin = nmidiin; + + /* JMZ: connect all available devices to pd */ + if (autoconnect) + { + + snd_seq_client_info_t *cinfo; + snd_seq_port_info_t *pinfo; + + snd_seq_port_subscribe_t *subs; + snd_seq_addr_t other, topd, frompd; + /* since i don't know how to connect multiple ports + * (connect everything to each port, modulo,...), + * i only fully connect where we have only one single port + */ + if(alsa_nmidiin) + { + topd.client =client; + topd.port =alsa_midiinfd[0]; + } + if(alsa_nmidiout) + { + frompd.client =client; + frompd.port =alsa_midioutfd[0]; + } + + snd_seq_port_subscribe_alloca(&subs); + + snd_seq_client_info_alloca(&cinfo); + snd_seq_port_info_alloca(&pinfo); + snd_seq_client_info_set_client(cinfo, -1); + while (snd_seq_query_next_client(midi_handle, cinfo) >= 0) + { + /* reset query info */ + int client_id=snd_seq_client_info_get_client(cinfo); + + if((SND_SEQ_CLIENT_SYSTEM != client_id)&&(client != client_id)) + { /* skipping port 0 and ourself */ + snd_seq_port_info_set_client(pinfo, client_id); + snd_seq_port_info_set_port(pinfo, -1); + while (snd_seq_query_next_port(midi_handle, pinfo) >= 0) + { + other.client=client_id; + other.port =snd_seq_port_info_get_port(pinfo); + if(1==alsa_nmidiin) /* only autoconnect 1st port */ + { + snd_seq_port_subscribe_set_sender(subs, &other); + snd_seq_port_subscribe_set_dest(subs, &topd); + snd_seq_subscribe_port(midi_handle, subs); + } + if(1==alsa_nmidiout) /* only autoconnect 1st port */ + { + snd_seq_port_subscribe_set_sender(subs, &frompd); + snd_seq_port_subscribe_set_dest(subs, &other); + snd_seq_subscribe_port(midi_handle, subs); + } + } + } + } + } return; ! error: sys_setalarm(1000000); post("couldn't open alsa MIDI output device");

1 0

pd/src desire.c,1.1.2.31,1.1.2.32
by Mathieu Bouchard 06 Oct '05

06 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8091 Modified Files: Tag: devel_0_39 desire.c Log Message: adding code for observable Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.31 retrieving revision 1.1.2.32 diff -C2 -d -r1.1.2.31 -r1.1.2.32 *** desire.c 28 Sep 2005 08:32:16 -0000 1.1.2.31 --- desire.c 6 Oct 2005 10:17:46 -0000 1.1.2.32 *************** *** 3,11 **** This file is part of DesireData. Copyright (c) 2004,2005 by Mathieu Bouchard. ! Portions Copyright (c) 1997-2001 Miller Puckette, Guenther Geiger, Krzysztof Czaja, et al [dropper] class is Copyright (c) 2004 Carmen Rocco ! This software has no license yet ! And is not covered by the license on the rest of PureData. ! All Rights Reserved (for now) */ --- 3,13 ---- This file is part of DesireData. Copyright (c) 2004,2005 by Mathieu Bouchard. ! Copyright (c) 1997-2001 Miller Puckette. ! Portions by Guenther Geiger, Krzysztof Czaja, Johannes Zmoelnig, Thomas Musil, etc. ! The remains of IEMGUI Copyright (c) 2000-2001 Thomas Musil (IEM KUG Graz Austria) [dropper] class is Copyright (c) 2004 Carmen Rocco ! ! For information on usage and redistribution, and for a DISCLAIMER OF ALL ! WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ *************** *** 30,56 **** //-------------------------------------------------------------------------- - // from g_canvas.c ! /* Copyright (c) 1997-2001 Miller Puckette and others. ! * For information on usage and redistribution, and for a DISCLAIMER OF ALL ! * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ ! /* this file defines the "glist" class, also known as "canvas" (the two used ! to be different but are now unified except for some fossilized names.) */ ! /* changes by Thomas Musil IEM KUG Graz Austria 2001 */ ! /* bug-fix: canvas_menuclose(): by Krzysztof Czaja */ ! /* bug-fix: table_new(): I reversed the y-bounds */ ! /* IOhannes : ! * changed the canvas_restore, so that it might accept $args as well ! * (like "pd $0_test") ! * so you can make multiple & distinguishable templates ! * 1511:forum::für::umläute:2001 ! * changes marked with IOhannes ! */ ! /* LATER consider adding font size to this struct (see glist_getfont()) */ struct _canvasenvironment { --- 32,85 ---- //-------------------------------------------------------------------------- ! t_observable *observable_new (t_gobj *master) { ! t_observable *self = malloc(sizeof(t_observable)); ! self->master = master; ! self->next = 0; ! self->dirty = 0; ! self->nobs = 0; ! self->obs = 0; ! return self; ! } ! /* subscribing N spies takes N*N time, but I don't care in this case */ ! void observable_subscribe (t_observable *self, t_gobj *observer) { ! int i; ! for (i=0; i<self->nobs; i++) if (self->obs[i]) return; ! self->obs=realloc(self->obs,sizeof(t_gobj *)*(1+self->nobs)); ! self->obs[self->nobs++] = observer; ! } ! void observable_unsubscribe (t_observable *self, t_gobj *observer) { ! int i; ! for (i=0; i<self->nobs; i++) if (self->obs[i]) break; ! if (i==self->nobs) return; ! self->nobs--; ! for (; i<self->nobs-1; i++) self->obs[i] = self->obs[i+1]; ! } ! // if !k then suppose all of the object might have changed. ! void observable_changed (t_observable *self, const char *k) { ! if (!k) self->dirty=-1; ! if (self->dirty<0) return; ! self->dirty |= 1 << class_getfieldindex(self->master->g_pd,k); ! } ! void observable_notify (t_observable *self) { ! int i; ! for (i=0; i<self->nobs; i++) { ! gobj_notice(self->obs[i],self->master,self->dirty); ! } ! self->dirty = 0; ! } ! //-------------------------------------------------------------------------- ! /* the "glist" class is also known as "canvas" (the two used ! to be different but are now unified except for some fossilized names.). ! IOhannes changed the canvas_restore, so that it might accept $args as well ! (like "pd $0_test") so you can make multiple & distinguishable templates. ! */ ! ! /* LATER consider adding font size to this struct (see glist_getfont()) */ struct _canvasenvironment { *************** *** 5186,5189 **** --- 5215,5219 ---- { t_object *ob; + y->g_obs = observable_new(y); /* mb: i found no better place for initing this */ y->g_next = 0; if (!x->gl_list) x->gl_list = y; *************** *** 12546,12549 **** --- 12576,12580 ---- class_setsavefn(c, (t_savefn)bng_savefn); class_sethelpsymbol(c, gensym("bng")); + class_setfieldnames(c, "foo bar x1 y1 class w hold break isa snd rcv lab ldx ldy fstyle fs bcol fcol lcol"); }

1 0

pd/src m_class.c,1.3.4.7.2.2,1.3.4.7.2.3
by Mathieu Bouchard 06 Oct '05

06 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7827 Modified Files: Tag: devel_0_39 m_class.c Log Message: oops in class_setfieldnames Index: m_class.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_class.c,v retrieving revision 1.3.4.7.2.2 retrieving revision 1.3.4.7.2.3 diff -C2 -d -r1.3.4.7.2.2 -r1.3.4.7.2.3 *** m_class.c 6 Oct 2005 06:58:45 -0000 1.3.4.7.2.2 --- m_class.c 6 Oct 2005 10:15:46 -0000 1.3.4.7.2.3 *************** *** 931,934 **** --- 931,935 ---- /* ---------------------------------------------------------------- */ + /* desiredata-specific stuff */ /* must be called only once */ *************** *** 936,941 **** char foo[64]; while (*s) { ! int i = strchr(s,' '); ! if (i<0) return; memcpy(foo,s,i); foo[i]=0; --- 937,943 ---- char foo[64]; while (*s) { ! char *t = strchr(s,' '); ! int i = t-s; ! if (!t) return; memcpy(foo,s,i); foo[i]=0; *************** *** 944,945 **** --- 946,955 ---- } } + + int class_getfieldindex(t_class *x, const char *s) { + t_symbol *sy = gensym((char *)s); + int i; + for (i=0; i<x->c_nfields; i++) if (x->c_fields[i]==sy) return i; + return -1; + } +

1 0

pd/src m_pd.h,1.4.4.11.2.8,1.4.4.11.2.9
by Mathieu Bouchard 06 Oct '05

06 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8913 Modified Files: Tag: devel_0_39 m_pd.h Log Message: added support for notices (observer interface). also added class_getfieldindex (to complement class_setfieldnames). Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.8 retrieving revision 1.4.4.11.2.9 diff -C2 -d -r1.4.4.11.2.8 -r1.4.4.11.2.9 *** m_pd.h 6 Oct 2005 07:00:27 -0000 1.4.4.11.2.8 --- m_pd.h 6 Oct 2005 07:57:08 -0000 1.4.4.11.2.9 *************** *** 164,170 **** --- 164,173 ---- struct _gobj *master;/* this struct belongs to a master (but in the tcl impl, it's _part_ of the master) */ struct _gobj *next; /* big hack. this is the donut hole as cut from _gobj */ + /* actual observable */ int dirty; /* bitfield of things we may have to confess (unknown=-1 like "(all)" in the client side) */ int nobs; /* number of spies */ struct _gobj **obs; /* I spy with my little I */ + /* virtual func for observer (not observable... sorry, this is just C) */ + void (*notice)(struct _gobj *x, struct _gobj *origin, int dirty); } t_observable; #endif *************** *** 349,352 **** --- 352,357 ---- #define pd_class(x) (*(x)) + EXTERN void gobj_notice(t_gobj *x, t_gobj *origin, int dirty); + /* ----------------- pointers ---------------- */ EXTERN void gpointer_init(t_gpointer *gp); *************** *** 462,465 **** --- 467,471 ---- EXTERN void inlet_settip(t_inlet* i,t_symbol* s); EXTERN void class_setfieldnames(t_class *x, const char *s); /* where s is split on spaces and tokenized */ + EXTERN int class_getfieldindex(t_class *x, const char *s); /* ------------ printing --------------------------------- */

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs October 2005