Pd-cvs June 2005

pd-cvs@lists.iem.at

14 participants
211 discussions

externals/tb/chaos/src Makefile.am, 1.9, 1.10 bernoulli_map.hpp, 1.4, 1.5 bungalow_tent_map.hpp, 1.4, 1.5 chaos_base.hpp, 1.6, 1.7 chaos_defs.hpp, 1.3, 1.4 chaos_dsp.hpp, 1.8, 1.9 chua.hpp, 1.1, 1.2 circle_map.hpp, 1.4, 1.5 coupled_logistic.hpp, 1.2, 1.3 driven_anharmonic.hpp, 1.3, 1.4 driven_van_der_pol.hpp, 1.1, 1.2 duffing_map.hpp, 1.1, 1.2 gauss_map.hpp, 1.4, 1.5 henon_map.hpp, 1.4, 1.5 ikeda_laser_map.hpp, 1.4, 1.5 latoocarfian.hpp, 1.2, 1.3 latoomutalpha.hpp, 1.2, 1.3 latoomutbeta.hpp, 1.2, 1
by Tim Blechmann 09 Jun '05

09 Jun '05

Update of /cvsroot/pure-data/externals/tb/chaos/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15932 Modified Files: Makefile.am bernoulli_map.hpp bungalow_tent_map.hpp chaos_base.hpp chaos_defs.hpp chaos_dsp.hpp chua.hpp circle_map.hpp coupled_logistic.hpp driven_anharmonic.hpp driven_van_der_pol.hpp duffing_map.hpp gauss_map.hpp henon_map.hpp ikeda_laser_map.hpp latoocarfian.hpp latoomutalpha.hpp latoomutbeta.hpp latoomutgamma.hpp logistic_map.hpp lorenz.hpp lozi_map.hpp main.cpp roessler.hpp sine_map.hpp standard_map.hpp tent_map.hpp Log Message: changed initialisation Index: coupled_logistic.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/coupled_logistic.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** coupled_logistic.hpp 1 Jan 2005 11:06:58 -0000 1.2 --- coupled_logistic.hpp 9 Jun 2005 12:52:17 -0000 1.3 *************** *** 22,26 **** // coupled_logistic map: x[n+1] = r * x[n] * (1 - x[n]) + e * (y[n] - x[n]) ! // y[n+1] = r * y[n] * (1 - y[n]) + e * (x[t] - y[t]) // 1 <= r <= 4 // taken from Willi-Hans Steeb: Chaos and Fractals --- 22,26 ---- // coupled_logistic map: x[n+1] = r * x[n] * (1 - x[n]) + e * (y[n] - x[n]) ! // y[n+1] = r * y[n] * (1 - y[n]) + e * (x[n] - y[n]) // 1 <= r <= 4 // taken from Willi-Hans Steeb: Chaos and Fractals *************** *** 32,46 **** coupled_logistic() { ! m_num_eq = 2; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(e, 0.06); ! CHAOS_SYS_INIT(r, 3.7); ! CHAOS_SYS_INIT(x, 0.1); ! CHAOS_SYS_INIT(x, 0.2); } ~coupled_logistic() { - delete m_data; } --- 32,48 ---- coupled_logistic() { ! CHAOS_PRECONSTRUCTOR; ! ! CHAOS_PAR_INIT(e, 0.06); ! CHAOS_PAR_INIT(r, 3.7); ! ! CHAOS_SYS_INIT(x, 0.1,0); ! CHAOS_SYS_INIT(y, 0.2,1); ! ! CHAOS_POSTCONSTRUCTOR; } ~coupled_logistic() { } *************** *** 62,67 **** } ! CHAOS_SYSVAR_FUNCS(x, 0); ! CHAOS_SYSVAR_FUNCS(y, 0); }; --- 64,85 ---- } ! CHAOS_SYSVAR_FUNCS_PRED(x, 0, m_pred_xy); ! CHAOS_SYSVAR_FUNCS_PRED(y, 0, m_pred_xy); ! ! bool m_pred_xy(t_float f) ! { ! return (f > 0) && (f < 1); ! } ! ! virtual void m_verify() ! { ! data_t x = m_data[0]; ! data_t y = m_data[1]; ! if (!m_pred_xy(x)) ! m_data[0] = 0.5; ! if (!m_pred_xy(y)) ! m_data[1] = 0.5; ! } ! }; Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/main.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** main.cpp 12 Feb 2005 08:58:21 -0000 1.9 --- main.cpp 9 Jun 2005 12:52:17 -0000 1.10 *************** *** 24,28 **** void chaos_library_setup() { ! post("chaos~ version "PACKAGE_VERSION", compiled on "__DATE__" \n"); --- 24,28 ---- void chaos_library_setup() { ! post("chaos~ version 0.01, compiled on "__DATE__" \n"); Index: roessler.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/roessler.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roessler.hpp 1 Jan 2005 11:06:58 -0000 1.2 --- roessler.hpp 9 Jun 2005 12:52:17 -0000 1.3 *************** *** 32,47 **** roessler() { ! m_num_eq = 3; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(method,0); ! CHAOS_SYS_INIT(x1,0); ! CHAOS_SYS_INIT(x2,0); ! CHAOS_SYS_INIT(x3,0); ! CHAOS_SYS_INIT(a,4); ! CHAOS_SYS_INIT(b,4); ! CHAOS_SYS_INIT(c,4); ! CHAOS_SYS_INIT(dt,0.01); ode_base_alloc(); } --- 32,49 ---- roessler() { ! CHAOS_PRECONSTRUCTOR; ! CHAOS_PAR_INIT(method,0); ! CHAOS_PAR_INIT(dt,0.01); ! ! CHAOS_SYS_INIT(x1,0,0); ! CHAOS_SYS_INIT(x2,0,1); ! CHAOS_SYS_INIT(x3,0,2); ! ! CHAOS_PAR_INIT(a,4); ! CHAOS_PAR_INIT(b,4); ! CHAOS_PAR_INIT(c,4); + CHAOS_POSTCONSTRUCTOR; ode_base_alloc(); } *************** *** 50,54 **** { ode_base_free(); ! delete m_data; } --- 52,56 ---- { ode_base_free(); ! } Index: chaos_dsp.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/chaos_dsp.hpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** chaos_dsp.hpp 13 Jan 2005 13:39:57 -0000 1.8 --- chaos_dsp.hpp 9 Jun 2005 12:52:17 -0000 1.9 *************** *** 105,109 **** } ! if( i == 2) { for (int j = 0; j != m_system->get_num_eq(); ++j) --- 105,109 ---- } ! if(i == 2 && imethod != 2) { for (int j = 0; j != m_system->get_num_eq(); ++j) *************** *** 126,132 **** --- 126,140 ---- if( (f >= 0) && (f <= m_sr*0.5) ) { + if (m_freq == -1) + set_imethod(m_imethod); m_freq = f; m_invfreq = 1.f / f; } + else if (f == -1) + { + m_freq = -1; + + m_routine = &thisType::m_signal_; + } else post("frequency out of range"); *************** *** 139,206 **** /* create constructor / destructor */ ! #define CHAOS_DSP_INIT(SYSTEM, ATTRIBUTES) \ ! FLEXT_HEADER(SYSTEM##_dsp, chaos_dsp<SYSTEM>) \ ! \ ! SYSTEM##_dsp(int argc, t_atom* argv ) \ ! { \ ! m_sr = 44100; /* assume default sampling rate */ \ ! m_system = new SYSTEM; \ ! \ ! int size = m_system->get_num_eq(); \ ! \ ! m_values = new t_float[size]; \ ! m_slopes = new t_float[size]; \ ! m_nextvalues = new t_float[size]; \ ! m_nextmidpts = new t_float[size]; \ ! m_curves = new t_float[size]; \ ! \ ! /* create inlets and zero arrays*/ \ ! for (int i = 0; i != size; ++i) \ ! { \ ! AddOutSignal(); \ ! m_values[i] = 0; \ ! m_slopes[i] = 0; \ ! m_nextvalues[i] = 0; \ ! m_nextmidpts[i] = 0; \ ! m_curves[i] = 0; \ ! } \ ! \ ! FLEXT_ADDATTR_VAR("frequency", get_freq, set_freq); \ ! FLEXT_ADDATTR_VAR("interpolation_method",get_imethod, set_imethod); \ ! \ ! if (argc > 0) \ ! { \ ! CHAOS_SYS_INIT(freq, GetAInt(argv[0])); \ ! } \ ! else \ ! { \ ! CHAOS_SYS_INIT(freq, 440); \ ! } \ ! \ ! if (argc > 1) \ ! { \ ! CHAOS_SYS_INIT(imethod, GetAInt(argv[1])); \ ! } \ ! else \ ! { \ ! CHAOS_SYS_INIT(imethod, 0); \ ! } \ ! \ ! m_phase = 0; \ ! \ ! ATTRIBUTES; \ ! } \ ! \ ! ~SYSTEM##_dsp() \ ! { \ ! delete m_system; \ ! delete m_values; \ ! delete m_slopes; \ ! delete m_nextvalues; \ ! delete m_nextmidpts; \ ! delete m_curves; \ ! } \ ! \ ! FLEXT_ATTRVAR_F(m_freq); \ FLEXT_ATTRVAR_I(m_imethod); --- 147,214 ---- /* create constructor / destructor */ ! #define CHAOS_DSP_INIT(SYSTEM, ATTRIBUTES) \ ! FLEXT_HEADER(SYSTEM##_dsp, chaos_dsp<SYSTEM>) \ ! \ ! SYSTEM##_dsp(int argc, t_atom* argv ) \ ! { \ ! m_sr = 44100; /* assume default sampling rate */ \ ! m_system = new SYSTEM; \ ! \ ! int size = m_system->get_num_eq(); \ ! \ ! m_values = new t_float[size]; \ ! m_slopes = new t_float[size]; \ ! m_nextvalues = new t_float[size]; \ ! m_nextmidpts = new t_float[size]; \ ! m_curves = new t_float[size]; \ ! \ ! /* create inlets and zero arrays*/ \ ! for (int i = 0; i != size; ++i) \ ! { \ ! AddOutSignal(); \ ! m_values[i] = 0; \ ! m_slopes[i] = 0; \ ! m_nextvalues[i] = 0; \ ! m_nextmidpts[i] = 0; \ ! m_curves[i] = 0; \ ! } \ ! \ ! FLEXT_ADDATTR_VAR("frequency", get_freq, set_freq); \ ! FLEXT_ADDATTR_VAR("interpolation_method",get_imethod, set_imethod); \ ! \ ! if (argc > 0) \ ! { \ ! CHAOS_INIT(freq, GetAInt(argv[0])); \ ! } \ ! else \ ! { \ ! CHAOS_INIT(freq, 440); \ ! } \ ! \ ! if (argc > 1) \ ! { \ ! CHAOS_INIT(imethod, GetAInt(argv[1])); \ ! } \ ! else \ ! { \ ! CHAOS_INIT(imethod, 0); \ ! } \ ! \ ! m_phase = 0; \ ! \ ! ATTRIBUTES; \ ! } \ ! \ ! ~SYSTEM##_dsp() \ ! { \ ! delete m_system; \ ! delete m_values; \ ! delete m_slopes; \ ! delete m_nextvalues; \ ! delete m_nextmidpts; \ ! delete m_curves; \ ! } \ ! \ ! FLEXT_ATTRVAR_F(m_freq); \ FLEXT_ATTRVAR_I(m_imethod); Index: tent_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/tent_map.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tent_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 --- tent_map.hpp 9 Jun 2005 12:52:17 -0000 1.5 *************** *** 32,43 **** tent_map() { ! m_num_eq = 1; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(x, 0.6); } ~tent_map() { ! delete m_data; } --- 32,45 ---- tent_map() { ! CHAOS_PRECONSTRUCTOR; ! ! CHAOS_SYS_INIT(x, 0.6,0); ! ! CHAOS_POSTCONSTRUCTOR; } ~tent_map() { ! } Index: sine_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/sine_map.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sine_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 --- sine_map.hpp 9 Jun 2005 12:52:17 -0000 1.5 *************** *** 33,44 **** sine_map() { ! m_num_eq = 1; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(x,0); } ~sine_map() { ! delete m_data; } --- 33,46 ---- sine_map() { ! CHAOS_PRECONSTRUCTOR; ! ! CHAOS_SYS_INIT(x,0,0); ! ! CHAOS_POSTCONSTRUCTOR; } ~sine_map() { ! } Index: circle_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/circle_map.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** circle_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 --- circle_map.hpp 9 Jun 2005 12:52:17 -0000 1.5 *************** *** 33,46 **** circle_map() { ! m_num_eq = 1; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(omega, 0.1); ! CHAOS_SYS_INIT(r, 3); ! CHAOS_SYS_INIT(x, 0.4); } ~circle_map() { ! delete m_data; } --- 33,49 ---- circle_map() { ! CHAOS_PRECONSTRUCTOR; ! ! CHAOS_SYS_INIT(x, 0.4,0); ! ! CHAOS_PAR_INIT(omega, 0.1); ! CHAOS_PAR_INIT(r, 3); ! ! CHAOS_POSTCONSTRUCTOR; } ~circle_map() { ! } Index: driven_anharmonic.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/driven_anharmonic.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** driven_anharmonic.hpp 11 May 2005 20:26:46 -0000 1.3 --- driven_anharmonic.hpp 9 Jun 2005 12:52:17 -0000 1.4 *************** *** 35,54 **** driven_anharmonic() { ! m_num_eq = 2; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(method,0); ! CHAOS_SYS_INIT(dt,0.01); ! CHAOS_SYS_INIT(u1,0); ! CHAOS_SYS_INIT(u2,1); ! CHAOS_SYS_INIT(a,1); ! CHAOS_SYS_INIT(b,-10); ! CHAOS_SYS_INIT(c,100); ! CHAOS_SYS_INIT(Omega,3.5); ! CHAOS_SYS_INIT(k1,0.01); ! CHAOS_SYS_INIT(k2,1); ode_base_alloc(); m_t = 0; --- 35,54 ---- driven_anharmonic() { ! CHAOS_PRECONSTRUCTOR; ! CHAOS_PAR_INIT(method,0); ! CHAOS_PAR_INIT(dt,0.01); ! CHAOS_SYS_INIT(u1,0,0); ! CHAOS_SYS_INIT(u2,1,1); ! CHAOS_PAR_INIT(a,1); ! CHAOS_PAR_INIT(b,-10); ! CHAOS_PAR_INIT(c,100); ! CHAOS_PAR_INIT(Omega,3.5); ! CHAOS_PAR_INIT(k1,0.01); ! CHAOS_PAR_INIT(k2,1); + CHAOS_POSTCONSTRUCTOR; ode_base_alloc(); m_t = 0; *************** *** 58,62 **** { ode_base_free(); ! delete m_data; } --- 58,62 ---- { ode_base_free(); ! } Index: gauss_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/gauss_map.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gauss_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 --- gauss_map.hpp 9 Jun 2005 12:52:17 -0000 1.5 *************** *** 34,45 **** gauss_map() { ! m_num_eq = 1; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(x,0.5); } ~gauss_map() { ! delete m_data; } --- 34,47 ---- gauss_map() { ! CHAOS_PRECONSTRUCTOR; ! ! CHAOS_SYS_INIT(x,0.5, 0); ! ! CHAOS_POSTCONSTRUCTOR; } ~gauss_map() { ! } Index: latoocarfian.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/latoocarfian.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** latoocarfian.hpp 12 Feb 2005 08:58:21 -0000 1.2 --- latoocarfian.hpp 9 Jun 2005 12:52:17 -0000 1.3 *************** *** 34,51 **** latoocarfian() { ! m_num_eq = 2; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(x1,0.5); ! CHAOS_SYS_INIT(x2,0); ! CHAOS_SYS_INIT(a,-0.966918); ! CHAOS_SYS_INIT(b,2.879879); ! CHAOS_SYS_INIT(c,0.765145); ! CHAOS_SYS_INIT(d,0.744728); } ~latoocarfian() { ! delete m_data; } --- 34,53 ---- latoocarfian() { ! CHAOS_PRECONSTRUCTOR ! CHAOS_SYS_INIT(x1,0.5,0); ! CHAOS_SYS_INIT(x2,0,1); ! ! CHAOS_PAR_INIT(a,-0.966918); ! CHAOS_PAR_INIT(b,2.879879); ! CHAOS_PAR_INIT(c,0.765145); ! CHAOS_PAR_INIT(d,0.744728); ! ! CHAOS_POSTCONSTRUCTOR; } ~latoocarfian() { ! } Index: lorenz.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/lorenz.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** lorenz.hpp 27 Dec 2004 22:55:41 -0000 1.6 --- lorenz.hpp 9 Jun 2005 12:52:17 -0000 1.7 *************** *** 32,47 **** lorenz() { ! m_num_eq = 3; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(method,0); ! CHAOS_SYS_INIT(dt,0.01); ! CHAOS_SYS_INIT(x1,0.8); ! CHAOS_SYS_INIT(x2,0.7); ! CHAOS_SYS_INIT(x3,0.6); ! CHAOS_SYS_INIT(sigma,16); ! CHAOS_SYS_INIT(b,4); ! CHAOS_SYS_INIT(r,40); ode_base_alloc(); } --- 32,50 ---- lorenz() { ! CHAOS_PRECONSTRUCTOR; ! CHAOS_PAR_INIT(method,0); ! CHAOS_PAR_INIT(dt,0.01); + CHAOS_SYS_INIT(x1,0.8,0); + CHAOS_SYS_INIT(x2,0.7,1); + CHAOS_SYS_INIT(x3,0.6,2); + + CHAOS_PAR_INIT(sigma,16); + CHAOS_PAR_INIT(b,4); + CHAOS_PAR_INIT(r,40); + + CHAOS_POSTCONSTRUCTOR; + ode_base_alloc(); } *************** *** 50,54 **** { ode_base_free(); ! delete m_data; } --- 53,57 ---- { ode_base_free(); ! } Index: latoomutgamma.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/latoomutgamma.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** latoomutgamma.hpp 12 Feb 2005 08:58:21 -0000 1.2 --- latoomutgamma.hpp 9 Jun 2005 12:52:17 -0000 1.3 *************** *** 33,48 **** latoomutgamma() { ! m_num_eq = 2; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(x1,0.5); ! CHAOS_SYS_INIT(x2,0.5); ! CHAOS_SYS_INIT(a,-0.966918); ! CHAOS_SYS_INIT(b,2.879879); } ~latoomutgamma() { ! delete m_data; } --- 33,50 ---- latoomutgamma() { ! CHAOS_PRECONSTRUCTOR; ! CHAOS_SYS_INIT(x1,0.5,0); ! CHAOS_SYS_INIT(x2,0.5,1); ! ! CHAOS_PAR_INIT(a,-0.966918); ! CHAOS_PAR_INIT(b,2.879879); ! ! CHAOS_POSTCONSTRUCTOR; } ~latoomutgamma() { ! } Index: chaos_base.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/chaos_base.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** chaos_base.hpp 12 Feb 2005 08:58:20 -0000 1.6 --- chaos_base.hpp 9 Jun 2005 12:52:17 -0000 1.7 *************** *** 22,25 **** --- 22,28 ---- #include "chaos.hpp" + #include <map> + + #define MAXDIMENSION 5 // this should be enough for the first class chaos_base *************** *** 43,46 **** --- 46,52 ---- } + std::map<const t_symbol*,int> attr_ind; + + // check the integrity of the system virtual void m_verify() { *************** *** 53,64 **** } }; ! ! data_t * m_data; // state of the system protected: ! virtual void m_step() = 0; ! int m_num_eq; // number of equations of the system }; #define CHAOS_CALLBACKS \ --- 59,81 ---- } }; ! ! data_t m_data[MAXDIMENSION]; // state of the system protected: ! virtual void m_step() = 0; // iteration ! int m_num_eq; // number of equations of the system ! flext::AtomList Parameter; // parameter ! flext::AtomList System; // system }; + #define CHAOS_PRECONSTRUCTOR \ + /* dummy */ + + #define CHAOS_POSTCONSTRUCTOR \ + m_num_eq = System.Count(); + + #define CHAOS_DESTRUCTOR \ + + #define CHAOS_CALLBACKS \ *************** *** 70,73 **** --- 87,91 ---- FLEXT_CALLGET_I(get_dimension); + #define CHAOS_ATTRIBUTES \ FLEXT_ADDATTR_GET("dimension",get_dimension); Index: lozi_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/lozi_map.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lozi_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 --- lozi_map.hpp 9 Jun 2005 12:52:17 -0000 1.5 *************** *** 32,46 **** lozi_map() { ! m_num_eq = 2; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(x,0); ! CHAOS_SYS_INIT(y,0); ! CHAOS_SYS_INIT(a,1.4); ! CHAOS_SYS_INIT(b,0.3); } ~lozi_map() { ! delete m_data; } --- 32,49 ---- lozi_map() { ! CHAOS_PRECONSTRUCTOR; ! ! CHAOS_SYS_INIT(x,0,0); ! CHAOS_SYS_INIT(y,0,1); ! ! CHAOS_PAR_INIT(a,1.4); ! CHAOS_PAR_INIT(b,0.3); ! ! CHAOS_POSTCONSTRUCTOR; } ~lozi_map() { ! } *************** *** 58,62 **** } ! CHAOS_SYSVAR_FUNCS(x, 0); CHAOS_SYSVAR_FUNCS(y, 1); --- 61,70 ---- } ! virtual void m_verify() ! { ! if (PD_BIGORSMALL(m_data[0])) ! m_data[0] = 1; ! } ! CHAOS_SYSVAR_FUNCS(x, 0); CHAOS_SYSVAR_FUNCS(y, 1); Index: bernoulli_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/bernoulli_map.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** bernoulli_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 --- bernoulli_map.hpp 9 Jun 2005 12:52:17 -0000 1.5 *************** *** 29,42 **** { public: bernoulli() { ! m_num_eq = 1; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(x,0.5); } ~bernoulli() { ! delete m_data; } --- 29,45 ---- { public: + bernoulli() { ! CHAOS_PRECONSTRUCTOR; ! ! CHAOS_SYS_INIT(x,0.5,0); ! ! CHAOS_POSTCONSTRUCTOR; } ~bernoulli() { ! } Index: ikeda_laser_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/ikeda_laser_map.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ikeda_laser_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 --- ikeda_laser_map.hpp 9 Jun 2005 12:52:17 -0000 1.5 *************** *** 38,54 **** ikeda_laser_map() { ! m_num_eq = 2; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(c1,0.4); ! CHAOS_SYS_INIT(c2,0.9); ! CHAOS_SYS_INIT(c3,9); ! CHAOS_SYS_INIT(roh,0.85); ! CHAOS_SYS_INIT(x,0.5); ! CHAOS_SYS_INIT(y,0.5); } ~ikeda_laser_map() { ! delete m_data; } --- 38,57 ---- ikeda_laser_map() { ! CHAOS_PRECONSTRUCTOR; ! ! CHAOS_PAR_INIT(c1,0.4); ! CHAOS_PAR_INIT(c2,0.9); ! CHAOS_PAR_INIT(c3,9); ! CHAOS_PAR_INIT(roh,0.85); ! ! CHAOS_SYS_INIT(x,0.5,0); ! CHAOS_SYS_INIT(y,0.5,1); ! ! CHAOS_POSTCONSTRUCTOR; } ~ikeda_laser_map() { ! } Index: logistic_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/logistic_map.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** logistic_map.hpp 1 Jan 2005 11:06:58 -0000 1.6 --- logistic_map.hpp 9 Jun 2005 12:52:17 -0000 1.7 *************** *** 31,38 **** logistic() { ! m_num_eq = 1; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(alpha, 3.8); ! CHAOS_SYS_INIT(x, 0.5); } --- 31,40 ---- logistic() { ! CHAOS_PRECONSTRUCTOR; ! ! CHAOS_PAR_INIT(alpha, 3.8); ! CHAOS_SYS_INIT(x, 0.5,0); ! ! CHAOS_POSTCONSTRUCTOR; } Index: chaos_defs.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/chaos_defs.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** chaos_defs.hpp 28 Dec 2004 12:38:45 -0000 1.3 --- chaos_defs.hpp 9 Jun 2005 12:52:17 -0000 1.4 *************** *** 125,131 **** FLEXT_ADDATTR_VAR(#NAME,get_##NAME, set_##NAME); ! #define CHAOS_SYS_INIT(NAME, VALUE) \ set_##NAME(VALUE); #define CHAOS_PARAMETER(NAME) m_##NAME --- 125,146 ---- FLEXT_ADDATTR_VAR(#NAME,get_##NAME, set_##NAME); ! ! #define CHAOS_INIT(NAME, VALUE) \ set_##NAME(VALUE); + #define CHAOS_SYS_INIT(NAME, VALUE, INDEX) \ + set_##NAME(VALUE); \ + t_atom atom_##NAME; \ + flext::SetSymbol(atom_##NAME, flext::MakeSymbol(#NAME)); \ + System.Append(atom_##NAME); \ + attr_ind[flext::MakeSymbol(#NAME)] = INDEX; + + #define CHAOS_PAR_INIT(NAME, VALUE) \ + set_##NAME(VALUE); \ + t_atom atom_##NAME; \ + flext::SetSymbol(atom_##NAME, flext::MakeSymbol(#NAME)); \ + Parameter.Append(atom_##NAME); + + #define CHAOS_PARAMETER(NAME) m_##NAME *************** *** 143,146 **** --- 158,162 ---- FLEXT_LIB_DSP_V(#CLASSNAME"~", CLASSNAME##_dsp); + #define CHAOS_DSP_CLASS_NAME(CLASSNAME,CLASSNAME_UC, NAME) \ class CLASSNAME##_dsp: \ *************** *** 162,165 **** --- 178,182 ---- FLEXT_LIB_V(#CLASSNAME, CLASSNAME##_msg); + #define CHAOS_MSG_CLASS_NAME(CLASSNAME,CLASSNAME_UC, NAME) \ class CLASSNAME##_msg: \ *************** *** 171,177 **** FLEXT_LIB_V(#NAME, CLASSNAME##_msg); #define CHAOS_ADD(NAME) \ FLEXT_DSP_SETUP(NAME##_dsp); \ ! FLEXT_SETUP(NAME##_msg); #define __chaos_defs_hpp --- 188,216 ---- FLEXT_LIB_V(#NAME, CLASSNAME##_msg); + #define CHAOS_SEARCH_CLASS(CLASSNAME,CLASSNAME_UC) \ + class CLASSNAME##_search: \ + public chaos_search<CLASSNAME> \ + { \ + CHAOS_SEARCH_INIT(CLASSNAME, CLASSNAME_UC##_ATTRIBUTES); \ + CLASSNAME_UC##_CALLBACKS; \ + }; \ + FLEXT_LIB_V(#CLASSNAME"_search", CLASSNAME##_search); + + + #define CHAOS_SEARCH_CLASS_NAME(CLASSNAME,CLASSNAME_UC, NAME) \ + class CLASSNAME##_msg: \ + public chaos_search<CLASSNAME> \ + { \ + CHAOS_SEARCH_INIT(CLASSNAME, CLASSNAME_UC##_ATTRIBUTES); \ + CLASSNAME_UC##_CALLBACKS; \ + }; \ + FLEXT_LIB_V(#NAME, CLASSNAME##_msg); + + + #define CHAOS_ADD(NAME) \ FLEXT_DSP_SETUP(NAME##_dsp); \ ! FLEXT_SETUP(NAME##_msg); \ ! FLEXT_SETUP(NAME##_search); #define __chaos_defs_hpp Index: bungalow_tent_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/bungalow_tent_map.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** bungalow_tent_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 --- bungalow_tent_map.hpp 9 Jun 2005 12:52:17 -0000 1.5 *************** *** 39,51 **** bungalow_tent() { ! m_num_eq = 1; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(x, 0.6); ! CHAOS_SYS_INIT(r, 0.5); } ~bungalow_tent() { ! delete m_data; } --- 39,53 ---- bungalow_tent() { ! CHAOS_PRECONSTRUCTOR; ! ! CHAOS_SYS_INIT(x, 0.6,0); ! CHAOS_PAR_INIT(r, 0.5); ! ! CHAOS_POSTCONSTRUCTOR; } ~bungalow_tent() { ! } Index: Makefile.am =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.am 12 Feb 2005 08:58:20 -0000 1.9 --- Makefile.am 9 Jun 2005 12:52:17 -0000 1.10 *************** *** 17,21 **** latoomutbeta_dsp.cpp latoomutbeta_msg.cpp \ latoomutgamma_dsp.cpp latoomutgamma_msg.cpp \ ! logistic_dsp.cpp logistic_msg.cpp \ lorenz_dsp.cpp lorenz_msg.cpp \ lozi_map_dsp.cpp lozi_map_msg.cpp \ --- 17,21 ---- latoomutbeta_dsp.cpp latoomutbeta_msg.cpp \ latoomutgamma_dsp.cpp latoomutgamma_msg.cpp \ ! logistic_dsp.cpp logistic_msg.cpp logistic_search.cpp\ lorenz_dsp.cpp lorenz_msg.cpp \ lozi_map_dsp.cpp lozi_map_msg.cpp \ *************** *** 23,27 **** sine_map_dsp.cpp sine_map_msg.cpp \ standard_map_dsp.cpp standard_map_msg.cpp \ ! tent_map_dsp.cpp tent_map_msg.cpp CXXFLAGS = @CXXFLAGS@ \ --- 23,27 ---- sine_map_dsp.cpp sine_map_msg.cpp \ standard_map_dsp.cpp standard_map_msg.cpp \ ! tent_map_dsp.cpp tent_map_msg.cpp CXXFLAGS = @CXXFLAGS@ \ Index: latoomutbeta.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/latoomutbeta.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** latoomutbeta.hpp 12 Feb 2005 08:58:21 -0000 1.2 --- latoomutbeta.hpp 9 Jun 2005 12:52:17 -0000 1.3 *************** *** 33,48 **** latoomutbeta() { ! m_num_eq = 2; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(x1,0.5); ! CHAOS_SYS_INIT(x2,0.5); ! CHAOS_SYS_INIT(a,-0.966918); ! CHAOS_SYS_INIT(b,2.879879); } ~latoomutbeta() { ! delete m_data; } --- 33,50 ---- latoomutbeta() { ! CHAOS_PRECONSTRUCTOR; ! CHAOS_SYS_INIT(x1,0.5,0); ! CHAOS_SYS_INIT(x2,0.5,1); ! ! CHAOS_PAR_INIT(a,-0.966918); ! CHAOS_PAR_INIT(b,2.879879); ! ! CHAOS_POSTCONSTRUCTOR; } ~latoomutbeta() { ! } Index: standard_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/standard_map.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** standard_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 --- standard_map.hpp 9 Jun 2005 12:52:17 -0000 1.5 *************** *** 33,47 **** standard_map() { ! m_num_eq = 2; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(I,0.1); ! CHAOS_SYS_INIT(theta,0.2); ! CHAOS_SYS_INIT(k, 0.8); } ~standard_map() { ! delete m_data; } --- 33,49 ---- standard_map() { ! CHAOS_PRECONSTRUCTOR; ! ! CHAOS_SYS_INIT(I,0.1,0); ! CHAOS_SYS_INIT(theta,0.2,1); ! CHAOS_PAR_INIT(k, 0.8); ! ! CHAOS_POSTCONSTRUCTOR; } ~standard_map() { ! } Index: henon_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/henon_map.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** henon_map.hpp 1 Jan 2005 11:06:58 -0000 1.4 --- henon_map.hpp 9 Jun 2005 12:52:17 -0000 1.5 *************** *** 32,47 **** henon() { ! m_num_eq = 2; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(x,0); ! CHAOS_SYS_INIT(y,0); ! CHAOS_SYS_INIT(a,1.4); ! CHAOS_SYS_INIT(b,0.3); } ~henon() { ! delete m_data; } --- 32,49 ---- henon() { ! CHAOS_PRECONSTRUCTOR; ! CHAOS_SYS_INIT(x,0,0); ! CHAOS_SYS_INIT(y,0,1); ! ! CHAOS_PAR_INIT(a,1.4); ! CHAOS_PAR_INIT(b,0.3); ! ! CHAOS_POSTCONSTRUCTOR; } ~henon() { ! } Index: latoomutalpha.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/latoomutalpha.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** latoomutalpha.hpp 12 Feb 2005 08:58:21 -0000 1.2 --- latoomutalpha.hpp 9 Jun 2005 12:52:17 -0000 1.3 *************** *** 33,49 **** latoomutalpha() { ! m_num_eq = 2; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(x1,0.5); ! CHAOS_SYS_INIT(x2,0.2); ! CHAOS_SYS_INIT(a,-0.966918); ! CHAOS_SYS_INIT(b,2.879879); ! CHAOS_SYS_INIT(c,0.765145); } ~latoomutalpha() { ! delete m_data; } --- 33,51 ---- latoomutalpha() { ! CHAOS_PRECONSTRUCTOR; ! CHAOS_SYS_INIT(x1,0.5,0); ! CHAOS_SYS_INIT(x2,0.2,1); ! ! CHAOS_PAR_INIT(a,-0.966918); ! CHAOS_PAR_INIT(b,2.879879); ! CHAOS_PAR_INIT(c,0.765145); ! ! CHAOS_POSTCONSTRUCTOR; } ~latoomutalpha() { ! } *************** *** 69,73 **** #ifndef DOUBLE_PRECISION if (PD_BIGORSMALL(m_data[i])) ! m_data[i] = 0.01; #endif } --- 71,75 ---- #ifndef DOUBLE_PRECISION if (PD_BIGORSMALL(m_data[i])) ! m_data[i] = 0.5; #endif } Index: driven_van_der_pol.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/driven_van_der_pol.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** driven_van_der_pol.hpp 27 Dec 2004 22:55:41 -0000 1.1 --- driven_van_der_pol.hpp 9 Jun 2005 12:52:17 -0000 1.2 *************** *** 36,53 **** driven_van_der_pol() { ! m_num_eq = 2; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(method,0); ! CHAOS_SYS_INIT(dt,0.01); ! CHAOS_SYS_INIT(u1,0.8); ! CHAOS_SYS_INIT(u2,0.6); ! CHAOS_SYS_INIT(u3,0.4); ! CHAOS_SYS_INIT(a,5); ! CHAOS_SYS_INIT(Omega,2.466); ! CHAOS_SYS_INIT(k,5); ode_base_alloc(); } --- 36,53 ---- driven_van_der_pol() { ! CHAOS_PRECONSTRUCTOR; ! CHAOS_PAR_INIT(method,0); ! CHAOS_PAR_INIT(dt,0.01); ! CHAOS_SYS_INIT(u1,0.8, 0); ! CHAOS_SYS_INIT(u2,0.6, 1); ! CHAOS_SYS_INIT(u3,0.4, 2); ! CHAOS_PAR_INIT(a,5); ! CHAOS_PAR_INIT(Omega,2.466); ! CHAOS_PAR_INIT(k,5); + CHAOS_POSTCONSTRUCTOR; ode_base_alloc(); } *************** *** 56,60 **** { ode_base_free(); ! delete m_data; } --- 56,60 ---- { ode_base_free(); ! } Index: duffing_map.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/duffing_map.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** duffing_map.hpp 28 Dec 2004 12:38:45 -0000 1.1 --- duffing_map.hpp 9 Jun 2005 12:52:17 -0000 1.2 *************** *** 32,46 **** duffing_map() { ! m_num_eq = 2; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(x1, 0.5); ! CHAOS_SYS_INIT(x2, 0.5); ! CHAOS_SYS_INIT(a, 0.5); ! CHAOS_SYS_INIT(b, 0.5); } ~duffing_map() { ! delete m_data; } --- 32,48 ---- duffing_map() { ! CHAOS_PRECONSTRUCTOR; ! ! CHAOS_SYS_INIT(x1, 0.5, 0); ! CHAOS_SYS_INIT(x2, 0.5, 1); ! CHAOS_PAR_INIT(a, 0.5); ! CHAOS_PAR_INIT(b, 0.5); ! ! CHAOS_POSTCONSTRUCTOR; } ~duffing_map() { ! } Index: chua.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/tb/chaos/src/chua.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** chua.hpp 1 Jan 2005 11:06:58 -0000 1.1 --- chua.hpp 9 Jun 2005 12:52:17 -0000 1.2 *************** *** 37,49 **** chua() { ! m_num_eq = 3; ! m_data = new data_t[m_num_eq]; ! CHAOS_SYS_INIT(x1,1); ! CHAOS_SYS_INIT(x2,1); ! CHAOS_SYS_INIT(x3,1); ! CHAOS_SYS_INIT(a,1.4); ! CHAOS_SYS_INIT(b,0.3); ! CHAOS_SYS_INIT(alpha,0.3); ! CHAOS_SYS_INIT(beta,0.3); ode_base_alloc(); --- 37,52 ---- chua() { ! CHAOS_PRECONSTRUCTOR; ! ! CHAOS_SYS_INIT(x1,1,0); ! CHAOS_SYS_INIT(x2,1,1); ! CHAOS_SYS_INIT(x3,1,2); ! ! CHAOS_PAR_INIT(a,1.4); ! CHAOS_PAR_INIT(b,0.3); ! CHAOS_PAR_INIT(alpha,0.3); ! CHAOS_PAR_INIT(beta,0.3); ! ! CHAOS_POSTCONSTRUCTOR; ode_base_alloc(); *************** *** 53,57 **** { ode_base_free(); - delete m_data; } --- 56,59 ----

1 0

externals/tb/detach detach.c,1.2,1.3
by Tim Blechmann 09 Jun '05

09 Jun '05

Update of /cvsroot/pure-data/externals/tb/detach In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13767 Modified Files: detach.c Log Message: adapted for updated fifo implementation Index: detach.c =================================================================== RCS file: /cvsroot/pure-data/externals/tb/detach/detach.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** detach.c 6 Jan 2005 17:00:45 -0000 1.2 --- detach.c 9 Jun 2005 12:48:20 -0000 1.3 *************** *** 46,49 **** --- 46,50 ---- typedef struct _detach_content { + struct _detach_content_t * next; enum { BANG, POINTER, *************** *** 55,58 **** --- 56,60 ---- int argc; t_atom * argv; + t_symbol * symbol; } detach_content_t; *************** *** 86,90 **** break; case ANYTHING: ! outlet_anything(x->x_outlet, 0, me->argc, me->argv); freebytes(me->argv, me->argc * sizeof(t_atom)); break; --- 88,92 ---- break; case ANYTHING: ! outlet_anything(x->x_outlet, me->symbol, me->argc, me->argv); freebytes(me->argv, me->argc * sizeof(t_atom)); break; *************** *** 233,236 **** --- 235,239 ---- me->argc = argc; me->argv = copybytes(argv, argc * sizeof(t_atom)); + me->symbol = s; fifo_put(x->x_fifo, me);

1 0

externals/zexy README.txt,1.4,1.5
by IOhannes m zmölnig 09 Jun '05

09 Jun '05

Update of /cvsroot/pure-data/externals/zexy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2584 Modified Files: README.txt Log Message: added tiny information about xcompiling with wingw Index: README.txt =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/README.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** README.txt 22 Mar 2005 20:58:13 -0000 1.4 --- README.txt 9 Jun 2005 12:25:45 -0000 1.5 *************** *** 27,32 **** extract the zexy-0_x.zip to your pd-path (this file should be located at <mypdpath>/pd/zexy/) execute the "z_install.bat", this should copy all necessary files to the correct places ! to compile: w/ MSVC makefile.nt or zexy.dsw, or with GCC configure your pd path, eg: ! ./configure --prefix=/c/program/pd; make; make install irix : --- 27,35 ---- extract the zexy-0_x.zip to your pd-path (this file should be located at <mypdpath>/pd/zexy/) execute the "z_install.bat", this should copy all necessary files to the correct places ! to compile: w/ MSVC use makefile.nt or zexy.dsw; ! or with GCC configure your pd path, eg: ! ./configure --prefix=/c/program/pd; make; make install ! cross-compilation for windows on linux using mingw (assumes that the xcompiler is "i586-mingw32msvc-cc") ! ./configure --host=i586-mingw32msvc --with-extension=dll --includedir=/path/to/win/pd/src/ --libdir=/path/to/win/pd/bin/ irix :

1 0

externals/zexy/src sfplay.c,1.4,1.5 sfrecord.c,1.4,1.5
by IOhannes m zmölnig 09 Jun '05

09 Jun '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2144 Modified Files: sfplay.c sfrecord.c Log Message: probably fixed a bug with wrong defines Index: sfplay.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/sfplay.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sfplay.c 9 Jun 2005 12:17:03 -0000 1.4 --- sfplay.c 9 Jun 2005 12:24:57 -0000 1.5 *************** *** 75,80 **** #ifdef __WIN32__ # define BINREADMODE "rb" ! #endif ! #ifdef unix # include <unistd.h> # include <sys/mman.h> --- 75,79 ---- #ifdef __WIN32__ # define BINREADMODE "rb" ! #else # include <unistd.h> # include <sys/mman.h> Index: sfrecord.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/sfrecord.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sfrecord.c 9 Jun 2005 12:17:03 -0000 1.4 --- sfrecord.c 9 Jun 2005 12:24:57 -0000 1.5 *************** *** 45,54 **** #ifdef __WIN32__ ! #define BINWRITEMODE "wb" ! #endif ! #ifdef unix ! #include <unistd.h> ! #include <sys/mman.h> ! #define BINWRITEMODE "w" #endif --- 45,53 ---- #ifdef __WIN32__ ! # define BINWRITEMODE "wb" ! #else ! # include <unistd.h> ! # include <sys/mman.h> ! # define BINWRITEMODE "w" #endif

1 0

externals/zexy/src zexy.dsp,1.4,1.5
by IOhannes m zmölnig 09 Jun '05

09 Jun '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32181 Modified Files: zexy.dsp Log Message: define __WIN32__ instead of other NT-defines Index: zexy.dsp =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/zexy.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** zexy.dsp 22 Mar 2005 20:58:25 -0000 1.4 --- zexy.dsp 9 Jun 2005 12:19:30 -0000 1.5 *************** *** 40,44 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEXY_EXPORTS" /YX /FD /c ! # ADD CPP /nologo /Zp16 /W3 /GX /I "..\..\..\pd\src" /D "WIN32" /D "NT" /D "_WINDOWS" /D "ZEXY" /D "Z_WANT_LPT" /FR /YX /FD /c # SUBTRACT CPP /O<none> # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 40,44 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEXY_EXPORTS" /YX /FD /c ! # ADD CPP /nologo /Zp16 /W3 /GX /I "..\..\..\pd\src" /D "__WIN32__" /D "ZEXY" /D "Z_WANT_LPT" /FR /YX /FD /c # SUBTRACT CPP /O<none> # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

1 0

externals/zexy/src Makefile.nt,1.1,1.2
by IOhannes m zmölnig 09 Jun '05

09 Jun '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31728 Modified Files: Makefile.nt Log Message: define __WIN32__ instead of NT Index: Makefile.nt =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/Makefile.nt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.nt 23 Apr 2005 18:18:52 -0000 1.1 --- Makefile.nt 9 Jun 2005 12:18:18 -0000 1.2 *************** *** 17,21 **** ! DEFS = /DNT /DPD IFLAGS = /I. /I$(PREFIX)\src --- 17,21 ---- ! DEFS = /D__WIN32__ /DPD IFLAGS = /I. /I$(PREFIX)\src

1 0

externals/zexy/src date.c, 1.2, 1.3 length.c, 1.2, 1.3 lpt.c, 1.3, 1.4 msgfile.c, 1.3, 1.4 operating_system.c, 1.2, 1.3 sfplay.c, 1.3, 1.4 sfrecord.c, 1.3, 1.4 symbol2list.c, 1.2, 1.3 tavg~.c, 1.2, 1.3 time.c, 1.2, 1.3 z_sigbin.c, 1.3, 1.4 zexy.h, 1.4, 1.5
by IOhannes m zmölnig 09 Jun '05

09 Jun '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30818 Modified Files: date.c length.c lpt.c msgfile.c operating_system.c sfplay.c sfrecord.c symbol2list.c tavg~.c time.c z_sigbin.c zexy.h Log Message: replaced MACOSX by __APPLE__ replaced NT by __WIN32__ (defined by mingw, but NOT by msvc) Index: z_sigbin.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/z_sigbin.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** z_sigbin.c 19 May 2005 09:42:55 -0000 1.3 --- z_sigbin.c 9 Jun 2005 12:17:03 -0000 1.4 *************** *** 24,31 **** #include <math.h> - #ifdef NT - #define fabsf fabs - #endif - typedef struct _misc { --- 24,27 ---- Index: time.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/time.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** time.c 19 May 2005 09:42:55 -0000 1.2 --- time.c 9 Jun 2005 12:17:03 -0000 1.3 *************** *** 23,32 **** */ ! #ifdef NT #define USE_TIMEB #endif ! #ifdef MACOSX #include <sys/types.h> /* typedef _BSD_TIME_T_ time_t; */ --- 23,33 ---- */ + #include "zexy.h" ! #ifdef __WIN32__ #define USE_TIMEB #endif ! #ifdef __APPLE__ #include <sys/types.h> /* typedef _BSD_TIME_T_ time_t; */ *************** *** 34,38 **** - #include "zexy.h" #include <time.h> --- 35,38 ---- Index: date.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/date.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** date.c 19 May 2005 09:42:55 -0000 1.2 --- date.c 9 Jun 2005 12:17:03 -0000 1.3 *************** *** 24,32 **** */ ! #ifdef NT # define USE_TIMEB #endif ! #ifdef MACOSX # include <sys/types.h> /* typedef _BSD_TIME_T_ time_t; */ --- 24,34 ---- */ ! #include "zexy.h" ! ! #ifdef __WIN32__ # define USE_TIMEB #endif ! #ifdef __APPLE__ # include <sys/types.h> /* typedef _BSD_TIME_T_ time_t; */ *************** *** 34,38 **** - #include "zexy.h" #include <time.h> --- 36,39 ---- Index: sfplay.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/sfplay.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sfplay.c 19 May 2005 09:42:55 -0000 1.3 --- sfplay.c 9 Jun 2005 12:17:03 -0000 1.4 *************** *** 66,75 **** #define DACBLKSIZE 64 /* in m_imp.h, but error if it is included it here*/ - #ifdef NT - #pragma warning( disable : 4244 ) - #pragma warning( disable : 4305 ) - #pragma warning( disable : 4018 ) - #endif - #include <stdio.h> #include <string.h> --- 66,69 ---- *************** *** 79,89 **** #define MAX_CHANS 8 /* channels for soundfiles 1,2,4,8 */ ! #ifdef NT ! #define BINREADMODE "rb" #endif #ifdef unix ! #include <unistd.h> ! #include <sys/mman.h> ! #define BINREADMODE "r" #endif --- 73,83 ---- #define MAX_CHANS 8 /* channels for soundfiles 1,2,4,8 */ ! #ifdef __WIN32__ ! # define BINREADMODE "rb" #endif #ifdef unix ! # include <unistd.h> ! # include <sys/mman.h> ! # define BINREADMODE "r" #endif Index: zexy.h =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/zexy.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** zexy.h 12 Apr 2005 12:01:46 -0000 1.4 --- zexy.h 9 Jun 2005 12:17:03 -0000 1.5 *************** *** 31,54 **** #define INCLUDE_ZEXY_H__ #include "m_pd.h" #define VERSION "2.0" ! #ifdef NT # pragma warning( disable : 4244 ) # pragma warning( disable : 4305 ) # define HEARTSYMBOL 3 - # define sqrtf sqrt - # define fabsf fabs # define STATIC_INLINE #else # define HEARTSYMBOL 169 #endif ! #ifdef MACOSX # define sqrtf sqrt #endif - typedef struct _mypdlist { --- 31,61 ---- #define INCLUDE_ZEXY_H__ + #ifdef __WIN32__ + # define NT + # define MSW + #endif + #include "m_pd.h" #define VERSION "2.0" ! ! #ifdef __WIN32__ ! # pragma warning( disable : 4018 ) # pragma warning( disable : 4244 ) # pragma warning( disable : 4305 ) # define HEARTSYMBOL 3 # define STATIC_INLINE + //# define sqrtf sqrt + //# define fabsf fabs #else # define HEARTSYMBOL 169 + # define STATIC_INLINE static #endif ! #ifdef __APPLE__ # define sqrtf sqrt #endif typedef struct _mypdlist { Index: msgfile.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/msgfile.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** msgfile.c 8 Jun 2005 17:07:21 -0000 1.3 --- msgfile.c 9 Jun 2005 12:17:03 -0000 1.4 *************** *** 29,33 **** #include <unistd.h> #endif ! #ifdef NT #include <io.h> #endif --- 29,33 ---- #include <unistd.h> #endif ! #ifdef __WIN32__ #include <io.h> #endif *************** *** 526,530 **** ! #ifdef NT rmode |= O_BINARY; #endif --- 526,530 ---- ! #ifdef __WIN32__ rmode |= O_BINARY; #endif Index: sfrecord.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/sfrecord.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sfrecord.c 19 May 2005 09:42:55 -0000 1.3 --- sfrecord.c 9 Jun 2005 12:17:03 -0000 1.4 *************** *** 37,45 **** #define DACBLKSIZE 64 /* in m_imp.h, but error if it is included it here*/ - #ifdef NT - #pragma warning( disable : 4244 ) - #pragma warning( disable : 4305 ) - #endif - #include <stdio.h> #include <string.h> --- 37,40 ---- *************** *** 49,53 **** #define MAX_CHANS 8 /* channels for soundfiles 1,2,4,8 */ ! #ifdef NT #define BINWRITEMODE "wb" #endif --- 44,48 ---- #define MAX_CHANS 8 /* channels for soundfiles 1,2,4,8 */ ! #ifdef __WIN32__ #define BINWRITEMODE "wb" #endif Index: tavg~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/tavg~.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tavg~.c 19 May 2005 09:42:55 -0000 1.2 --- tavg~.c 9 Jun 2005 12:17:03 -0000 1.3 *************** *** 18,31 **** #include <math.h> - #ifdef NT - #define sqrtf sqrt - #endif - - #ifdef MACOSX - #define sqrtf sqrt - #endif - - - /* triggered average :: arithmetic mean between last and current BANG */ --- 18,21 ---- Index: symbol2list.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/symbol2list.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** symbol2list.c 19 May 2005 09:42:55 -0000 1.2 --- symbol2list.c 9 Jun 2005 12:17:03 -0000 1.3 *************** *** 19,26 **** #include <string.h> - #ifndef NT - # define STATIC_INLINE static - #endif - /* * symbol2list: convert a symbol into a list (with given delimiters) --- 19,22 ---- Index: operating_system.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/operating_system.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** operating_system.c 19 May 2005 09:42:55 -0000 1.2 --- operating_system.c 9 Jun 2005 12:17:03 -0000 1.3 *************** *** 43,47 **** #elif defined __APPLE__ s=gensym("macos"); ! #elif defined NT s=gensym("windows"); #endif --- 43,47 ---- #elif defined __APPLE__ s=gensym("macos"); ! #elif defined __WIN32__ s=gensym("windows"); #endif Index: lpt.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/lpt.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lpt.c 19 May 2005 09:42:55 -0000 1.3 --- lpt.c 9 Jun 2005 12:17:03 -0000 1.4 *************** *** 41,45 **** # include <stdlib.h> ! # ifdef NT /* on windoze everything is so complicated... */ extern int read_parport(int port); --- 41,45 ---- # include <stdlib.h> ! # ifdef __WIN32__ /* on windoze everything is so complicated... */ extern int read_parport(int port); *************** *** 78,82 **** return inb(port); } ! # endif /* NT */ #endif /* Z_WANT_LP */ --- 78,82 ---- return inb(port); } ! # endif /* __WIN32__ */ #endif /* Z_WANT_LP */ Index: length.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/length.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** length.c 19 May 2005 09:42:55 -0000 1.2 --- length.c 9 Jun 2005 12:17:03 -0000 1.3 *************** *** 20,28 **** #include <math.h> - #ifdef MACOSX - #define sqrtf sqrt - #endif - - static t_class *length_class; --- 20,23 ----

1 0

externals/zexy/src Makefile.in,1.3,1.4
by IOhannes m zmölnig 09 Jun '05

09 Jun '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29698 Modified Files: Makefile.in Log Message: now works with mingw-xcompiler Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 22 May 2005 19:29:49 -0000 1.3 --- Makefile.in 9 Jun 2005 12:14:38 -0000 1.4 *************** *** 1,3 **** ! LIBNAME =zexy PREFIX =@prefix@@PDLIBDIR@ --- 1,3 ---- ! LIBNAME =@LIBNAME@ PREFIX =@prefix@@PDLIBDIR@ *************** *** 12,15 **** --- 12,18 ---- CC = @CC@ LD = @LD@ + STRIP = @STRIP@ + STRIPFLAGS= @STRIPFLAGS@ + AFLAGS = LFLAGS = @LFLAGS@ *************** *** 25,29 **** LIBS = @LIBS@ - #LIBS = -lpthread -lm -lc include Make.source --- 28,31 ---- *************** *** 37,47 **** $(LIBNAME): $(TARGETS) $(LD) $(LFLAGS) -o $(LIBNAME).$(EXT) *.o $(LIBS) ! strip @STRIPFLAGS@ $(LIBNAME).$(EXT) .c.o: $(CC) -c -o $@ $(CFLAGS) -DPD $*.c - # cp $@ $*_stat.o - .o.$(EXT): $(CC) -o $@ $(PDCFLAGS) -DPD $*.o --- 39,47 ---- $(LIBNAME): $(TARGETS) $(LD) $(LFLAGS) -o $(LIBNAME).$(EXT) *.o $(LIBS) ! $(STRIP) $(STRIPFLAGS) $(LIBNAME).$(EXT) .c.o: $(CC) -c -o $@ $(CFLAGS) -DPD $*.c .o.$(EXT): $(CC) -o $@ $(PDCFLAGS) -DPD $*.o

1 0

externals/zexy/src configure.ac,1.3,1.4
by IOhannes m zmölnig 09 Jun '05

09 Jun '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27546 Modified Files: configure.ac Log Message: added support for mingw-xcompiler Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.ac 19 May 2005 10:22:42 -0000 1.3 --- configure.ac 9 Jun 2005 12:10:38 -0000 1.4 *************** *** 2,17 **** AC_INIT(zexy.c) ! dnl for now i can test ICC only on linux ! dnl LATER we might want to use it for other platforms (namely:windoze) too - if test `uname -s` = Linux; - then - AC_ARG_ENABLE(icc, [ --enable-icc enable ICC-support]) - if test "$enable_icc" = "yes"; then - CC=icc - LD=icc - fi - fi - dnl Checks for programs. --- 2,7 ---- AC_INIT(zexy.c) ! LIBNAME=zexy dnl Checks for programs. *************** *** 24,27 **** --- 14,18 ---- AC_SUBST(EXT) AC_SUBST(LD) + AC_SUBST(STRIP) AC_SUBST(STRIPFLAGS) AC_SUBST(ZEXY_VERSION) *************** *** 30,36 **** --- 21,31 ---- AC_SUBST(INCLUDES) AC_SUBST(SOURCES) + AC_SUBST(LIBNAME) + AC_ARG_WITH(pdversion, [ --with-pdversion=<ver> enforce a certain pd-version (e.g. 0.37)]) + AC_ARG_WITH(version, [ --with-version=<ver> enforce a certain zexy-version (e.g. 2.0)]) + AC_ARG_WITH(extension, [ --with-extension=<ext> enforce a certain extension for the dynamic library (e.g. dll)]) AC_ARG_ENABLE(lpt, [ --enable-lpt enable parallelport-support]) AC_ARG_ENABLE(icc, [ --enable-icc enable ICC-support]) *************** *** 40,43 **** --- 35,78 ---- fi + dnl Checks for libraries. + dnl Replace `main' with a function in -lc: + AC_CHECK_LIB(c, main) + AC_CHECK_LIB(crtdll, fclose) + + dnl Replace `main' with a function in -lm: + AC_CHECK_LIB(m, main) + dnl Replace `main' with a function in -lpthread: + dnl AC_CHECK_LIB(pthread, main) + dnl Replace `main' with a function in -lstk: + dnl AC_CHECK_LIB(stk, main, STK=yes) + + + dnl for now i can test ICC only on linux + dnl LATER we might want to use it for other platforms (namely:windoze) too + + if test `uname -s` = Linux; + then + AC_ARG_ENABLE(icc, [ --enable-icc enable ICC-support]) + if test "$enable_icc" = "yes"; then + CC=icc + LD=icc + fi + fi + + if test $includedir + then + for id in $includedir + do + if test -d $id; then INCLUDES="-I$id $INCLUDES"; fi + done + fi + if test $libdir + then + for id in $libdir + do + if test -d $id; then LIBS="-L$id $LIBS"; fi + done + fi + if test $includedir then *************** *** 51,63 **** fi ! dnl Checks for libraries. ! dnl Replace `main' with a function in -lc: ! AC_CHECK_LIB(c, main) ! dnl Replace `main' with a function in -lm: ! AC_CHECK_LIB(m, main) ! dnl Replace `main' with a function in -lpthread: ! dnl AC_CHECK_LIB(pthread, main) ! dnl Replace `main' with a function in -lstk: ! dnl AC_CHECK_LIB(stk, main, STK=yes) dnl Checks for header files. --- 86,90 ---- fi ! AC_CHECK_LIB(pd, nullfn) dnl Checks for header files. *************** *** 72,77 **** AC_CHECK_FUNCS(select socket strerror) ! dnl ifwe don't have $LD set, we set it to "ld" ! LD=${LD:-ld} DFLAGS="-DZEXY_LIBRARY" --- 99,141 ---- AC_CHECK_FUNCS(select socket strerror) ! dnl check for "-mms-bitfields" cflag ! dnl why is there no generic compiler-check for a given flag ? ! dnl it would make things so easy: AC_CHECK_FLAG([-mms-bitfields],,) ! AC_MSG_CHECKING("ms-bitfields") ! cat > conftest.c << EOF ! int main(){ ! return 0; ! } ! EOF ! if ${CC} ${INCLUDES} ${DFLAGS} -o conftest.o conftest.c ${CFLAGS} -mms-bitfields > /dev/null 2>&1 ! then ! echo "yes" ! CFLAGS="${CFLAGS} -mms-bitfields" ! else ! echo "no" ! fi ! ! ! ! dnl if we don't have $LD set, we set it to $(CC) ! LD=${LD:=$CC} ! dnl if we don't have $STRIP set, we set it to ${host}-strip or strip ! if test "x$STRIP" = "x" ! then ! if test "x$host" != "x" ! then ! STRIP=${host}-strip ! if $(which ${host}-strip > /dev/null) ! then ! : ! else ! STRIP="echo fake strip" ! fi ! else ! STRIP=strip ! fi ! fi ! dnl STRIP=${STRIP:=strip} ! DFLAGS="-DZEXY_LIBRARY" *************** *** 83,89 **** if test "$with_pdversion" != "" then ! echo -n "($with_pdversion)... " PD_VERSION="$with_pdversion" else cat > conftest.c << EOF #include <stdio.h> --- 147,156 ---- if test "$with_pdversion" != "" then ! echo -n "($with_pdversion)... " PD_VERSION="$with_pdversion" else + if test "x$cross_compiling" = "xno" + then + cat > conftest.c << EOF #include <stdio.h> *************** *** 94,102 **** } EOF ! if $CC $INCLUDES -o conftest.o conftest.c > /dev/null 2>&1 ! then ! PD_VERSION=`./conftest.o` else ! PD_VERSION="" fi fi --- 161,174 ---- } EOF ! if $CC $INCLUDES -o conftest.o conftest.c > /dev/null 2>&1 ! then ! PD_VERSION=`./conftest.o` ! else ! PD_VERSION="" ! fi else ! dnl we are cross-compiling... ! echo -n "(X)..." ! PD_VERSION="0.38" fi fi *************** *** 116,119 **** --- 188,199 ---- dnl check for zexy-version (but why...) AC_MSG_CHECKING("zexy-version") + + if test "$with_version" != "" + then + echo -n "($with_version)...forced " + ZEXY_VERSION="$with_version" + else + if test "x$cross_compiling" = "xno" + then cat > conftest.c << EOF #include <stdio.h> *************** *** 125,142 **** EOF ! if $CC $INCLUDES $DFLAGS -o conftest.o conftest.c > /dev/null 2>&1 ! then ! ZEXY_VERSION=`./conftest.o` ! echo "$ZEXY_VERSION" ! else ! ZEXY_VERSION="X" ! echo "(unknown)" fi - dnl dnl OK, checks which machines are here now dnl if test `uname -s` = Linux; then --- 205,228 ---- EOF ! if $CC $INCLUDES $DFLAGS -o conftest.o conftest.c > /dev/null 2>&1 ! then ! ZEXY_VERSION=`./conftest.o` ! echo "$ZEXY_VERSION" ! else ! ZEXY_VERSION="X" ! echo "(unknown)" ! fi ! else ! ZEXY_VERSION="X" ! echo "(X)" ! fi fi dnl dnl OK, checks which machines are here now + dnl this needs some rethinking when cross-compiling (?) dnl + if test `uname -s` = Linux; then *************** *** 197,206 **** LD=gcc INCLUDES="-I@prefix@/src" ! DFLAGS="-DMSW -DNT" LFLAGS="-shared @prefix@/bin/pd.dll" EXT=dll else PDLIBDIR="/lib/pd" ! LIBS="-lc -lm" fi if test `uname -s` = IRIX64; --- 283,294 ---- LD=gcc INCLUDES="-I@prefix@/src" ! dnl mingw should (does?) define __WIN32__ which is now used ! dnl DFLAGS="-DMSW -DNT" LFLAGS="-shared @prefix@/bin/pd.dll" EXT=dll else PDLIBDIR="/lib/pd" ! dnl this is handled by AC_CHECK_LIB above ! dnl LIBS="-lc -lm" fi if test `uname -s` = IRIX64; *************** *** 237,240 **** --- 325,334 ---- fi + + if test "x$with_extension" != "x" + then + EXT=$with_extension + fi + dnl check for LPT AC_MSG_CHECKING("parallel-port")

1 0

externals/zexy/src winNT_portio.c,1.2,1.3
by IOhannes m zmölnig 09 Jun '05

09 Jun '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14403 Modified Files: winNT_portio.c Log Message: ifdef'ed the assembler to be used only with M$-VC (doesn't work with mingw) Index: winNT_portio.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/winNT_portio.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** winNT_portio.c 19 May 2005 09:42:55 -0000 1.2 --- winNT_portio.c 9 Jun 2005 11:46:16 -0000 1.3 *************** *** 7,11 **** * if the interface changes, only this file has to be adopted for the target system */ ! #ifdef NT #include <stdio.h> --- 7,11 ---- * if the interface changes, only this file has to be adopted for the target system */ ! #ifdef __WIN32__ #include <stdio.h> *************** *** 22,29 **** // byte = _inp((unsigned short)port); unsigned char value; ! __asm mov edx,port __asm in al,dx __asm mov value,al return (int)value; } --- 22,34 ---- // byte = _inp((unsigned short)port); unsigned char value; ! #ifdef _MSC_VER __asm mov edx,port __asm in al,dx __asm mov value,al + #else + // hmm, i should read some documentation about inline assembler + post("lpt: cannot read from parport (recompile!)"); + return 0; + #endif return (int)value; } *************** *** 31,39 **** void write_parport(int port, int invalue) { ! // _outp((unsigned short)port, value); ! BYTE value = (BYTE)invalue; ! __asm mov edx,port ! __asm mov al,value ! __asm out dx,al } --- 36,59 ---- void write_parport(int port, int invalue) { ! // _outp((unsigned short)port, value); ! BYTE value = (BYTE)invalue; ! #ifdef _MSC_VER ! __asm mov edx,port ! __asm mov al,value ! __asm out dx,al ! #else ! // hmm, i should read some documentation about inline assembler ! // and probably about assembler in general... ! post("lpt: cannot write to parport (recompile!)"); ! /* ! asm( ! "mov %%edx,%0\n" ! "mov %%al,%1\n" ! "out %%dx,%%al\n" ! : ! : "a"(port),"b"(value) ! ); ! */ ! #endif } *************** *** 105,109 **** } } ! #endif /* NT */ void z_winNT_portio_setup(void) --- 125,129 ---- } } ! #endif /* __WIN32__ */ void z_winNT_portio_setup(void)

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
22
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 June 2005