lists@iem
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
List overview
Download
Pd-cvs
April 2004
----- 2025 -----
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
pd-cvs@lists.iem.at
10 participants
178 discussions
Start a n
N
ew thread
externals/grill/flext/source flsimd.cpp,1.11,1.12
by Thomas Grill
02 Apr '04
02 Apr '04
Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5343/source Modified Files: flsimd.cpp Log Message: "" Index: flsimd.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsimd.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** flsimd.cpp 30 Dec 2003 03:32:46 -0000 1.11 --- flsimd.cpp 2 Apr 2004 02:21:20 -0000 1.12 **
…
[View More]
************* *** 507,510 **** --- 507,660 ---- } + #if defined(FLEXT_USE_SIMD) && FLEXT_CPU == FLEXT_CPU_PPC && defined(__ALTIVEC__) + // because of some frame code Altivec stuff should be in seperate functions.... + + static const vector float zero = (vector float)(0); + + static void SetAltivec(t_sample *dst,int cnt,t_sample s) + { + vector float svec = LoadValue(s); + int n = cnt>>4; + cnt -= n<<4; + + while(n--) { + vec_st(svec,0,dst); + vec_st(svec,16,dst); + vec_st(svec,32,dst); + vec_st(svec,48,dst); + dst += 16; + } + + while(cnt--) *(dst++) = s; + } + + static void MulAltivec(t_sample *dst,const t_sample *src,t_sample op,int cnt) + { + const vector float arg = LoadValue(op); + int n = cnt>>4; + cnt -= n<<4; + + for(; n--; src += 16,dst += 16) { + vector float a1 = vec_ld( 0,src); + vector float a2 = vec_ld(16,src); + vector float a3 = vec_ld(32,src); + vector float a4 = vec_ld(48,src); + + a1 = vec_madd(a1,arg,zero); + a2 = vec_madd(a2,arg,zero); + a3 = vec_madd(a3,arg,zero); + a4 = vec_madd(a4,arg,zero); + + vec_st(a1, 0,dst); + vec_st(a2,16,dst); + vec_st(a3,32,dst); + vec_st(a4,48,dst); + } + + while(cnt--) *(dst++) = *(src++)*op; + } + + static void MulAltivec(t_sample *dst,const t_sample *src,const t_sample *op,int cnt) + { + int n = cnt>>4; + cnt -= n<<4; + + for(; n--; src += 16,op += 16,dst += 16) { + vector float a1 = vec_ld( 0,src),b1 = vec_ld( 0,op); + vector float a2 = vec_ld(16,src),b2 = vec_ld(16,op); + vector float a3 = vec_ld(32,src),b3 = vec_ld(32,op); + vector float a4 = vec_ld(48,src),b4 = vec_ld(48,op); + + a1 = vec_madd(a1,b1,zero); + a2 = vec_madd(a2,b2,zero); + a3 = vec_madd(a3,b3,zero); + a4 = vec_madd(a4,b4,zero); + + vec_st(a1, 0,dst); + vec_st(a2,16,dst); + vec_st(a3,32,dst); + vec_st(a4,48,dst); + } + while(cnt--) *(dst++) = *(src++) * *(op++); + } + + static void AddAltivec(t_sample *dst,const t_sample *src,t_sample op,int cnt) + { + const vector float arg = LoadValue(op); + int n = cnt>>4; + cnt -= n<<4; + + for(; n--; src += 16,dst += 16) { + vector float a1 = vec_ld( 0,src); + vector float a2 = vec_ld(16,src); + vector float a3 = vec_ld(32,src); + vector float a4 = vec_ld(48,src); + + a1 = vec_add(a1,arg); + a2 = vec_add(a2,arg); + a3 = vec_add(a3,arg); + a4 = vec_add(a4,arg); + + vec_st(a1, 0,dst); + vec_st(a2,16,dst); + vec_st(a3,32,dst); + vec_st(a4,48,dst); + } + + while(cnt--) *(dst++) = *(src++)+op; + } + + static void AddAltivec(t_sample *dst,const t_sample *src,const t_sample *op,int cnt) + { + int n = cnt>>4; + cnt -= n<<4; + + for(; n--; src += 16,op += 16,dst += 16) { + vector float a1 = vec_ld( 0,src),b1 = vec_ld( 0,op); + vector float a2 = vec_ld(16,src),b2 = vec_ld(16,op); + vector float a3 = vec_ld(32,src),b3 = vec_ld(32,op); + vector float a4 = vec_ld(48,src),b4 = vec_ld(48,op); + + a1 = vec_add(a1,b1); + a2 = vec_add(a2,b2); + a3 = vec_add(a3,b3); + a4 = vec_add(a4,b4); + + vec_st(a1, 0,dst); + vec_st(a2,16,dst); + vec_st(a3,32,dst); + vec_st(a4,48,dst); + } + while(cnt--) *(dst++) = *(src++) + *(op++); + } + + static void ScaleAltivec(t_sample *dst,const t_sample *src,t_sample opmul,t_sample opadd,int cnt) + { + const vector float argmul = LoadValue(opmul); + const vector float argadd = LoadValue(opadd); + int n = cnt>>4; + cnt -= n<<4; + + for(; n--; src += 16,dst += 16) { + vector float a1 = vec_ld( 0,src); + vector float a2 = vec_ld(16,src); + vector float a3 = vec_ld(32,src); + vector float a4 = vec_ld(48,src); + + a1 = vec_madd(a1,argmul,argadd); + a2 = vec_madd(a2,argmul,argadd); + a3 = vec_madd(a3,argmul,argadd); + a4 = vec_madd(a4,argmul,argadd); + + vec_st(a1, 0,dst); + vec_st(a2,16,dst); + vec_st(a3,32,dst); + vec_st(a4,48,dst); + } + + while(cnt--) *(dst++) = *(src++)*opmul+opadd; + } + #endif + void flext::SetSamples(t_sample *dst,int cnt,t_sample s) { *************** *** 564,582 **** else #elif FLEXT_CPU == FLEXT_CPU_PPC && defined(__ALTIVEC__) ! if(GetSIMDCapabilities()&simd_altivec && IsVectorAligned(dst)) { ! vector float svec = LoadValue(s); ! int n = cnt>>4; ! cnt -= n<<4; ! ! while(n--) { ! vec_st(svec,0,dst); ! vec_st(svec,16,dst); ! vec_st(svec,32,dst); ! vec_st(svec,48,dst); ! dst += 16; ! } ! ! while(cnt--) *(dst++) = s; ! } else #endif --- 714,719 ---- else #elif FLEXT_CPU == FLEXT_CPU_PPC && defined(__ALTIVEC__) ! if(GetSIMDCapabilities()&simd_altivec && IsVectorAligned(dst)) ! SetAltivec(dst,cnt,s); else #endif *************** *** 699,727 **** else #elif FLEXT_CPU == FLEXT_CPU_PPC && defined(__ALTIVEC__) ! if(GetSIMDCapabilities()&simd_altivec && IsVectorAligned(src) && IsVectorAligned(dst)) { ! const vector float arg = LoadValue(op); ! const vector float zero = (vector float)(0); ! int n = cnt>>4; ! cnt -= n<<4; ! ! for(; n--; src += 16,dst += 16) { ! vector float a1 = vec_ld( 0,src); ! vector float a2 = vec_ld(16,src); ! vector float a3 = vec_ld(32,src); ! vector float a4 = vec_ld(48,src); ! ! a1 = vec_madd(a1,arg,zero); ! a2 = vec_madd(a2,arg,zero); ! a3 = vec_madd(a3,arg,zero); ! a4 = vec_madd(a4,arg,zero); ! ! vec_st(a1, 0,dst); ! vec_st(a2,16,dst); ! vec_st(a3,32,dst); ! vec_st(a4,48,dst); ! } ! ! while(cnt--) *(dst++) = *(src++)*op; ! } else #endif // _MSC_VER --- 836,841 ---- else #elif FLEXT_CPU == FLEXT_CPU_PPC && defined(__ALTIVEC__) ! if(GetSIMDCapabilities()&simd_altivec && IsVectorAligned(src) && IsVectorAligned(dst)) ! MulAltivec(dst,src,op,cnt); else #endif // _MSC_VER *************** *** 949,975 **** else #elif FLEXT_CPU == FLEXT_CPU_PPC && defined(__ALTIVEC__) ! if(GetSIMDCapabilities()&simd_altivec && IsVectorAligned(src) && IsVectorAligned(op) && IsVectorAligned(dst)) { ! const vector float zero = (vector float)(0); ! int n = cnt>>4; ! cnt -= n<<4; ! ! for(; n--; src += 16,op += 16,dst += 16) { ! vector float a1 = vec_ld( 0,src),b1 = vec_ld( 0,op); ! vector float a2 = vec_ld(16,src),b2 = vec_ld(16,op); ! vector float a3 = vec_ld(32,src),b3 = vec_ld(32,op); ! vector float a4 = vec_ld(48,src),b4 = vec_ld(48,op); ! ! a1 = vec_madd(a1,b1,zero); ! a2 = vec_madd(a2,b2,zero); ! a3 = vec_madd(a3,b3,zero); ! a4 = vec_madd(a4,b4,zero); ! ! vec_st(a1, 0,dst); ! vec_st(a2,16,dst); ! vec_st(a3,32,dst); ! vec_st(a4,48,dst); ! } ! while(cnt--) *(dst++) = *(src++) * *(op++); ! } else #endif // _MSC_VER --- 1063,1068 ---- else #elif FLEXT_CPU == FLEXT_CPU_PPC && defined(__ALTIVEC__) ! if(GetSIMDCapabilities()&simd_altivec && IsVectorAligned(src) && IsVectorAligned(op) && IsVectorAligned(dst)) ! MulAltivec(dst,src,op,cnt); else #endif // _MSC_VER *************** *** 1100,1127 **** else #elif FLEXT_CPU == FLEXT_CPU_PPC && defined(__ALTIVEC__) ! if(GetSIMDCapabilities()&simd_altivec && IsVectorAligned(src) && IsVectorAligned(dst)) { ! const vector float arg = LoadValue(op); ! int n = cnt>>4; ! cnt -= n<<4; ! ! for(; n--; src += 16,dst += 16) { ! vector float a1 = vec_ld( 0,src); ! vector float a2 = vec_ld(16,src); ! vector float a3 = vec_ld(32,src); ! vector float a4 = vec_ld(48,src); ! ! a1 = vec_add(a1,arg); ! a2 = vec_add(a2,arg); ! a3 = vec_add(a3,arg); ! a4 = vec_add(a4,arg); ! ! vec_st(a1, 0,dst); ! vec_st(a2,16,dst); ! vec_st(a3,32,dst); ! vec_st(a4,48,dst); ! } ! ! while(cnt--) *(dst++) = *(src++)+op; ! } else #endif // _MSC_VER --- 1193,1198 ---- else #elif FLEXT_CPU == FLEXT_CPU_PPC && defined(__ALTIVEC__) ! if(GetSIMDCapabilities()&simd_altivec && IsVectorAligned(src) && IsVectorAligned(dst)) ! AddAltivec(dst,src,op,cnt); else #endif // _MSC_VER *************** *** 1350,1375 **** else #elif FLEXT_CPU == FLEXT_CPU_PPC && defined(__ALTIVEC__) ! if(GetSIMDCapabilities()&simd_altivec && IsVectorAligned(src) && IsVectorAligned(op) && IsVectorAligned(dst)) { ! int n = cnt>>4; ! cnt -= n<<4; ! ! for(; n--; src += 16,op += 16,dst += 16) { ! vector float a1 = vec_ld( 0,src),b1 = vec_ld( 0,op); ! vector float a2 = vec_ld(16,src),b2 = vec_ld(16,op); ! vector float a3 = vec_ld(32,src),b3 = vec_ld(32,op); ! vector float a4 = vec_ld(48,src),b4 = vec_ld(48,op); ! ! a1 = vec_add(a1,b1); ! a2 = vec_add(a2,b2); ! a3 = vec_add(a3,b3); ! a4 = vec_add(a4,b4); ! ! vec_st(a1, 0,dst); ! vec_st(a2,16,dst); ! vec_st(a3,32,dst); ! vec_st(a4,48,dst); ! } ! while(cnt--) *(dst++) = *(src++) + *(op++); ! } else #endif // _MSC_VER --- 1421,1426 ---- else #elif FLEXT_CPU == FLEXT_CPU_PPC && defined(__ALTIVEC__) ! if(GetSIMDCapabilities()&simd_altivec && IsVectorAligned(src) && IsVectorAligned(op) && IsVectorAligned(dst)) ! AddAltivec(dst,src,op,cnt); else #endif // _MSC_VER *************** *** 1512,1540 **** else #elif FLEXT_CPU == FLEXT_CPU_PPC && defined(__ALTIVEC__) ! if(GetSIMDCapabilities()&simd_altivec && IsVectorAligned(src) && IsVectorAligned(dst)) { ! const vector float argmul = LoadValue(opmul); ! const vector float argadd = LoadValue(opadd); ! int n = cnt>>4; ! cnt -= n<<4; ! ! for(; n--; src += 16,dst += 16) { ! vector float a1 = vec_ld( 0,src); ! vector float a2 = vec_ld(16,src); ! vector float a3 = vec_ld(32,src); ! vector float a4 = vec_ld(48,src); ! ! a1 = vec_madd(a1,argmul,argadd); ! a2 = vec_madd(a2,argmul,argadd); ! a3 = vec_madd(a3,argmul,argadd); ! a4 = vec_madd(a4,argmul,argadd); ! ! vec_st(a1, 0,dst); ! vec_st(a2,16,dst); ! vec_st(a3,32,dst); ! vec_st(a4,48,dst); ! } ! ! while(cnt--) *(dst++) = *(src++)*opmul+opadd; ! } else #endif // _MSC_VER --- 1563,1568 ---- else #elif FLEXT_CPU == FLEXT_CPU_PPC && defined(__ALTIVEC__) ! if(GetSIMDCapabilities()&simd_altivec && IsVectorAligned(src) && IsVectorAligned(dst)) ! ScaleAltivec(dst,src,opmul,opadd,cnt); else #endif // _MSC_VER
[View Less]
1
0
0
0
pd/src g_all_guis.c,1.1.1.4.2.4.2.13,1.1.1.4.2.4.2.14 g_array.c,1.1.1.3.2.2.2.3,1.1.1.3.2.2.2.4 g_bang.c,1.1.1.3.2.2.2.10,1.1.1.3.2.2.2.11 g_canvas.c,1.1.1.4.2.7.2.9,1.1.1.4.2.7.2.10 g_editor.c,1.1.1.4.2.3.2.8,1.1.1.4.2.3.2.9 g_hslider.c,1.1.1.3.2.2.2.10,1.1.1.3.2.2.2.11 g_io.c,1.1.1.1.16.2.2.3,1.1.1.1.16.2.2.4 g_mycanvas.c,1.1.1.3.2.2.2.3,1.1.1.3.2.2.2.4 g_readwrite.c,1.1.1.3.2.1,1.1.1.3.2.1.2.1 g_text.c,1.1.1.4.2.2.2.7,1.1.1.4.2.2.2.8
by Mathieu Bouchard
02 Apr '04
02 Apr '04
Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14853 Modified Files: Tag: impd_0_37 g_all_guis.c g_array.c g_bang.c g_canvas.c g_editor.c g_hslider.c g_io.c g_mycanvas.c g_readwrite.c g_text.c Log Message: a bit more ansi-conformant + less warnings Index: g_array.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_array.c,v retrieving revision 1.1.1.3.2.2.2.3 retrieving revision 1.1.1.
…
[View More]
3.2.2.2.4 diff -C2 -d -r1.1.1.3.2.2.2.3 -r1.1.1.3.2.2.2.4 *** g_array.c 1 Apr 2004 23:22:01 -0000 1.1.1.3.2.2.2.3 --- g_array.c 2 Apr 2004 00:16:42 -0000 1.1.1.3.2.2.2.4 *************** *** 10,13 **** --- 10,16 ---- #include <math.h> + /* fabsf is ISO C 1999 actually */ + /* #define fabsf(x) ((float)fabs(x)) */ + /* see also the "plot" object in g_scalar.c which deals with graphing arrays which are fields in scalars. Someday we should unify the Index: g_text.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_text.c,v retrieving revision 1.1.1.4.2.2.2.7 retrieving revision 1.1.1.4.2.2.2.8 diff -C2 -d -r1.1.1.4.2.2.2.7 -r1.1.1.4.2.2.2.8 *** g_text.c 1 Apr 2004 23:22:02 -0000 1.1.1.4.2.2.2.7 --- g_text.c 2 Apr 2004 00:16:43 -0000 1.1.1.4.2.2.2.8 *************** *** 817,821 **** return "objectbox"; } ! // case T_OBJECT: return "objectbox"; case T_MESSAGE: return "message"; case T_ATOM: return "atom"; --- 817,821 ---- return "objectbox"; } ! /* case T_OBJECT: return "objectbox"; */ case T_MESSAGE: return "message"; case T_ATOM: return "atom"; Index: g_readwrite.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_readwrite.c,v retrieving revision 1.1.1.3.2.1 retrieving revision 1.1.1.3.2.1.2.1 diff -C2 -d -r1.1.1.3.2.1 -r1.1.1.3.2.1.2.1 *** g_readwrite.c 23 Sep 2003 00:44:54 -0000 1.1.1.3.2.1 --- g_readwrite.c 2 Apr 2004 00:16:43 -0000 1.1.1.3.2.1.2.1 *************** *** 20,24 **** int *p_next) { ! int i, j; int indexwas = *p_next; *p_indexout = indexwas; --- 20,24 ---- int *p_next) { ! int i; int indexwas = *p_next; *p_indexout = indexwas; *************** *** 50,54 **** int *p_nextmsg, t_symbol *templatesym, t_word *w, int argc, t_atom *argv) { ! int message, nline, n, i; t_template *template = template_findbyname(templatesym); --- 50,54 ---- int *p_nextmsg, t_symbol *templatesym, t_word *w, int argc, t_atom *argv) { ! int message, n, i; t_template *template = template_findbyname(templatesym); *************** *** 65,69 **** if (template->t_vec[i].ds_type == DT_ARRAY) { - int j; t_array *a = w[i].w_array; int elemsize = a->a_elemsize, nitems = 0; --- 65,68 ---- *************** *** 105,109 **** int *p_nextmsg, int selectit) { ! int message, i, j, nline; t_template *template; t_symbol *templatesym; --- 104,108 ---- int *p_nextmsg, int selectit) { ! int message, nline; t_template *template; t_symbol *templatesym; *************** *** 160,173 **** void glist_readfrombinbuf(t_glist *x, t_binbuf *b, char *filename, int selectem) { ! t_canvas *canvas = glist_getcanvas(x); ! int cr = 0, natoms, nline, message, nextmsg = 0, i, j, nitems; t_atom *vec; - t_gobj *gobj; - natoms = binbuf_getnatom(b); vec = binbuf_getvec(b); ! ! ! /* check for file type */ nline = canvas_scanbinbuf(natoms, vec, &message, &nextmsg); if (nline != 1 && vec[message].a_type != A_SYMBOL && --- 159,167 ---- void glist_readfrombinbuf(t_glist *x, t_binbuf *b, char *filename, int selectem) { ! int natoms, nline, message, nextmsg = 0; t_atom *vec; natoms = binbuf_getnatom(b); vec = binbuf_getvec(b); ! /* check for file type */ nline = canvas_scanbinbuf(natoms, vec, &message, &nextmsg); if (nline != 1 && vec[message].a_type != A_SYMBOL && *************** *** 245,250 **** t_canvas *canvas = glist_getcanvas(x); int wasvis = glist_isvisible(canvas); ! int cr = 0, natoms, nline, message, nextmsg = 0, i, j; ! t_atom *vec; if (!strcmp(format->s_name, "cr")) --- 239,243 ---- t_canvas *canvas = glist_getcanvas(x); int wasvis = glist_isvisible(canvas); ! int cr = 0; if (!strcmp(format->s_name, "cr")) *************** *** 361,365 **** int amarrayelement) { - t_dataslot *ds; t_template *template = template_findbyname(templatesym); t_atom *a = (t_atom *)t_getbytes(0); --- 354,357 ---- *************** *** 533,542 **** static void glist_write(t_glist *x, t_symbol *filename, t_symbol *format) { ! int cr = 0, i; t_binbuf *b; char buf[MAXPDSTRING]; ! t_symbol **templatevec = getbytes(0); ! int ntemplates = 0; ! t_gobj *y; t_canvas *canvas = glist_getcanvas(x); canvas_makefilename(canvas, filename->s_name, buf, MAXPDSTRING); --- 525,532 ---- static void glist_write(t_glist *x, t_symbol *filename, t_symbol *format) { ! int cr = 0; t_binbuf *b; char buf[MAXPDSTRING]; ! /*t_symbol **templatevec = getbytes(0);*/ t_canvas *canvas = glist_getcanvas(x); canvas_makefilename(canvas, filename->s_name, buf, MAXPDSTRING); *************** *** 630,634 **** t_symbol **templatevec = getbytes(0); int i, ntemplates = 0; - t_gobj *y; canvas_collecttemplatesfor(x, &ntemplates, &templatevec, wholething); for (i = 0; i < ntemplates; i++) --- 620,623 ---- Index: g_io.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_io.c,v retrieving revision 1.1.1.1.16.2.2.3 retrieving revision 1.1.1.1.16.2.2.4 diff -C2 -d -r1.1.1.1.16.2.2.3 -r1.1.1.1.16.2.2.4 *** g_io.c 1 Apr 2004 23:22:01 -0000 1.1.1.1.16.2.2.3 --- g_io.c 2 Apr 2004 00:16:43 -0000 1.1.1.1.16.2.2.4 *************** *** 97,101 **** } ! //static int tot; t_int *vinlet_perform(t_int *w) --- 97,101 ---- } ! /*static int tot;*/ t_int *vinlet_perform(t_int *w) *************** *** 234,238 **** } - //static void *vinlet_newsig(void) static void *vinlet_newsig(t_symbol *s) { --- 234,237 ---- *************** *** 393,397 **** { t_voutlet *x = (t_voutlet *)(w[1]); ! // t_float *dummy = (t_float *)(w[2]); int n = (int)(w[2]); t_float *in = x->x_empty; --- 392,396 ---- { t_voutlet *x = (t_voutlet *)(w[1]); ! /* t_float *dummy (t_float *)(w[2]); */ int n = (int)(w[2]); t_float *in = x->x_empty; *************** *** 477,486 **** re_parentvecsize = 1; } ! // bigperiod = (downsample * myvecsize)/(upsample * parentvecsize); /* IOhannes */ bigperiod = myvecsize/re_parentvecsize; /* IOhannes */ if (!bigperiod) bigperiod = 1; epilogphase = phase & (bigperiod - 1); blockphase = (phase + period - 1) & (bigperiod - 1) & (- period); ! // bufsize = parentvecsize * upsample; /* IOhannes */ bufsize = re_parentvecsize; /* IOhannes */ if (bufsize < myvecsize) bufsize = myvecsize; --- 476,485 ---- re_parentvecsize = 1; } ! /*bigperiod = (downsample * myvecsize)/(upsample * parentvecsize); IOhannes */ bigperiod = myvecsize/re_parentvecsize; /* IOhannes */ if (!bigperiod) bigperiod = 1; epilogphase = phase & (bigperiod - 1); blockphase = (phase + period - 1) & (bigperiod - 1) & (- period); ! /*bufsize = parentvecsize * upsample; IOhannes */ bufsize = re_parentvecsize; /* IOhannes */ if (bufsize < myvecsize) bufsize = myvecsize; Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.1.1.4.2.4.2.13 retrieving revision 1.1.1.4.2.4.2.14 diff -C2 -d -r1.1.1.4.2.4.2.13 -r1.1.1.4.2.4.2.14 *** g_all_guis.c 30 Mar 2004 01:54:08 -0000 1.1.1.4.2.4.2.13 --- g_all_guis.c 2 Apr 2004 00:16:42 -0000 1.1.1.4.2.4.2.14 *************** *** 604,608 **** break1: for (i=0; i<argc; i++) { ! //fprintf(stderr,"i=%d fmt[i]=%c\n",i,fmt[i]); switch (fmt[i]) { case '*': case ';': goto break2; --- 604,608 ---- break1: for (i=0; i<argc; i++) { ! /*fprintf(stderr,"i=%d fmt[i]=%c\n",i,fmt[i]);*/ switch (fmt[i]) { case '*': case ';': goto break2; *************** *** 611,630 **** double *p = va_arg(val,double*); *p = atom_getfloatarg(i,argc,argv); ! //fprintf(stderr," getting double*=0x%08x, *=%f\n",p,*p); } break; case 'f': { float *p = va_arg(val,float*); *p = atom_getfloatarg(i,argc,argv); ! //fprintf(stderr," getting float*=0x%08x, *=%f\n",p,*p); } break; case 'i': { int *p = va_arg(val, int*); *p = atom_getintarg(i,argc,argv); ! //fprintf(stderr," getting int*=0x%08x, *=%d\n",p,*p); } break; case 's': { t_symbol **p = va_arg(val,t_symbol**); *p = atom_getsymbolarg(i,argc,argv); ! //fprintf(stderr," getting t_symbol**=0x%08x, *=%s\n",p, (*p)->s_name); } break; case 'a': { --- 611,630 ---- double *p = va_arg(val,double*); *p = atom_getfloatarg(i,argc,argv); ! /*fprintf(stderr," getting double*=0x%08x, *=%f\n",p,*p);*/ } break; case 'f': { float *p = va_arg(val,float*); *p = atom_getfloatarg(i,argc,argv); ! /*fprintf(stderr," getting float*=0x%08x, *=%f\n",p,*p);*/ } break; case 'i': { int *p = va_arg(val, int*); *p = atom_getintarg(i,argc,argv); ! /*fprintf(stderr," getting int*=0x%08x, *=%d\n",p,*p);*/ } break; case 's': { t_symbol **p = va_arg(val,t_symbol**); *p = atom_getsymbolarg(i,argc,argv); ! /*fprintf(stderr," getting t_symbol**=0x%08x, *=%s\n",p, (*p)->s_name);*/ } break; case 'a': { *************** *** 646,650 **** return 1; err: ! //post("WARNING: pd_scanargs failed; fmt=%s, i=%d",fmt,i); return 0; } --- 646,650 ---- return 1; err: ! /*post("WARNING: pd_scanargs failed; fmt=%s, i=%d",fmt,i);*/ return 0; } Index: g_mycanvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_mycanvas.c,v retrieving revision 1.1.1.3.2.2.2.3 retrieving revision 1.1.1.3.2.2.2.4 diff -C2 -d -r1.1.1.3.2.2.2.3 -r1.1.1.3.2.2.2.4 *** g_mycanvas.c 30 Mar 2004 01:35:09 -0000 1.1.1.3.2.2.2.3 --- g_mycanvas.c 2 Apr 2004 00:16:43 -0000 1.1.1.3.2.2.2.4 *************** *** 182,186 **** int w = (int)atom_getintarg(2, argc, argv); int h = (int)atom_getintarg(3, argc, argv); ! int sr_flags = iemgui_dialog(&x->x_gui, srl, argc, argv); x->x_gui.x_isa.x_loadinit = 0; --- 182,186 ---- int w = (int)atom_getintarg(2, argc, argv); int h = (int)atom_getintarg(3, argc, argv); ! /* int sr_flags = */ iemgui_dialog(&x->x_gui, srl, argc, argv); x->x_gui.x_isa.x_loadinit = 0; *************** *** 253,257 **** int bflcol[]={-233017, -1, -66577}; int a=IEM_GUI_DEFAULTSIZE, w=100, h=60; ! int ldx=20, ldy=12, f=2, i=0; int fs=14; --- 253,257 ---- int bflcol[]={-233017, -1, -66577}; int a=IEM_GUI_DEFAULTSIZE, w=100, h=60; ! int ldx=20, ldy=12, i=0; int fs=14; Index: g_editor.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v retrieving revision 1.1.1.4.2.3.2.8 retrieving revision 1.1.1.4.2.3.2.9 diff -C2 -d -r1.1.1.4.2.3.2.8 -r1.1.1.4.2.3.2.9 *** g_editor.c 1 Apr 2004 23:22:01 -0000 1.1.1.4.2.3.2.8 --- g_editor.c 2 Apr 2004 00:16:42 -0000 1.1.1.4.2.3.2.9 *************** *** 885,889 **** t_linetraverser t; t_glist *g = glist_getcanvas(self); ! if (sscanf(linesym->s_name,"l%x",oc)<1) { bug("%s:%d BERSERK!\n",__FILE__,__LINE__); } --- 885,889 ---- t_linetraverser t; t_glist *g = glist_getcanvas(self); ! if (sscanf(linesym->s_name,"l%x",(unsigned*)&oc)<1) { bug("%s:%d BERSERK!\n",__FILE__,__LINE__); } *************** *** 905,909 **** post("canvas_click_on_wire: 0x%08x %s %f %f %f %f", (unsigned)self, linesym->s_name, x, y, b, f); ! //post("shiftmod=%d runmode=%d altmod=%d rightclick=%d b=%f f=%f",shiftmod,runmode,altmod,rightclick,b,f); if (!runmode && !altmod && !shiftmod && !rightclick) { t_outconnect *oc; --- 905,909 ---- post("canvas_click_on_wire: 0x%08x %s %f %f %f %f", (unsigned)self, linesym->s_name, x, y, b, f); ! /*post("shiftmod=%d runmode=%d altmod=%d rightclick=%d b=%f f=%f",shiftmod,runmode,altmod,rightclick,b,f);*/ if (!runmode && !altmod && !shiftmod && !rightclick) { t_outconnect *oc; *************** *** 924,928 **** post("canvas_click_on_object: 0x%08x %s %f %f %f %f", (unsigned)self, linesym->s_name, x, y, b, f); ! //post("shiftmod=%d runmode=%d altmod=%d rightclick=%d b=%f f=%f",shiftmod,runmode,altmod,rightclick,b,f); if (!runmode && !altmod && !shiftmod && !rightclick) { } --- 924,928 ---- post("canvas_click_on_object: 0x%08x %s %f %f %f %f", (unsigned)self, linesym->s_name, x, y, b, f); ! /*post("shiftmod=%d runmode=%d altmod=%d rightclick=%d b=%f f=%f",shiftmod,runmode,altmod,rightclick,b,f);*/ if (!runmode && !altmod && !shiftmod && !rightclick) { } *************** *** 1055,1059 **** t_rtext *rt; /* check if the box is being text edited */ ! nooutletafterall: if (ob && (rt = x->gl_editor->e_textedfor) && rt == glist_findrtext(x, ob)) --- 1055,1059 ---- t_rtext *rt; /* check if the box is being text edited */ ! /* nooutletafterall:*/ if (ob && (rt = x->gl_editor->e_textedfor) && rt == glist_findrtext(x, ob)) Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.1.1.3.2.2.2.10 retrieving revision 1.1.1.3.2.2.2.11 diff -C2 -d -r1.1.1.3.2.2.2.10 -r1.1.1.3.2.2.2.11 *** g_hslider.c 30 Mar 2004 01:35:09 -0000 1.1.1.3.2.2.2.10 --- g_hslider.c 2 Apr 2004 00:16:43 -0000 1.1.1.3.2.2.2.11 *************** *** 376,385 **** iem_inttofstyle(&x->x_gui.x_fsf, 0); ! //post("vslider before min=%f max=%f &min=%08x &max=%08x",min,max,&min,&max); if(pd_scanargs(argc,argv,"iiddiiaaaiiiiiiii;?", &w,&h,&min,&max,&lilo,&isa,&srl[0],&srl[1],&srl[2], &ldx,&ldy,&fstyle,&fs,&bflcol[0],&bflcol[1],&bflcol[2],&v)) { ! //post("vslider after min=%f max=%f",min,max); iem_inttosymargs(&x->x_gui.x_isa, isa); iemgui_new_getnames2(&x->x_gui, 6, srl[0], srl[1], srl[2]); --- 376,385 ---- iem_inttofstyle(&x->x_gui.x_fsf, 0); ! /*post("vslider before min=%f max=%f &min=%08x &max=%08x",min,max,&min,&max);*/ if(pd_scanargs(argc,argv,"iiddiiaaaiiiiiiii;?", &w,&h,&min,&max,&lilo,&isa,&srl[0],&srl[1],&srl[2], &ldx,&ldy,&fstyle,&fs,&bflcol[0],&bflcol[1],&bflcol[2],&v)) { ! /*post("vslider after min=%f max=%f",min,max);*/ iem_inttosymargs(&x->x_gui.x_isa, isa); iemgui_new_getnames2(&x->x_gui, 6, srl[0], srl[1], srl[2]); Index: g_canvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v retrieving revision 1.1.1.4.2.7.2.9 retrieving revision 1.1.1.4.2.7.2.10 diff -C2 -d -r1.1.1.4.2.7.2.9 -r1.1.1.4.2.7.2.10 *** g_canvas.c 1 Apr 2004 23:22:01 -0000 1.1.1.4.2.7.2.9 --- g_canvas.c 2 Apr 2004 00:16:42 -0000 1.1.1.4.2.7.2.10 *************** *** 1322,1326 **** DECL(canvas_symbolatom) DECL(glist_scalar) ! //DECL(canvas_guiext) void canvas_click_on_object(t_canvas *self, t_symbol linesym, --- 1322,1326 ---- DECL(canvas_symbolatom) DECL(glist_scalar) ! /*DECL(canvas_guiext)*/ void canvas_click_on_object(t_canvas *self, t_symbol linesym, *************** *** 1367,1371 **** DEF(canvas_mycnv,"mycnv"); DEF(canvas_numbox,"numbox"); ! // DEF(canvas_guiext,"guiext"); /* ------------------------ gui stuff --------------------------- */ --- 1367,1371 ---- DEF(canvas_mycnv,"mycnv"); DEF(canvas_numbox,"numbox"); ! /* DEF(canvas_guiext,"guiext");*/ /* ------------------------ gui stuff --------------------------- */ Index: g_bang.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.1.1.3.2.2.2.10 retrieving revision 1.1.1.3.2.2.2.11 diff -C2 -d -r1.1.1.3.2.2.2.10 -r1.1.1.3.2.2.2.11 *** g_bang.c 30 Mar 2004 01:35:09 -0000 1.1.1.3.2.2.2.10 --- g_bang.c 2 Apr 2004 00:16:42 -0000 1.1.1.3.2.2.2.11 *************** *** 144,148 **** int fthold = (int)atom_getintarg(2, argc, argv); int ftbreak = (int)atom_getintarg(3, argc, argv); ! int sr_flags = iemgui_dialog(&x->x_gui, srl, argc, argv); x->x_gui.x_h = x->x_gui.x_w = iemgui_clip_size(a); bng_check_minmax(x, ftbreak, fthold); --- 144,148 ---- int fthold = (int)atom_getintarg(2, argc, argv); int ftbreak = (int)atom_getintarg(3, argc, argv); ! /* int sr_flags = */ iemgui_dialog(&x->x_gui, srl, argc, argv); x->x_gui.x_h = x->x_gui.x_w = iemgui_clip_size(a); bng_check_minmax(x, ftbreak, fthold);
[View Less]
1
0
0
0
pd/src s_inter.c,1.1.1.3.2.9.2.2,1.1.1.3.2.9.2.3
by carmen rocco
02 Apr '04
02 Apr '04
Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9041 Modified Files: Tag: impd_0_37 s_inter.c Log Message: look for wish anywhere in PATH Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.1.1.3.2.9.2.2 retrieving revision 1.1.1.3.2.9.2.3 diff -C2 -d -r1.1.1.3.2.9.2.2 -r1.1.1.3.2.9.2.3 *** s_inter.c 30 Mar 2004 01:46:27 -0000 1.1.1.3.2.9.2.
…
[View More]
2 --- s_inter.c 1 Apr 2004 23:42:44 -0000 1.1.1.3.2.9.2.3 *************** *** 634,638 **** { #ifdef MSW ! char scriptbuf[MAXPDSTRING+30], wishbuf[MAXPDSTRING+30], portbuf[80]; int spawnret; --- 634,638 ---- { #ifdef MSW ! char scriptbuf[MAXPDSTRING+30], portbuf[80]; int spawnret; *************** *** 764,793 **** #endif /* UNIX */ ! #ifdef MSW ! /* in MSW land "guipath" is unused; we just do everything from ! the libdir. */ ! fprintf(stderr, "%s\n", sys_libdir->s_name); ! strcpy(scriptbuf, "\""); strcat(scriptbuf, sys_libdir->s_name); strcat(scriptbuf, "/" PDBINDIR "pd.tk\""); sys_bashfilename(scriptbuf, scriptbuf); ! ! sprintf(portbuf, "%d", portno); ! strcpy(wishbuf, sys_libdir->s_name); ! strcat(wishbuf, "/" PDBINDIR WISHAPP); ! sys_bashfilename(wishbuf, wishbuf); ! ! spawnret = _spawnl(P_NOWAIT, wishbuf, WISHAPP, scriptbuf, portbuf, 0); if (spawnret < 0) { ! perror("spawnl"); ! fprintf(stderr, "%s: couldn't load TCL\n", wishbuf); exit(1); } - - #endif /* MSW */ } #ifdef __linux__ --- 764,783 ---- #endif /* UNIX */ ! #ifdef MSW strcpy(scriptbuf, "\""); strcat(scriptbuf, sys_libdir->s_name); strcat(scriptbuf, "/" PDBINDIR "pd.tk\""); sys_bashfilename(scriptbuf, scriptbuf); ! sprintf(portbuf, "%d", portno); ! spawnret = _spawnlp(P_NOWAIT, WISHAPP, WISHAPP, scriptbuf, portbuf, 0); if (spawnret < 0) { ! perror(WISHAPP); ! fprintf(stderr, "%s %s %s\n", WISHAPP, scriptbuf, portbuf); exit(1); } } + #endif /* MSW */ #ifdef __linux__
[View Less]
1
0
0
0
pd/src u_main.tk,1.1.1.4.2.7.4.29,1.1.1.4.2.7.4.30 u_object.tk,1.1.2.13,1.1.2.14 g_array.c,1.1.1.3.2.2.2.2,1.1.1.3.2.2.2.3 g_canvas.c,1.1.1.4.2.7.2.8,1.1.1.4.2.7.2.9 g_editor.c,1.1.1.4.2.3.2.7,1.1.1.4.2.3.2.8 g_graph.c,1.1.1.3.2.3.2.5,1.1.1.3.2.3.2.6 g_io.c,1.1.1.1.16.2.2.2,1.1.1.1.16.2.2.3 g_rtext.c,1.1.1.2.2.6.2.5,1.1.1.2.2.6.2.6 g_scalar.c,1.1.1.2.2.2,1.1.1.2.2.2.2.1 g_template.c,1.1.1.3.2.2,1.1.1.3.2.2.2.1 g_text.c,1.1.1.4.2.2.2.6,1.1.1.4.2.2.2.7 g_traversal.c,1.1.1.1,1.1.1.1.18.1
by Mathieu Bouchard
02 Apr '04
02 Apr '04
Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5026 Modified Files: Tag: impd_0_37 u_main.tk u_object.tk g_array.c g_canvas.c g_editor.c g_graph.c g_io.c g_rtext.c g_scalar.c g_template.c g_text.c g_traversal.c Log Message: removing a few bugs and warnings Index: g_traversal.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_traversal.c,v retrieving revision 1.1.1.1 retrieving
…
[View More]
revision 1.1.1.1.18.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.18.1 *** g_traversal.c 29 Jul 2002 17:05:58 -0000 1.1.1.1 --- g_traversal.c 1 Apr 2004 23:22:02 -0000 1.1.1.1.18.1 *************** *** 286,293 **** static void ptrobj_sendwindow(t_ptrobj *x, t_symbol *s, int argc, t_atom *argv) { - t_scalar *sc; - t_symbol *templatesym; - int n; - t_typedout *to; t_glist *glist; t_pd *canvas; --- 286,289 ---- *************** *** 668,672 **** static void getsize_pointer(t_getsize *x, t_gpointer *gp) { ! int nitems, onset, type; t_symbol *templatesym = x->x_templatesym, *fieldsym = x->x_fieldsym, *elemtemplatesym; --- 664,668 ---- static void getsize_pointer(t_getsize *x, t_gpointer *gp) { ! int onset, type; t_symbol *templatesym = x->x_templatesym, *fieldsym = x->x_fieldsym, *elemtemplatesym; *************** *** 674,678 **** t_word *w; t_array *array; - int elemsize; t_gstub *gs = gp->gp_stub; if (!template) --- 670,673 ---- *************** *** 749,753 **** t_template *elemtemplate; t_word *w; - t_atom at; t_array *array; int elemsize; --- 744,747 ---- *************** *** 831,835 **** { char *newelem = ((char *)array->a_vec) + nitems * elemsize; ! int i = 0, nnew = newsize - nitems; while (nnew--) --- 825,829 ---- { char *newelem = ((char *)array->a_vec) + nitems * elemsize; ! int nnew = newsize - nitems; while (nnew--) *************** *** 1024,1029 **** t_template *template = template_findbyname(templatesym); t_gstub *gs = gp->gp_stub; - t_word *vec; - t_getvariable *vp; int onset, type; t_word *w; --- 1018,1021 ---- Index: g_scalar.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_scalar.c,v retrieving revision 1.1.1.2.2.2 retrieving revision 1.1.1.2.2.2.2.1 diff -C2 -d -r1.1.1.2.2.2 -r1.1.1.2.2.2.2.1 *** g_scalar.c 18 Nov 2003 10:34:10 -0000 1.1.1.2.2.2 --- g_scalar.c 1 Apr 2004 23:22:02 -0000 1.1.1.2.2.2.2.1 *************** *** 168,172 **** { t_scalar *x = (t_scalar *)z; - int hit = 0; t_template *template = template_findbyname(x->sc_template); t_canvas *templatecanvas = template_findcanvas(template); --- 168,171 ---- *************** *** 332,337 **** t_scalar *x = (t_scalar *)z; t_binbuf *b2 = binbuf_new(); - t_atom a, *argv; - int i, argc; canvas_writescalar(x->sc_template, x->sc_vec, b2, 0); binbuf_addv(b, "ss", &s__X, gensym("scalar")); --- 331,334 ---- *************** *** 374,379 **** static void scalar_free(t_scalar *x) { - int i; - t_dataslot *datatypes, *dt; t_symbol *templatesym = x->sc_template; t_template *template = template_findbyname(templatesym); --- 371,374 ---- Index: g_text.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_text.c,v retrieving revision 1.1.1.4.2.2.2.6 retrieving revision 1.1.1.4.2.2.2.7 diff -C2 -d -r1.1.1.4.2.2.2.6 -r1.1.1.4.2.2.2.7 *** g_text.c 30 Mar 2004 01:35:09 -0000 1.1.1.4.2.2.2.6 --- g_text.c 1 Apr 2004 23:22:02 -0000 1.1.1.4.2.2.2.7 *************** *** 88,92 **** t_text *x; int argc; ! int broken = 0; t_atom *argv; newest = 0; --- 88,92 ---- t_text *x; int argc; ! /* int broken = 0;*/ t_atom *argv; newest = 0; *************** *** 139,143 **** void canvas_obj(t_glist *gl, t_symbol *s, int argc, t_atom *argv) { - t_text *x; if (argc >= 2) { --- 139,142 ---- *************** *** 177,180 **** --- 176,180 ---- } + /* void canvas_guiext(t_glist *gl, t_symbol *guiobjname, int argc, t_atom *argv) { *************** *** 183,186 **** --- 183,187 ---- canvas_iemguis(gl, atom_getsymbol(&argv[0])); } + */ #define CONSTR(name1,name2) \ Index: g_template.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_template.c,v retrieving revision 1.1.1.3.2.2 retrieving revision 1.1.1.3.2.2.2.1 diff -C2 -d -r1.1.1.3.2.2 -r1.1.1.3.2.2.2.1 *** g_template.c 14 Jan 2004 15:50:28 -0000 1.1.1.3.2.2 --- g_template.c 1 Apr 2004 23:22:02 -0000 1.1.1.3.2.2.2.1 *************** *** 141,145 **** int *p_type, t_symbol **p_arraytype) { - t_template *t; int i, n; if (!x) --- 141,144 ---- *************** *** 263,267 **** int *conformaction, t_word *wfrom, t_word *wto) { ! int nfrom = tfrom->t_n, nto = tto->t_n, i; for (i = 0; i < nto; i++) { --- 262,267 ---- int *conformaction, t_word *wfrom, t_word *wto) { ! /*int nfrom = tfrom->t_n; why is this unused ???*/ ! int nto = tto->t_n, i; for (i = 0; i < nto; i++) { *************** *** 283,287 **** t_scalar *x; t_gpointer gp; ! int nto = tto->t_n, nfrom = tfrom->t_n, i; t_template *scalartemplate; /* post("conform scalar"); */ --- 283,288 ---- t_scalar *x; t_gpointer gp; ! /*int nto = tto->t_n, nfrom = tfrom->t_n; unused??? */ ! int i; t_template *scalartemplate; /* post("conform scalar"); */ *************** *** 448,455 **** t_template *template_findbyname(t_symbol *s) { ! int i; ! if (s == &s_float) ! return (&template_float); ! else return ((t_template *)pd_findbyclass(s, template_class)); } --- 449,454 ---- t_template *template_findbyname(t_symbol *s) { ! return s==&s_float ? &template_float : ! (t_template *)pd_findbyclass(s, template_class); } *************** *** 541,545 **** t_template *t = template_findbyname(sym); int i; - t_symbol *sx = gensym("x"); x->x_owner = canvas_getcurrent(); x->x_next = 0; --- 540,543 ---- *************** *** 594,598 **** static void *gtemplate_new(t_symbol *s, int argc, t_atom *argv) { ! t_gtemplate *x = (t_gtemplate *)pd_new(gtemplate_class); t_symbol *sym = atom_getsymbolarg(0, argc, argv); if (argc >= 1) --- 592,596 ---- static void *gtemplate_new(t_symbol *s, int argc, t_atom *argv) { ! /* t_gtemplate *x = (t_gtemplate *)pd_new(gtemplate_class); */ t_symbol *sym = atom_getsymbolarg(0, argc, argv); if (argc >= 1) *************** *** 604,608 **** static void *gtemplate_new_old(t_symbol *s, int argc, t_atom *argv) { ! t_gtemplate *x = (t_gtemplate *)pd_new(gtemplate_class); t_symbol *sym = canvas_makebindsym(canvas_getcurrent()->gl_name); static int warned; --- 602,606 ---- static void *gtemplate_new_old(t_symbol *s, int argc, t_atom *argv) { ! /* t_gtemplate *x = (t_gtemplate *)pd_new(gtemplate_class); */ t_symbol *sym = canvas_makebindsym(canvas_getcurrent()->gl_name); static int warned; *************** *** 849,853 **** static int rangecolor(int n) /* 0 to 9 in 5 steps */ { ! int n2 = n/2; /* 0 to 4 */ int ret = (n << 6); /* 0 to 256 in 5 steps */ if (ret > 255) ret = 255; --- 847,851 ---- static int rangecolor(int n) /* 0 to 9 in 5 steps */ { ! /* int n2 = n/2; 0 to 4 */ int ret = (n << 6); /* 0 to 256 in 5 steps */ if (ret > 255) ret = 255; *************** *** 878,882 **** if (n > 1) { ! int flags = x->x_flags, closed = (flags & CLOSED); float width = fielddesc_getfloat(&x->x_width, template, data, 1); char outline[20], fill[20]; --- 876,881 ---- if (n > 1) { ! int flags = x->x_flags; ! /*int closed = (flags & CLOSED); */ float width = fielddesc_getfloat(&x->x_width, template, data, 1); char outline[20], fill[20]; *************** *** 1061,1066 **** t_plot *x = (t_plot *)pd_new(plot_class); int flags = 0; - int nxy, i; - t_fielddesc *fd; t_symbol *firstarg = atom_getsymbolarg(0, argc, argv); if (!strcmp(firstarg->s_name, "curve")) --- 1060,1063 ---- *************** *** 1133,1137 **** int *xonsetp, int *yonsetp, int *wonsetp) { ! int arrayonset, elemsize, yonset, wonset, xonset, type; t_template *elemtemplate; t_symbol *dummy; --- 1130,1134 ---- int *xonsetp, int *yonsetp, int *wonsetp) { ! int elemsize, yonset, wonset, xonset, type; t_template *elemtemplate; t_symbol *dummy; Index: u_object.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/u_object.tk,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -C2 -d -r1.1.2.13 -r1.1.2.14 *** u_object.tk 30 Mar 2004 01:35:09 -0000 1.1.2.13 --- u_object.tk 1 Apr 2004 23:22:01 -0000 1.1.2.14 *************** *** 419,422 **** --- 419,426 ---- } + proc radio_select {self canvas v} { + bluebox_select $self $canvas $v + } + proc radio_erase {self canvas} { bluebox_erase $self $canvas Index: g_canvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v retrieving revision 1.1.1.4.2.7.2.8 retrieving revision 1.1.1.4.2.7.2.9 diff -C2 -d -r1.1.1.4.2.7.2.8 -r1.1.1.4.2.7.2.9 *** g_canvas.c 30 Mar 2004 04:57:55 -0000 1.1.1.4.2.7.2.8 --- g_canvas.c 1 Apr 2004 23:22:01 -0000 1.1.1.4.2.7.2.9 *************** *** 477,481 **** t_symbol *sym; float x1,y1,x2,y2,px1,py1,px2,py2; ! pd_scanargs(argc,argv,"sffffffff",&x1,&y1,&x2,&y2,&px1,&py1,&px2,&py2); glist_addglist(g, sym, x1, y1, x2, y2, px1, py1, px2, py2); } --- 477,481 ---- t_symbol *sym; float x1,y1,x2,y2,px1,py1,px2,py2; ! pd_scanargs(argc,argv,"sffffffff",&sym,&x1,&y1,&x2,&y2,&px1,&py1,&px2,&py2); glist_addglist(g, sym, x1, y1, x2, y2, px1, py1, px2, py2); } *************** *** 1324,1328 **** //DECL(canvas_guiext) ! void canvas_click_on_wire(t_canvas *self, t_symbol linesym, t_float x, t_float y, t_float b, t_float f); --- 1324,1330 ---- //DECL(canvas_guiext) ! void canvas_click_on_object(t_canvas *self, t_symbol linesym, ! t_float x, t_float y, t_float b, t_float f); ! void canvas_click_on_wire (t_canvas *self, t_symbol linesym, t_float x, t_float y, t_float b, t_float f); *************** *** 1368,1372 **** /* ------------------------ gui stuff --------------------------- */ ! class_addmethod(c, (t_method)canvas_click_on_wire, gensym("click-on-wire"), A_SYMBOL, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_NULL); class_addmethod(c, (t_method)canvas_pop, gensym("pop"), A_DEFFLOAT, A_NULL); --- 1370,1376 ---- /* ------------------------ gui stuff --------------------------- */ ! class_addmethod(c, (t_method)canvas_click_on_object, gensym("click-on-object"), ! A_SYMBOL, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_NULL); ! class_addmethod(c, (t_method)canvas_click_on_wire, gensym("click-on-wire"), A_SYMBOL, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_NULL); class_addmethod(c, (t_method)canvas_pop, gensym("pop"), A_DEFFLOAT, A_NULL); Index: g_array.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_array.c,v retrieving revision 1.1.1.3.2.2.2.2 retrieving revision 1.1.1.3.2.2.2.3 diff -C2 -d -r1.1.1.3.2.2.2.2 -r1.1.1.3.2.2.2.3 *** g_array.c 30 Mar 2004 01:35:09 -0000 1.1.1.3.2.2.2.2 --- g_array.c 1 Apr 2004 23:22:01 -0000 1.1.1.3.2.2.2.3 *************** *** 297,301 **** static int array_motion_npoints; static int array_motion_elemsize; ! static int array_motion_altkey; static float array_motion_initx; static float array_motion_xperpix; --- 297,301 ---- static int array_motion_npoints; static int array_motion_elemsize; ! /*static int array_motion_altkey;*/ static float array_motion_initx; static float array_motion_xperpix; Index: g_graph.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v retrieving revision 1.1.1.3.2.3.2.5 retrieving revision 1.1.1.3.2.3.2.6 diff -C2 -d -r1.1.1.3.2.3.2.5 -r1.1.1.3.2.3.2.6 *** g_graph.c 30 Mar 2004 01:35:09 -0000 1.1.1.3.2.3.2.5 --- g_graph.c 1 Apr 2004 23:22:01 -0000 1.1.1.3.2.3.2.6 *************** *** 11,14 **** --- 11,15 ---- #include "t_tk.h" #include "g_canvas.h" + #include "g_all_guis.h" #include <stdio.h> #include <string.h> Index: g_rtext.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_rtext.c,v retrieving revision 1.1.1.2.2.6.2.5 retrieving revision 1.1.1.2.2.6.2.6 diff -C2 -d -r1.1.1.2.2.6.2.5 -r1.1.1.2.2.6.2.6 *** g_rtext.c 30 Mar 2004 01:35:09 -0000 1.1.1.2.2.6.2.5 --- g_rtext.c 1 Apr 2004 23:22:01 -0000 1.1.1.2.2.6.2.6 *************** *** 366,370 **** { int w = 0, h = 0, indx, i, newsize, ndel; - char *s1, *s2; t_glist *glist = x->x_glist; t_canvas *canvas = glist_getcanvas(glist); --- 366,369 ---- Index: g_io.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_io.c,v retrieving revision 1.1.1.1.16.2.2.2 retrieving revision 1.1.1.1.16.2.2.3 diff -C2 -d -r1.1.1.1.16.2.2.2 -r1.1.1.1.16.2.2.3 *** g_io.c 28 Mar 2004 08:21:42 -0000 1.1.1.1.16.2.2.2 --- g_io.c 1 Apr 2004 23:22:01 -0000 1.1.1.1.16.2.2.3 *************** *** 97,101 **** } ! static int tot; t_int *vinlet_perform(t_int *w) --- 97,101 ---- } ! //static int tot; t_int *vinlet_perform(t_int *w) *************** *** 160,164 **** int switched) { ! t_signal *insig, *outsig; x->x_updown.downsample = downsample; x->x_updown.upsample = upsample; --- 160,164 ---- int switched) { ! t_signal *insig; x->x_updown.downsample = downsample; x->x_updown.upsample = upsample; *************** *** 461,465 **** if (reblock) { ! t_signal *insig, *outsig; int parentvecsize, bufsize, oldbufsize; int re_parentvecsize; /* IOhannes */ --- 461,465 ---- if (reblock) { ! t_signal *outsig; int parentvecsize, bufsize, oldbufsize; int re_parentvecsize; /* IOhannes */ Index: g_editor.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v retrieving revision 1.1.1.4.2.3.2.7 retrieving revision 1.1.1.4.2.3.2.8 diff -C2 -d -r1.1.1.4.2.3.2.7 -r1.1.1.4.2.3.2.8 *** g_editor.c 30 Mar 2004 04:57:55 -0000 1.1.1.4.2.3.2.7 --- g_editor.c 1 Apr 2004 23:22:01 -0000 1.1.1.4.2.3.2.8 *************** *** 898,903 **** void canvas_click_on_wire(t_canvas *self, t_symbol *linesym, t_float x, t_float y, t_float b, t_float f) { - post("canvas_click_on_wire: 0x%08x %s %f %f %f %f", - (unsigned)self, linesym->s_name, x, y, b, f); int mod = (int)f; int shiftmod = mod & SHIFTMOD; --- 898,901 ---- *************** *** 905,908 **** --- 903,908 ---- int altmod = mod & ALTMOD; int rightclick = mod & RIGHTCLICK; + post("canvas_click_on_wire: 0x%08x %s %f %f %f %f", + (unsigned)self, linesym->s_name, x, y, b, f); //post("shiftmod=%d runmode=%d altmod=%d rightclick=%d b=%f f=%f",shiftmod,runmode,altmod,rightclick,b,f); if (!runmode && !altmod && !shiftmod && !rightclick) { *************** *** 915,918 **** --- 915,932 ---- } + void canvas_click_on_object(t_canvas *self, t_symbol *linesym, + t_float x, t_float y, t_float b, t_float f) { + int mod = (int)f; + int shiftmod = mod & SHIFTMOD; + int runmode = (mod & CTRLMOD) || !self->gl_edit; + int altmod = mod & ALTMOD; + int rightclick = mod & RIGHTCLICK; + post("canvas_click_on_object: 0x%08x %s %f %f %f %f", + (unsigned)self, linesym->s_name, x, y, b, f); + //post("shiftmod=%d runmode=%d altmod=%d rightclick=%d b=%f f=%f",shiftmod,runmode,altmod,rightclick,b,f); + if (!runmode && !altmod && !shiftmod && !rightclick) { + } + } + /* mouse click */ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which, *************** *** 1002,1010 **** else { ! /* look for an outlet */ int noutlet,ninlet; if (ob && (noutlet = obj_noutlets(ob)) && ypos >= y2-4) { ! int width = x2-x1; int nout1 = noutlet>1 ? noutlet-1 : 1; int closest = ((xpos-x1) * nout1 + width/2)/width; --- 1016,1024 ---- else { ! /* make new wire? */ int noutlet,ninlet; if (ob && (noutlet = obj_noutlets(ob)) && ypos >= y2-4) { ! /* int width = x2-x1; int nout1 = noutlet>1 ? noutlet-1 : 1; int closest = ((xpos-x1) * nout1 + width/2)/width; *************** *** 1018,1023 **** x->gl_editor->e_xwas = xpos; x->gl_editor->e_ywas = ypos; ! sys_vgui( ! "wire_draw x .x%x.c %d %d %d %d %d\n", x, (issignal ? 2 : 1), xpos, ypos, xpos, ypos); } --- 1032,1036 ---- x->gl_editor->e_xwas = xpos; x->gl_editor->e_ywas = ypos; ! sys_vgui("wire_draw x .x%x.c %d %d %d %d %d\n", x, (issignal ? 2 : 1), xpos, ypos, xpos, ypos); } *************** *** 1025,1030 **** } else if (doit) goto nooutletafterall; ! } ! /* look for an inlet */ else if (ob && (ninlet = obj_ninlets(ob)) && ypos <= y1+4) { --- 1038,1044 ---- } else if (doit) goto nooutletafterall; ! */ ! } ! /* look for an inlet */ else if (ob && (ninlet = obj_ninlets(ob)) && ypos <= y1+4) { Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.29 retrieving revision 1.1.1.4.2.7.4.30 diff -C2 -d -r1.1.1.4.2.7.4.29 -r1.1.1.4.2.7.4.30 *** u_main.tk 30 Mar 2004 06:20:06 -0000 1.1.1.4.2.7.4.29 --- u_main.tk 1 Apr 2004 23:22:01 -0000 1.1.1.4.2.7.4.30 *************** *** 464,471 **** set pd_undoaction $undoaction set pd_redoaction $redoaction ! if {$name != "nobody"} { ! # unpleasant way of avoiding a more unpleasant bug situation --atl 2002.11.25 ! menu_fixeditmenu $name ! } } --- 464,468 ---- set pd_undoaction $undoaction set pd_redoaction $redoaction ! if {$name != "nobody"} {menu_fixeditmenu $name} } *************** *** 496,500 **** proc find_apply {name} { global find_string find_canvas ! regsub -all \; $find_string " _semi_ " find_string2 regsub -all \, $find_string2 " _comma_ " find_string3 pd "$find_canvas find $find_string3 ;" --- 493,497 ---- proc find_apply {name} { global find_string find_canvas ! regsub -all \; $find_string " _semi_ " find_string2 regsub -all \, $find_string2 " _comma_ " find_string3 pd "$find_canvas find $find_string3 ;" *************** *** 543,547 **** return } ! $self.stat.what configure -text "..." } --- 540,544 ---- return } ! $self.stat.what configure -text "... $tags" } *************** *** 787,794 **** set tags [$canvas gettags [lindex $stack end]] puts stderr "(click) $canvas $x $y $b $f : $tags " ! if {[regexp {^([a-f0-9]{7})} $tags tag]} { global _ if {[info exists _($tag:class)]} {set class $_($tag:class)} {set class unknown} puts stderr "(.....) $tag is a \[$class\] object" return } --- 784,792 ---- set tags [$canvas gettags [lindex $stack end]] puts stderr "(click) $canvas $x $y $b $f : $tags " ! if {[regexp {^(?:\.x)?([a-f0-9]{7})} $tags tag]} { global _ if {[info exists _($tag:class)]} {set class $_($tag:class)} {set class unknown} puts stderr "(.....) $tag is a \[$class\] object" + pd "[canvastosym $canvas] click-on-object $tag $x $y $b $f;" return } *************** *** 844,851 **** hide_canvas_tooltip $name if {$pd_nt == 2} { ! if {$key=="BackSpace"} {set key 8; set keynum 8} ! if {$key=="Delete"} {set key 8; set keynum 8} } ! if {$key == "KP_Delete"} {set key 127; set keynum 127} if {$iso != ""} { scan $iso %c keynum --- 842,851 ---- hide_canvas_tooltip $name if {$pd_nt == 2} { ! switch -- $key { ! BackSpace {set key 8; set keynum 8} ! Delete {set key 8; set keynum 8} ! } } ! if {$key == "KP_Delete"} {set key 127; set keynum 127} if {$iso != ""} { scan $iso %c keynum *************** *** 1018,1076 **** global _ foreach {name label type options} $struct { switch -- $type { side { ! frame .$self.$name ! label .$self.$name.label -text $label ! pack .$self.$name.label -side left ! frame .$self.$name.side -relief ridge -borderwidth 2 ! pack .$self.$name.side -side top foreach {i side} {0 left 1 right 2 top 3 bottom} { ! radiobutton .$self.$name.side.$side -value $i \ -variable _($self:$name) -text $side } ! pack .$self.$name.side.left -side left -fill y ! pack .$self.$name.side.right -side right -fill y ! pack .$self.$name.side.top -side top ! pack .$self.$name.side.bottom -side bottom ! pack .$self.$name -side top } color { ! frame .$self.$name ! label .$self.$name.label -text $label # wtf, %6.6x sometimes gives me _8_ chars !?! set c [expr $_($self:$name) & 0xFCFCFC] ! button .$self.$name.color -text " " -width 10 \ -command [list iemgui_choose_col .$self $name $label] \ -relief sunken -background [format #%6.6x $c] \ -highlightbackground [format #%6.6x $c] ! button .$self.$name.preset -text "..." -command [list color_popup $self $name $i] ! pack .$self.$name.label .$self.$name.color .$self.$name.preset -side left ! pack .$self.$name -side top } choice { set i 0 foreach part $label { ! radiobutton .$self.$name$i -text $part -value $i -variable _($self:$name) ! pack .$self.$name$i -side top incr i } } toggle { ! checkbutton .$self.$name -text $label -variable _($self:$name) ! pack .$self.$name -side top } default { ! frame .$self.$name ! label .$self.$name.label -text $label ! pack .$self.$name.label -side left ! eval "entry .$self.$name.entry -textvariable _($self:$name) $options" ! pack .$self.$name.entry -side left ! bind .$self.$name.entry <Return> "$ok .$self" if {[string compare $type "entry"]} { ! label .$self.$name.type -text "($type)" ! pack .$self.$name.type } ! pack .$self.$name -side top } } --- 1018,1077 ---- global _ foreach {name label type options} $struct { + set f .$self.$name switch -- $type { side { ! frame $f ! label $f.label -text $label ! pack $f.label -side left ! frame $f.side -relief ridge -borderwidth 2 ! pack $f.side -side top foreach {i side} {0 left 1 right 2 top 3 bottom} { ! radiobutton $f.side.$side -value $i \ -variable _($self:$name) -text $side } ! pack $f.side.left -side left -fill y ! pack $f.side.right -side right -fill y ! pack $f.side.top -side top ! pack $f.side.bottom -side bottom ! pack $f -side top } color { ! frame $f ! label $f.label -text $label # wtf, %6.6x sometimes gives me _8_ chars !?! set c [expr $_($self:$name) & 0xFCFCFC] ! button $f.color -text " " -width 10 \ -command [list iemgui_choose_col .$self $name $label] \ -relief sunken -background [format #%6.6x $c] \ -highlightbackground [format #%6.6x $c] ! button $f.preset -text "..." -command [list color_popup $self $name $i] ! pack $f.label $f.color $f.preset -side left ! pack $f -side top } choice { set i 0 foreach part $label { ! radiobutton $f$i -text $part -value $i -variable _($self:$name) ! pack $f$i -side top incr i } } toggle { ! checkbutton $f -text $label -variable _($self:$name) ! pack $f -side top } default { ! frame $f ! label $f.label -text $label ! pack $f.label -side left ! eval "entry $f.entry -textvariable _($self:$name) $options" ! pack $f.entry -side left ! bind $f.entry <Return> "$ok .$self" if {[string compare $type "entry"]} { ! label $f.type -text "($type)" ! pack $f.type } ! pack $f -side top } } *************** *** 1971,1975 **** text .log.1 -width 60 -height 10 -yscrollcommand ".log.2 set" scrollbar .log.2 -command ".log.1 yview" ! .log.1 insert end "This is the PureData log\n" pack .log.1 -side left -fill both -expand yes pack .log.2 -side left -fill y -expand no --- 1972,1978 ---- text .log.1 -width 60 -height 10 -yscrollcommand ".log.2 set" scrollbar .log.2 -command ".log.1 yview" ! global tcl_version tk_version pd_myversion ! .log.1 insert end "$pd_myversion" ! .log.1 insert end "Tcl $tcl_version, Tk $tk_version\n" pack .log.1 -side left -fill both -expand yes pack .log.2 -side left -fill y -expand no
[View Less]
1
0
0
0
pd/src makefile,1.5,NONE
by Mathieu Bouchard
02 Apr '04
02 Apr '04
Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32365 Removed Files: Tag: impd_0_37 makefile Log Message: to help you remember to run ./configure actually... --- makefile DELETED ---
1
0
0
0
pd/src u_pdsend.c,1.1.1.3.2.1,1.1.1.3.2.2
by Tim Blechmann
02 Apr '04
02 Apr '04
Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25792 Modified Files: Tag: devel_0_37 u_pdsend.c Log Message: reverted to 1.1.1.3 Index: u_pdsend.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_pdsend.c,v retrieving revision 1.1.1.3.2.1 retrieving revision 1.1.1.3.2.2 diff -C2 -d -r1.1.1.3.2.1 -r1.1.1.3.2.2 *** u_pdsend.c 1 Apr 2004 09:54:58 -0000 1.1.1.3.2.1 --- u_pdsend.c 1 Apr
…
[View More]
2004 22:20:43 -0000 1.1.1.3.2.2 *************** *** 49,63 **** else goto usage; } - - //patch: support for command line messages by tim blechmann - char message[BUFSIZE*10]; //we allow pretty long messages - if (argc == 5) - { - strncpy(message,*(argv+4),strlen(*(argv+4))); - } - if (argc > 5) - goto usage; - //end of patch - else protocol = SOCK_STREAM; #ifdef MSW --- 49,52 ---- *************** *** 112,136 **** } #endif - - //patch: support for command line messages by tim blechmann - if (argc==5) - { - char *bp, nsent, nsend; - nsend = strlen(message); - for (bp = message, nsent = 0; nsent < nsend;) - { - int res = send(sockfd, message, nsend-nsent, 0); - if (res < 0) - { - sockerror("send"); - goto done; - } - nsent += res; - bp += res; - } - } - else - //end of patch - /* now loop reading stdin and sending it to socket */ while (1) --- 101,104 ---- *************** *** 157,166 **** exit (0); usage: ! //usage message adapted to the command line message patch ! fprintf(stderr, ! "usage: pdsend <portnumber> [host] [udp|tcp] [\"message\"]\n"); fprintf(stderr, "(default is localhost and tcp)\n"); - fprintf(stderr, "(if no message is given, pdsend reads from stdin)\n"); - exit(1); } --- 125,130 ---- exit (0); usage: ! fprintf(stderr, "usage: pdsend <portnumber> [host] [udp|tcp]\n"); fprintf(stderr, "(default is localhost and tcp)\n"); exit(1); }
[View Less]
1
0
0
0
pd/src u_pdsend.c,1.1.1.3,1.1.1.3.2.1
by Tim Blechmann
01 Apr '04
01 Apr '04
Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3417 Modified Files: Tag: devel_0_37 u_pdsend.c Log Message: added command line feature to send messages Index: u_pdsend.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_pdsend.c,v retrieving revision 1.1.1.3 retrieving revision 1.1.1.3.2.1 diff -C2 -d -r1.1.1.3 -r1.1.1.3.2.1 *** u_pdsend.c 9 May 2003 16:03:44 -0000 1.1.1.3 --- u_pdsend.
…
[View More]
c 1 Apr 2004 09:54:58 -0000 1.1.1.3.2.1 *************** *** 49,52 **** --- 49,63 ---- else goto usage; } + + //patch: support for command line messages by tim blechmann + char message[BUFSIZE*10]; //we allow pretty long messages + if (argc == 5) + { + strncpy(message,*(argv+4),strlen(*(argv+4))); + } + if (argc > 5) + goto usage; + //end of patch + else protocol = SOCK_STREAM; #ifdef MSW *************** *** 101,104 **** --- 112,136 ---- } #endif + + //patch: support for command line messages by tim blechmann + if (argc==5) + { + char *bp, nsent, nsend; + nsend = strlen(message); + for (bp = message, nsent = 0; nsent < nsend;) + { + int res = send(sockfd, message, nsend-nsent, 0); + if (res < 0) + { + sockerror("send"); + goto done; + } + nsent += res; + bp += res; + } + } + else + //end of patch + /* now loop reading stdin and sending it to socket */ while (1) *************** *** 125,130 **** exit (0); usage: ! fprintf(stderr, "usage: pdsend <portnumber> [host] [udp|tcp]\n"); fprintf(stderr, "(default is localhost and tcp)\n"); exit(1); } --- 157,166 ---- exit (0); usage: ! //usage message adapted to the command line message patch ! fprintf(stderr, ! "usage: pdsend <portnumber> [host] [udp|tcp] [\"message\"]\n"); fprintf(stderr, "(default is localhost and tcp)\n"); + fprintf(stderr, "(if no message is given, pdsend reads from stdin)\n"); + exit(1); }
[View Less]
1
0
0
0
externals/build/win makefile,1.5,1.6 filelist.inc,1.6,NONE makefile.mingw,1.1,NONE
by carmen rocco
01 Apr '04
01 Apr '04
Update of /cvsroot/pure-data/externals/build/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3018 Modified Files: makefile Removed Files: filelist.inc makefile.mingw Log Message: revamped win32 build process...email forthcoming --- filelist.inc DELETED --- Index: makefile =================================================================== RCS file: /cvsroot/pure-data/externals/build/win/makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 ***
…
[View More]
makefile 28 Oct 2003 06:13:33 -0000 1.5 --- makefile 1 Apr 2004 03:03:19 -0000 1.6 *************** *** 1,61 **** ! # ----------------------- NT ----------------------- ! ! EXTERNALS=\ ! #!IF ![f exist filelist.inc del filelist.inc & for %i in (*.c) do @echo %i \>> filelist.inc] ! !INCLUDE filelist.inc ! #!ENDIF ! all: filelist.inc link.stamp $(EXTERNALS:.c=.dll) .SUFFIXES: .dll ! PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo ! VC="C:\Program Files\Microsoft Visual Studio\Vc98" ! OGGPATH="C:\oggvorbis-win32sdk-1.0" ! SRCPATH=..\src ! PDPATH=..\..\..\pd ! ! PDNTINCLUDE = /I. /I.. /I..\..\..\pd\src /I$(VC)\include \ ! /I..\..\creb\include /I$(OGGPATH)/include ! ! PDNTLDIR = $(VC)\lib ! PDNTLIB = $(PDNTLDIR)\libc.lib \ ! $(PDNTLDIR)\oldnames.lib \ ! $(PDNTLDIR)\kernel32.lib \ ! $(PDNTLDIR)\uuid.lib \ ! $(PDNTLDIR)\ws2_32.lib \ ! $(PDPATH)\bin\pthreadVC.lib \ ! $(PDPATH)\bin\pd.lib \ ! $(OGGPATH)\lib\vorbis.lib \ ! $(OGGPATH)\lib\vorbisenc.lib \ ! $(OGGPATH)\lib\vorbisfile.lib \ ! $(OGGPATH)\lib\ogg.lib ! ! .c.dll: ! cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c ! link /dll /export:$(*:~=_tilde)_setup $(*).obj $(PDNTLIB) ! del $*.obj $*.lib $*.exp ! filelist.inc: ! if exist filelist.inc del filelist.inc ! # for %i in ($(SRCPATH)\*.c) do @echo %~ni%~xi \>> filelist.inc ! for %i in ($(SRCPATH)\*.c) do @echo %~ni%~xi \>> filelist.inc ! transfer: ! copy $(SRCPATH)\*.c . ! link.stamp: filelist.inc ! copy $(SRCPATH)\*.c . ! copy /y nul link.stamp ! nmake ! clean: ! # don't delete filelist.inc at the moment, as some externals can't be compiled ! # on win32 ! -del link.stamp ! -del *.c ! -del *.obj ! -del *.lib ! -del *.exp ! -del *.dll --- 1,27 ---- ! prefix=../../.. ! EXTERNALS = $(shell ls ../src) ! all: $(EXTERNALS:.c=.dll) .SUFFIXES: .dll ! CFLAGS = -DPD -DWINDOWS -Wall -W -Wshadow -Wstrict-prototypes \ ! -Wno-unused -Wno-parentheses -Wno-switch ! INCLUDE = -I. -I.. -I../include ! %.dll: ../src/%.c ! $(CC) $(CFLAGS) $(INCLUDE) -o "$*.o" -c "../src/$*.c" ! gcc -shared -o "$*.dll" "$*.o" $(prefix)/bin/pd.dll \ ! `test -f $*.libs && cat $*.libs` ! clean: ! -rm *.a *.def *.dll *.o ! install-doc: ! @test -d $(prefix)/doc/5.reference || mkdir -p $(prefix)/doc/5.reference ! cp -r ../doc/* $(prefix)/doc/5.reference ! install: install-doc ! @test -d $(prefix)/extra || mkdir -p $(prefix)/extra ! install *.dll $(prefix)/extra --- makefile.mingw DELETED ---
[View Less]
1
0
0
0
← Newer
1
...
15
16
17
18
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
Results per page:
10
25
50
100
200