Pd-cvs November 2003

pd-cvs@lists.iem.at

5 participants
91 discussions

externals/grill/guitest flgui.cpp,1.7,1.8
by xovo＠users.sourceforge.net 29 Nov '03

29 Nov '03

Update of /cvsroot/pure-data/externals/grill/guitest In directory sc8-pr-cvs1:/tmp/cvs-serv29348 Modified Files: flgui.cpp Log Message: "" Index: flgui.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/guitest/flgui.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** flgui.cpp 19 Jul 2003 02:41:33 -0000 1.7 --- flgui.cpp 29 Nov 2003 03:41:26 -0000 1.8 *************** *** 512,517 **** --- 512,524 ---- widgetbehavior.w_visfn = sg_vis; widgetbehavior.w_clickfn = sg_click; + + #if PD_MINOR_VERSION >= 37 + class_setpropertiesfn(c,sg_properties); + class_setsavefn(c,sg_save); + #else widgetbehavior.w_propertiesfn = sg_properties; widgetbehavior.w_savefn = sg_save; + #endif + class_setwidget(c, &widgetbehavior); }

1 0

externals/grill/fftease fftease.vcproj,1.2,1.3
by xovo＠users.sourceforge.net 29 Nov '03

29 Nov '03

Update of /cvsroot/pure-data/externals/grill/fftease In directory sc8-pr-cvs1:/tmp/cvs-serv28912 Modified Files: fftease.vcproj Log Message: "" Index: fftease.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/fftease/fftease.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fftease.vcproj 17 Nov 2003 03:41:00 -0000 1.2 --- fftease.vcproj 29 Nov 2003 03:40:32 -0000 1.3 *************** *** 180,183 **** --- 180,184 ---- SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=""F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\release";"F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\release",f:\prog\max\flext\max-msvc" + IgnoreAllDefaultLibraries="TRUE" ProgramDatabaseFile="$(outdir)/fftease.pdb" ImportLibrary="$(outdir)/fftease.lib" *************** *** 541,546 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 542,546 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 577,582 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 577,581 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 613,618 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 612,616 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 649,654 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 647,651 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 685,690 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 682,686 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 721,726 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 717,721 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 757,762 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 752,756 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 793,798 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 787,791 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 829,834 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 822,826 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 865,870 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 857,861 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 901,906 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 892,896 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 937,942 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 927,931 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 973,978 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 962,966 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 1009,1014 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 997,1001 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 1045,1050 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 1032,1036 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 3307,3312 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 3293,3297 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration *************** *** 3343,3348 **** Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories="" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> </FileConfiguration> <FileConfiguration --- 3328,3332 ---- Name="VCCLCompilerTool" Optimization="2" ! AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration

1 0

externals/grill/py/source main.cpp,1.6,1.7 main.h,1.8,1.9 pyext.cpp,1.9,1.10
by xovo＠users.sourceforge.net 29 Nov '03

29 Nov '03

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1:/tmp/cvs-serv28610/source Modified Files: main.cpp main.h pyext.cpp Log Message: "" Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** main.cpp 21 Oct 2003 02:38:31 -0000 1.6 --- main.cpp 29 Nov 2003 03:38:01 -0000 1.7 *************** *** 26,30 **** --- 26,33 ---- PyInterpreterState *py::pystate = NULL; + + #ifdef FLEXT_THREADS std::map<flext::thrid_t,PyThreadState *> py::pythrmap; + #endif I py::pyref = 0; *************** *** 102,106 **** --- 105,112 ---- PyEval_AcquireLock(); + + #ifdef FLEXT_THREADS PyThreadState_Swap(pythrmap[GetThreadId()]); + #endif #ifdef FLEXT_DEBUG *************** *** 109,114 **** --- 115,122 ---- #endif + #ifdef FLEXT_THREADS // reset thread state map pythrmap.clear(); + #endif } else { Index: main.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** main.h 21 Oct 2003 02:38:31 -0000 1.8 --- main.h 29 Nov 2003 03:38:01 -0000 1.9 *************** *** 117,123 **** public: static PyInterpreterState *pystate; - static std::map<flext::thrid_t,PyThreadState *> pythrmap; #ifdef FLEXT_THREADS ThrMutex mutex; V Lock() { mutex.Unlock(); } --- 117,123 ---- public: static PyInterpreterState *pystate; #ifdef FLEXT_THREADS + static std::map<flext::thrid_t,PyThreadState *> pythrmap; ThrMutex mutex; V Lock() { mutex.Unlock(); } Index: pyext.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** pyext.cpp 21 Oct 2003 02:38:31 -0000 1.9 --- pyext.cpp 29 Nov 2003 03:38:01 -0000 1.10 *************** *** 441,446 **** // store new thread state pythrmap[GetThreadId()] = newthr; ! { // call worker --- 441,447 ---- // store new thread state + #ifdef FLEXT_THREADS pythrmap[GetThreadId()] = newthr; ! #endif { // call worker *************** *** 450,455 **** --- 451,458 ---- } + #ifdef FLEXT_THREADS // delete mapped thread state pythrmap.erase(GetThreadId()); + #endif // --- delete Python thread ---

1 0

externals/grill/py config-pd-msvc.txt,1.3,1.4
by xovo＠users.sourceforge.net 29 Nov '03

29 Nov '03

Update of /cvsroot/pure-data/externals/grill/py In directory sc8-pr-cvs1:/tmp/cvs-serv28610 Modified Files: config-pd-msvc.txt Log Message: "" Index: config-pd-msvc.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/config-pd-msvc.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config-pd-msvc.txt 2 Oct 2003 02:38:04 -0000 1.3 --- config-pd-msvc.txt 29 Nov 2003 03:38:01 -0000 1.4 *************** *** 10,14 **** # where is MS VC++? ! MSVCPATH=C:\Programme\Microsoft Visual Studio .NET 2003\Vc7 # which version of Python? --- 10,15 ---- # where is MS VC++? ! # (not necessary if the build is run with the compiler environment) ! # MSVCPATH=C:\Programme\Microsoft Visual Studio .NET 2003\Vc7 # which version of Python?

1 0

externals/grill/xsample xsample.vcproj,1.4,1.5
by xovo＠users.sourceforge.net 29 Nov '03

29 Nov '03

Update of /cvsroot/pure-data/externals/grill/xsample In directory sc8-pr-cvs1:/tmp/cvs-serv28443 Modified Files: xsample.vcproj Log Message: "" Index: xsample.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/xsample.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** xsample.vcproj 19 Sep 2003 02:37:34 -0000 1.4 --- xsample.vcproj 29 Nov 2003 03:37:15 -0000 1.5 *************** *** 40,44 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="pd.lib flext-pdwin.lib" OutputFile="pd-msvc\xsample.dll" LinkIncremental="1" --- 40,44 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="pd.lib " OutputFile="pd-msvc\xsample.dll" LinkIncremental="1"

1 0

externals/grill/flext changes.txt,1.29,1.30 flext.vcproj,1.21,1.22
by xovo＠users.sourceforge.net 29 Nov '03

29 Nov '03

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1:/tmp/cvs-serv27499 Modified Files: changes.txt flext.vcproj Log Message: "" Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/changes.txt,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** changes.txt 10 Nov 2003 03:32:52 -0000 1.29 --- changes.txt 29 Nov 2003 03:32:48 -0000 1.30 *************** *** 31,35 **** - enforcing usage of STL - explicit boolean attributes (great for attribute editor layout!) - - added flext::NewLarge and flext::FreeLarge memory allocation functions which use the C-Library heap and should mainly be used in secondary threads - flext_dsp reported wrong inlet/outlet count (CntInSig, CntOutSig functions) - added support for patcher arguments for attributes (use # instead of $ to save them with a patch) --- 31,34 ---- Index: flext.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/flext.vcproj,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** flext.vcproj 20 Oct 2003 02:32:51 -0000 1.21 --- flext.vcproj 29 Nov 2003 03:32:48 -0000 1.22 *************** *** 515,518 **** --- 515,519 ---- PreprocessorDefinitions="WIN32;_LIB;FLEXT_SYS_MAX;FLEXT_THREADS;FLEXT_USE_SIMD;FLEXT_SHARED;FLEXT_EXPORTS" StringPooling="TRUE" + ExceptionHandling="TRUE" RuntimeLibrary="2" EnableEnhancedInstructionSet="1" *************** *** 529,535 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="maxapi.lib maxext.lib maxaudio.lib pthreadVC.lib stk.lib sndobj.lib" OutputFile=".\max-msvc\flext.max.dll" AdditionalLibraryDirectories=""F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\debug";"F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\debug";f:\prog\packs\pthreads;F:\prog\audio\stk\lib;F:\prog\audio\sndobj\lib" GenerateDebugInformation="FALSE" OptimizeReferences="1" --- 530,537 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="maxapi.lib maxext.lib maxaudio.lib stk.lib sndobj.lib" OutputFile=".\max-msvc\flext.max.dll" AdditionalLibraryDirectories=""F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\debug";"F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\debug";f:\prog\packs\pthreads;F:\prog\audio\stk\lib;F:\prog\audio\sndobj\lib" + IgnoreAllDefaultLibraries="TRUE" GenerateDebugInformation="FALSE" OptimizeReferences="1" *************** *** 4440,4443 **** --- 4442,4461 ---- <File RelativePath="source\fldefs_setup.h"> + </File> + </Filter> + <Filter + Name="build" + Filter=""> + <File + RelativePath=".\build-max-msvc.bat"> + </File> + <File + RelativePath=".\build-pd-msvc.bat"> + </File> + <File + RelativePath=".\config-max-msvc.txt"> + </File> + <File + RelativePath=".\config-pd-msvc.txt"> </File> </Filter>

1 0

externals/grill/flext/source flbuf.cpp,1.15,1.16 fldsp.cpp,1.19,1.20 flsupport.cpp,1.24,1.25 flsupport.h,1.55,1.56
by xovo＠users.sourceforge.net 29 Nov '03

29 Nov '03

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1:/tmp/cvs-serv27499/source Modified Files: flbuf.cpp fldsp.cpp flsupport.cpp flsupport.h Log Message: "" Index: flbuf.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flbuf.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** flbuf.cpp 12 Aug 2003 02:32:51 -0000 1.15 --- flbuf.cpp 29 Nov 2003 03:32:48 -0000 1.16 *************** *** 195,199 **** if(keep) { // copy buffer data to tmp storage ! tmp = new t_sample[sz]; if(tmp) CopySamples(tmp,data,sz); --- 195,199 ---- if(keep) { // copy buffer data to tmp storage ! tmp = (t_sample *)NewAligned(sz*sizeof(t_sample)); if(tmp) CopySamples(tmp,data,sz); *************** *** 216,220 **** // copy data back CopySamples(data,tmp,sz); ! delete[] tmp; if(zero && sz < fr) ZeroSamples(data+sz,fr-sz); } --- 216,220 ---- // copy data back CopySamples(data,tmp,sz); ! FreeAligned(tmp); if(zero && sz < fr) ZeroSamples(data+sz,fr-sz); } Index: fldsp.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/fldsp.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** fldsp.cpp 14 Aug 2003 02:32:51 -0000 1.19 --- fldsp.cpp 29 Nov 2003 03:32:48 -0000 1.20 *************** *** 17,22 **** #include <string.h> - - // === flext_dsp ============================================== --- 17,20 ---- Index: flsupport.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** flsupport.cpp 19 Nov 2003 03:32:54 -0000 1.24 --- flsupport.cpp 29 Nov 2003 03:32:48 -0000 1.25 *************** *** 89,106 **** ///////////////////////////////////////////////////////// void *flext_root::operator new(size_t bytes) { bytes += sizeof(size_t); ! #ifdef FLEXT_DEBUG ! if(bytes > 32000) ! post("flext - warning: excessive memory allocation of %i bytes",bytes); ! #endif #if FLEXT_SYS == FLEXT_SYS_JMAX ! char *blk = (char *)::fts_malloc(bytes); #else ! char *blk = (char *)::getbytes(bytes); #endif *(size_t *)blk = bytes; --- 89,112 ---- ///////////////////////////////////////////////////////// + #define LARGEALLOC 32000 + void *flext_root::operator new(size_t bytes) { bytes += sizeof(size_t); ! char *blk; ! if(bytes >= LARGEALLOC) { ! // use C library function for large memory blocks ! blk = (char *)::operator new(bytes); ! } ! else { ! //! \todo We need system locking here for secondary threads! #if FLEXT_SYS == FLEXT_SYS_JMAX ! blk = (char *)::fts_malloc(bytes); #else ! blk = (char *)::getbytes(bytes); #endif + } *(size_t *)blk = bytes; *************** *** 111,121 **** { char *ori = (char *)blk-sizeof(size_t); #if FLEXT_SYS == FLEXT_SYS_JMAX ! fts_free(ori); #else ! size_t bytes = *(size_t *)ori; ! ::freebytes(ori,bytes); #endif } --- 117,135 ---- { char *ori = (char *)blk-sizeof(size_t); + size_t bytes = *(size_t *)ori; + + if(bytes >= LARGEALLOC) { + // use C library function for large memory blocks + ::operator delete(ori); + } + else { + //! \todo We need system locking here for secondary threads! #if FLEXT_SYS == FLEXT_SYS_JMAX ! fts_free(ori); #else ! ::freebytes(ori,bytes); #endif + } } *************** *** 126,134 **** bytes += ovh+alignovh; #if FLEXT_SYS == FLEXT_SYS_JMAX ! char *blk = (char *)::fts_malloc(bytes); #else ! char *blk = (char *)::getbytes(bytes); #endif char *ablk = reinterpret_cast<char *>((reinterpret_cast<unsigned long>(blk)+ovh+alignovh) & ~alignovh); --- 140,157 ---- bytes += ovh+alignovh; + char *blk; + if(bytes >= LARGEALLOC) { + // use C library function for large memory blocks + blk = (char *)::operator new(bytes); + } + else { + //! \todo We need system locking here for secondary threads! + #if FLEXT_SYS == FLEXT_SYS_JMAX ! blk = (char *)::fts_malloc(bytes); #else ! blk = (char *)::getbytes(bytes); #endif + } char *ablk = reinterpret_cast<char *>((reinterpret_cast<unsigned long>(blk)+ovh+alignovh) & ~alignovh); *************** *** 141,151 **** { char *ori = *(char **)((char *)blk-sizeof(size_t)-sizeof(char *)); #if FLEXT_SYS == FLEXT_SYS_JMAX ! fts_free(ori); #else ! size_t bytes = *(size_t *)((char *)blk-sizeof(size_t)); ! ::freebytes(ori,bytes); #endif } --- 164,182 ---- { char *ori = *(char **)((char *)blk-sizeof(size_t)-sizeof(char *)); + size_t bytes = *(size_t *)((char *)blk-sizeof(size_t)); + + if(bytes >= LARGEALLOC) { + // use C library function for large memory blocks + ::operator delete(ori); + } + else { + //! \todo We need system locking here for secondary threads! #if FLEXT_SYS == FLEXT_SYS_JMAX ! fts_free(ori); #else ! ::freebytes(ori,bytes); #endif + } } Index: flsupport.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** flsupport.h 13 Nov 2003 03:33:09 -0000 1.55 --- flsupport.h 29 Nov 2003 03:32:48 -0000 1.56 *************** *** 55,65 **** #endif - /*! Get a large memory block - the normal C library function is used here - */ - static void *NewLarge(size_t bytes) { return ::operator new(bytes); } - //! Free a large memory block - static void FreeLarge(void *blk) { ::operator delete(blk); } - //! Get an aligned memory block static void *NewAligned(size_t bytes,int bitalign = 128); --- 55,58 ---- *************** *** 70,77 **** return (reinterpret_cast<unsigned long>(ptr)&(bitalign-1)) == 0; } - //! @} FLEXT_S_MEMORY - }; --- 63,77 ---- return (reinterpret_cast<unsigned long>(ptr)&(bitalign-1)) == 0; } //! @} FLEXT_S_MEMORY }; + + // define global new/delete operators + inline void *operator new(size_t bytes) { return flext_root::operator new(bytes); } + inline void operator delete(void *blk) { flext_root::operator delete(blk); } + #ifndef __MRC__ // doesn't allow new[] overloading?! + inline void *operator new[](size_t bytes) { return flext_root::operator new[](bytes); } + inline void operator delete[](void *blk) { flext_root::operator delete[](blk); } + #endif +

1 0

pd/src d_osc.c,1.1.1.2.2.1,1.1.1.2.2.2 g_canvas.h,1.1.1.4.2.3,1.1.1.4.2.4 g_editor.c,1.1.1.4.2.2,1.1.1.4.2.3 g_graph.c,1.1.1.3.2.2,1.1.1.3.2.3 g_io.c,1.1.1.1.16.1,1.1.1.1.16.2 m_class.c,1.1.1.2.2.1,1.1.1.2.2.2 m_glob.c,1.1.1.2.2.2,1.1.1.2.2.3 m_imp.h,1.1.1.2.2.1,1.1.1.2.2.2 m_obj.c,1.1.1.3.2.2,1.1.1.3.2.3 m_pd.h,1.1.1.4.2.9,1.1.1.4.2.10 s_stuff.h,1.1.1.1.2.4,1.1.1.1.2.5
by ggeiger＠users.sourceforge.net 25 Nov '03

25 Nov '03

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1:/tmp/cvs-serv1309 Modified Files: Tag: devel_0_37 d_osc.c g_canvas.h g_editor.c g_graph.c g_io.c m_class.c m_glob.c m_imp.h m_obj.c m_pd.h s_stuff.h Log Message: tooltips Index: d_osc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_osc.c,v retrieving revision 1.1.1.2.2.1 retrieving revision 1.1.1.2.2.2 diff -C2 -d -r1.1.1.2.2.1 -r1.1.1.2.2.2 *** d_osc.c 18 Nov 2003 10:34:10 -0000 1.1.1.2.2.1 --- d_osc.c 25 Nov 2003 19:19:57 -0000 1.1.1.2.2.2 *************** *** 270,273 **** --- 270,274 ---- outlet_new(&x->x_obj, gensym("signal")); inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("ft1")); + inlet_settip(x->x_obj.te_inlet,gensym("phase")); x->x_phase = 0; x->x_conv = 0; *************** *** 350,353 **** --- 351,355 ---- class_addmethod(osc_class, (t_method)osc_dsp, gensym("dsp"), 0); class_addmethod(osc_class, (t_method)osc_ft1, gensym("ft1"), A_FLOAT, 0); + class_settip(osc_class,gensym("frequency")); cos_maketable(); Index: g_canvas.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.h,v retrieving revision 1.1.1.4.2.3 retrieving revision 1.1.1.4.2.4 diff -C2 -d -r1.1.1.4.2.3 -r1.1.1.4.2.4 *** g_canvas.h 12 Sep 2003 20:55:31 -0000 1.1.1.4.2.3 --- g_canvas.h 25 Nov 2003 19:19:57 -0000 1.1.1.4.2.4 *************** *** 445,449 **** EXTERN void canvas_redraw(t_canvas *x); ! EXTERN t_inlet *canvas_addinlet(t_canvas *x, t_pd *who, t_symbol *sym); EXTERN void canvas_rminlet(t_canvas *x, t_inlet *ip); EXTERN t_outlet *canvas_addoutlet(t_canvas *x, t_pd *who, t_symbol *sym); --- 445,449 ---- EXTERN void canvas_redraw(t_canvas *x); ! EXTERN t_inlet *canvas_addinlet(t_canvas *x, t_pd *who, t_symbol *sym,t_symbol* s); EXTERN void canvas_rminlet(t_canvas *x, t_inlet *ip); EXTERN t_outlet *canvas_addoutlet(t_canvas *x, t_pd *who, t_symbol *sym); Index: g_editor.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v retrieving revision 1.1.1.4.2.2 retrieving revision 1.1.1.4.2.3 diff -C2 -d -r1.1.1.4.2.2 -r1.1.1.4.2.3 *** g_editor.c 12 Sep 2003 20:55:31 -0000 1.1.1.4.2.2 --- g_editor.c 25 Nov 2003 19:19:57 -0000 1.1.1.4.2.3 *************** *** 16,19 **** --- 16,20 ---- void open_via_helppath(const char *name, const char *dir); char *class_gethelpdir(t_class *c); + char* inlet_tip(t_inlet* i,int num); /* ------------------ forward declarations --------------- */ *************** *** 745,748 **** --- 746,764 ---- } + + void canvas_inlettip(t_canvas* x,t_object* ob,int closest,int xpos,int ypos) + { + if (!sys_tooltips) return; + if (ob->ob_pd->c_firstin) closest--; + if (closest < 0) + sys_vgui(".x%x.c create text %d %d -anchor sw -text \"%s\" -tags y\n", + x, xpos, ypos,ob->ob_pd->c_firsttip->s_name); + else + sys_vgui(".x%x.c create text %d %d -anchor sw -text \"%s\" -tags y\n", + x, xpos, ypos-4,inlet_tip(ob->te_inlet,closest)); + } + + + /* check if a point lies in a gobj. */ int canvas_hitbox(t_canvas *x, t_gobj *y, int xpos, int ypos, *************** *** 1027,1030 **** --- 1043,1048 ---- return; } + sys_vgui(".x%x.c delete x\n",x); + /* if not a runmode left click, fall here. */ if (y = canvas_findhitbox(x, xpos, ypos, &x1, &y1, &x2, &y2)) *************** *** 1059,1063 **** { /* look for an outlet */ ! int noutlet; if (ob && (noutlet = obj_noutlets(ob)) && ypos >= y2-4) { --- 1077,1081 ---- { /* look for an outlet */ ! int noutlet,ninlet; if (ob && (noutlet = obj_noutlets(ob)) && ypos >= y2-4) { *************** *** 1086,1089 **** --- 1104,1123 ---- goto nooutletafterall; } + /* look for an inlet */ + else if (ob && (ninlet = obj_ninlets(ob)) && ypos <= y1+4) + { + int width = x2 - x1; + int nin1 = (ninlet > 1 ? ninlet - 1 : 1); + int closest = ((xpos-x1) * (nin1) + width/2)/width; + int hotspot = x1 + + (width - IOWIDTH) * closest / (nin1); + if (closest < ninlet && + xpos >= (hotspot-1) && xpos <= hotspot + (IOWIDTH+1)) + { + + canvas_inlettip(x,ob,closest,xpos,ypos); + } + } + /* not in an outlet; select and move */ else if (doit) *************** *** 1269,1273 **** "connect"); } ! else canvas_setcursor(x, CURSOR_EDITMODE_CONNECT); return; } --- 1303,1310 ---- "connect"); } ! else { ! canvas_setcursor(x, CURSOR_EDITMODE_CONNECT); ! canvas_inlettip(x,ob2,closest2,xpos,ypos); ! } return; } *************** *** 1489,1492 **** --- 1526,1531 ---- return; } + sys_vgui(".x%x.c delete y\n",x); + glist_setlastxy(x, xpos, ypos); if (x->gl_editor->e_onmotion == MA_MOVE) Index: g_graph.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v retrieving revision 1.1.1.3.2.2 retrieving revision 1.1.1.3.2.3 diff -C2 -d -r1.1.1.3.2.2 -r1.1.1.3.2.3 *** g_graph.c 29 Oct 2003 12:57:42 -0000 1.1.1.3.2.2 --- g_graph.c 25 Nov 2003 19:19:57 -0000 1.1.1.3.2.3 *************** *** 259,265 **** ! t_inlet *canvas_addinlet(t_canvas *x, t_pd *who, t_symbol *s) { t_inlet *ip = inlet_new(&x->gl_obj, who, s, 0); if (!x->gl_loading && x->gl_owner && glist_isvisible(x->gl_owner)) { --- 259,266 ---- ! t_inlet *canvas_addinlet(t_canvas *x, t_pd *who, t_symbol *s,t_symbol* h) { t_inlet *ip = inlet_new(&x->gl_obj, who, s, 0); + inlet_settip(ip,h); if (!x->gl_loading && x->gl_owner && glist_isvisible(x->gl_owner)) { Index: g_io.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_io.c,v retrieving revision 1.1.1.1.16.1 retrieving revision 1.1.1.1.16.2 diff -C2 -d -r1.1.1.1.16.1 -r1.1.1.1.16.2 *** g_io.c 2 Aug 2003 15:37:49 -0000 1.1.1.1.16.1 --- g_io.c 25 Nov 2003 19:19:57 -0000 1.1.1.1.16.2 *************** *** 28,31 **** --- 28,32 ---- void signal_setborrowed(t_signal *sig, t_signal *sig2); void signal_makereusable(t_signal *sig); + void inlet_sethelp(t_inlet* i,t_symbol* s); /* ------------------------- vinlet -------------------------- */ *************** *** 46,51 **** signal from the prolog to the DSP routine: */ t_signal *x_directsignal; ! ! t_resample x_updown; /* IOhannes */ } t_vinlet; --- 47,51 ---- signal from the prolog to the DSP routine: */ t_signal *x_directsignal; ! t_resample x_updown; /* IOhannes */ } t_vinlet; *************** *** 54,58 **** t_vinlet *x = (t_vinlet *)pd_new(vinlet_class); x->x_canvas = canvas_getcurrent(); ! x->x_inlet = canvas_addinlet(x->x_canvas, &x->x_obj.ob_pd, 0); x->x_bufsize = 0; x->x_buf = 0; --- 54,58 ---- t_vinlet *x = (t_vinlet *)pd_new(vinlet_class); x->x_canvas = canvas_getcurrent(); ! x->x_inlet = canvas_addinlet(x->x_canvas, &x->x_obj.ob_pd, 0,s); x->x_bufsize = 0; x->x_buf = 0; *************** *** 256,260 **** t_vinlet *x = (t_vinlet *)pd_new(vinlet_class); x->x_canvas = canvas_getcurrent(); ! x->x_inlet = canvas_addinlet(x->x_canvas, &x->x_obj.ob_pd, &s_signal); x->x_endbuf = x->x_buf = (t_float *)getbytes(0); x->x_bufsize = 0; --- 256,260 ---- t_vinlet *x = (t_vinlet *)pd_new(vinlet_class); x->x_canvas = canvas_getcurrent(); ! x->x_inlet = canvas_addinlet(x->x_canvas, &x->x_obj.ob_pd, &s_signal,s); x->x_endbuf = x->x_buf = (t_float *)getbytes(0); x->x_bufsize = 0; Index: m_class.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_class.c,v retrieving revision 1.1.1.2.2.1 retrieving revision 1.1.1.2.2.2 diff -C2 -d -r1.1.1.2.2.1 -r1.1.1.2.2.2 *** m_class.c 12 Sep 2003 20:54:57 -0000 1.1.1.2.2.1 --- m_class.c 25 Nov 2003 19:19:57 -0000 1.1.1.2.2.2 *************** *** 203,206 **** --- 203,207 ---- c->c_pwb = 0; c->c_firstin = ((flags & CLASS_NOINLET) == 0); + c->c_firsttip = gensym("?"); c->c_patchable = (typeflag == CLASS_PATCHABLE); c->c_gobj = (typeflag >= CLASS_GOBJ); *************** *** 820,822 **** --- 821,829 ---- if (m->me_name == s) return(m->me_fun); return(0); + } + + + void class_settip(t_class *x,t_symbol* s) + { + x->c_firsttip = s; } Index: m_glob.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_glob.c,v retrieving revision 1.1.1.2.2.2 retrieving revision 1.1.1.2.2.3 diff -C2 -d -r1.1.1.2.2.2 -r1.1.1.2.2.3 *** m_glob.c 2 Aug 2003 15:37:49 -0000 1.1.1.2.2.2 --- m_glob.c 25 Nov 2003 19:19:57 -0000 1.1.1.2.2.3 *************** *** 27,30 **** --- 27,31 ---- void glob_path_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv); void glob_ping(t_pd *dummy); + void glob_tooltips(t_pd *dummy, t_float f); void alsa_resync( void); *************** *** 98,101 **** --- 99,104 ---- class_addmethod(glob_pdobject, (t_method)glob_path_dialog, gensym("path-dialog"), A_GIMME, 0); + class_addmethod(glob_pdobject, (t_method)glob_tooltips, + gensym("tooltips"), A_DEFFLOAT, 0); #ifdef UNIX class_addmethod(glob_pdobject, (t_method)glob_ping, gensym("ping"), 0); Index: m_imp.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_imp.h,v retrieving revision 1.1.1.2.2.1 retrieving revision 1.1.1.2.2.2 diff -C2 -d -r1.1.1.2.2.1 -r1.1.1.2.2.2 *** m_imp.h 12 Sep 2003 20:58:08 -0000 1.1.1.2.2.1 --- m_imp.h 25 Nov 2003 19:19:57 -0000 1.1.1.2.2.2 *************** *** 52,55 **** --- 52,56 ---- char c_firstin; /* if patchable, true if draw first inlet */ char c_drawcommand; /* a drawing command for a template */ + t_symbol* c_firsttip; }; Index: m_obj.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_obj.c,v retrieving revision 1.1.1.3.2.2 retrieving revision 1.1.1.3.2.3 diff -C2 -d -r1.1.1.3.2.2 -r1.1.1.3.2.3 *** m_obj.c 16 Oct 2003 16:50:20 -0000 1.1.1.3.2.2 --- m_obj.c 25 Nov 2003 19:19:57 -0000 1.1.1.3.2.3 *************** *** 23,26 **** --- 23,28 ---- }; + int sys_tooltips = 1; + struct _inlet { *************** *** 31,34 **** --- 33,37 ---- t_symbol *i_symfrom; union inletunion i_un; + t_symbol* i_tip; }; *************** *** 58,61 **** --- 61,65 ---- x->i_symfrom = s1; x->i_next = 0; + x->i_tip = gensym("?"); if (y = owner->ob_inlet) { *************** *** 72,75 **** --- 76,103 ---- x->i_symfrom->s_name, s->s_name); } + + void inlet_settip(t_inlet* i,t_symbol* s) + { + i->i_tip = s; + } + + void glob_tooltips(t_pd *dummy, t_float f) + { + sys_tooltips = f; + } + + char* inlet_tip(t_inlet* i,int num) + { + if (num < 0) return "???"; + while (num-- && i) + i = i->i_next; + + if (i) + if (i->i_tip) { + return i->i_tip->s_name; + } + return "?"; + } + /* LATER figure out how to make these efficient: */ Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.1.1.4.2.9 retrieving revision 1.1.1.4.2.10 diff -C2 -d -r1.1.1.4.2.9 -r1.1.1.4.2.10 *** m_pd.h 18 Nov 2003 10:34:10 -0000 1.1.1.4.2.9 --- m_pd.h 25 Nov 2003 19:19:57 -0000 1.1.1.4.2.10 *************** *** 441,444 **** --- 441,447 ---- #endif + void class_settip(t_class *x,t_symbol* s); + void inlet_settip(t_inlet* i,t_symbol* s); + /* ------------ printing --------------------------------- */ EXTERN void post(char *fmt, ...); Index: s_stuff.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v retrieving revision 1.1.1.1.2.4 retrieving revision 1.1.1.1.2.5 diff -C2 -d -r1.1.1.1.2.4 -r1.1.1.1.2.5 *** s_stuff.h 7 Oct 2003 14:31:45 -0000 1.1.1.1.2.4 --- s_stuff.h 25 Nov 2003 19:19:57 -0000 1.1.1.1.2.5 *************** *** 24,27 **** --- 24,28 ---- extern int sys_nogui; extern char *sys_guicmd; + extern int sys_tooltips; EXTERN int sys_nearestfontsize(int fontsize);

1 0

pd/src configure,1.1.1.4.2.6,1.1.1.4.2.7 configure.in,1.1.1.4.2.6,1.1.1.4.2.7 d_global.c,1.1.1.2.8.1,1.1.1.2.8.2 s_inter.c,1.1.1.3.2.6,1.1.1.3.2.7 u_main.tk,1.1.1.4.2.6,1.1.1.4.2.7
by ggeiger＠users.sourceforge.net 24 Nov '03

24 Nov '03

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1:/tmp/cvs-serv23207 Modified Files: Tag: devel_0_37 configure configure.in d_global.c s_inter.c u_main.tk Log Message: fixed throw/catch problem, merged millers u_main.tk, changed configure.in Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure,v retrieving revision 1.1.1.4.2.6 retrieving revision 1.1.1.4.2.7 diff -C2 -d -r1.1.1.4.2.6 -r1.1.1.4.2.7 *** configure 18 Nov 2003 10:34:08 -0000 1.1.1.4.2.6 --- configure 24 Nov 2003 16:27:47 -0000 1.1.1.4.2.7 *************** *** 1,5 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.53. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 --- 1,5 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.57. # [...5402 lines suppressed...] ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` *************** *** 6835,6840 **** if test "$no_create" != yes; then ac_cs_success=: exec 5>/dev/null ! $SHELL $CONFIG_STATUS || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which --- 6176,6184 ---- if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null ! $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.1.1.4.2.6 retrieving revision 1.1.1.4.2.7 diff -C2 -d -r1.1.1.4.2.6 -r1.1.1.4.2.7 *** configure.in 18 Nov 2003 10:34:09 -0000 1.1.1.4.2.6 --- configure.in 24 Nov 2003 16:27:49 -0000 1.1.1.4.2.7 *************** *** 58,65 **** echo "dynamic link support required" || exit 1) - dnl Checking for `sin' function in -lffm: - dnl ffm is the fast math library on the alpha - AC_CHECK_LIB(ffm, sin,PDLIB="$PDLIB -lffm") - dnl Checking for `sin' function in -lm: AC_CHECK_LIB(m, sin,PDLIB="$PDLIB -lm", --- 58,61 ---- *************** *** 77,139 **** echo "no X11 found" || exit 1, -L$x_libraries) ! dnl look for tcl 8.x... do I really have to go through all this!? ! foundit=no ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl.h,foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.7/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.7";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.6/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.6";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.5/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.5";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.4/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.4";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.3/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.3";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! AC_CHECK_HEADER(tcl8.2/tcl.h, ! GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.2";foundit=yes,) ! fi ! if test $foundit == "no"; ! then ! echo no tcl header found ! exit -1 ! fi ! AC_CHECK_LIB(tcl8.7, main,, ! AC_CHECK_LIB(tcl8.6, main,, ! AC_CHECK_LIB(tcl8.5, main,, ! AC_CHECK_LIB(tcl8.4, main,, ! AC_CHECK_LIB(tcl8.3, main,, ! AC_CHECK_LIB(tcl8.2, main,, ! AC_CHECK_LIB(tcl8.0, main,,echo no tcl library found || exit 1))))))) ! AC_CHECK_LIB(tk8.7, main,, ! AC_CHECK_LIB(tk8.6, main,, ! AC_CHECK_LIB(tk8.5, main,, ! AC_CHECK_LIB(tk8.4, main,, ! AC_CHECK_LIB(tk8.3, main,, ! AC_CHECK_LIB(tk8.2, main,, ! AC_CHECK_LIB(tk8.0, main,,echo no tk library found || exit 1))))))) if test `uname -s` = Linux; --- 73,101 ---- echo "no X11 found" || exit 1, -L$x_libraries) ! dnl look for tcl 8.x... ! tcllib="" ! AC_CHECK_LIB(tcl8.7, main,tcllib=tcl8.7, ! AC_CHECK_LIB(tcl8.6, main,tcllib=tcl8.6, ! AC_CHECK_LIB(tcl8.5, main,tcllib=tcl8.5, ! AC_CHECK_LIB(tcl8.4, main,tcllib=tcl8.4, ! AC_CHECK_LIB(tcl8.3, main,tcllib=tcl8.3, ! AC_CHECK_LIB(tcl8.2, main,tcllib=tcl8.2, ! AC_CHECK_LIB(tcl8.0, main,tcllib=tcl8.0,echo no tcl library found || exit 1))))))) ! LIBS="$LIBS -l$tcllib" ! tklib=${tcllib/tcl/tk} ! ! AC_CHECK_LIB($tklib, main,,echo no tk library found || exit 1) + foundit=no + AC_CHECK_HEADER(tcl.h,foundit=yes,) + + if test "$foundit" = "no"; then + AC_CHECK_HEADER($tcllib/tcl.h, + GUIFLAGS="$GUIFLAGS -I/usr/include/$tcllib", + [echo no tcl header found];exit -1) + fi if test `uname -s` = Linux; *************** *** 149,155 **** dnl Checking for JACK ! AC_CHECK_LIB(rt,shm_open,LIBS="$LIBS -lrt") ! AC_CHECK_LIB(jack,jack_set_xrun_callback,LIBS="$LIBS -ljack";jack=xrun,jack=no) ! AC_CHECK_LIB(jack,jack_set_error_function,LIBS="$LIBS -ljack";jack=yes,jack=no) LDFLAGS="-Wl,-export-dynamic" --- 111,119 ---- dnl Checking for JACK ! if test "$jack" = "yes"; then ! AC_CHECK_LIB(rt,shm_open,LIBS="$LIBS -lrt") ! AC_CHECK_LIB(jack,jack_set_xrun_callback,LIBS="$LIBS -ljack";jack=xrun,jack=no) ! AC_CHECK_LIB(jack,jack_set_error_function,LIBS="$LIBS -ljack";jack=yes,jack=no) ! fi LDFLAGS="-Wl,-export-dynamic" Index: d_global.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_global.c,v retrieving revision 1.1.1.2.8.1 retrieving revision 1.1.1.2.8.2 diff -C2 -d -r1.1.1.2.8.1 -r1.1.1.2.8.2 *** d_global.c 18 Nov 2003 10:34:10 -0000 1.1.1.2.8.1 --- d_global.c 24 Nov 2003 16:27:49 -0000 1.1.1.2.8.2 *************** *** 243,247 **** while (n--) { ! *out = (PD_BADFLOAT(*in) ? 0 : *in); out++; in++; --- 243,247 ---- while (n--) { ! *out += (PD_BADFLOAT(*in) ? 0 : *in); out++; in++; Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.1.1.3.2.6 retrieving revision 1.1.1.3.2.7 diff -C2 -d -r1.1.1.3.2.6 -r1.1.1.3.2.7 *** s_inter.c 25 Sep 2003 20:06:19 -0000 1.1.1.3.2.6 --- s_inter.c 24 Nov 2003 16:27:49 -0000 1.1.1.3.2.7 *************** *** 595,599 **** for (i = 1; i < 22; i++) SETFLOAT(zz + i, defaultfontshit[i-1]); ! glob_initfromgui(0, 0, 22, zz); } else --- 595,600 ---- for (i = 1; i < 22; i++) SETFLOAT(zz + i, defaultfontshit[i-1]); ! SETFLOAT(zz+22,0); ! glob_initfromgui(0, 0, 23, zz); } else Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.6 retrieving revision 1.1.1.4.2.7 diff -C2 -d -r1.1.1.4.2.6 -r1.1.1.4.2.7 *** u_main.tk 19 Oct 2003 19:45:29 -0000 1.1.1.4.2.6 --- u_main.tk 24 Nov 2003 16:27:49 -0000 1.1.1.4.2.7 *************** *** 1,3 **** ! set pd_nt 0 # (The above is 0 for unix, 1 for microsoft, and 2 for Mac OSX. The first # line is automatically munged by the relevant makefiles.) --- 1,3 ---- ! set pd_nt 1 # (The above is 0 for unix, 1 for microsoft, and 2 for Mac OSX. The first # line is automatically munged by the relevant makefiles.) *************** *** 124,127 **** --- 124,132 ---- bind . <Control-Key> {pdtk_pd_ctrlkey %W %K 0} bind . <Control-Shift-Key> {pdtk_pd_ctrlkey %W %K 1} + if {$pd_nt == 2} { + bind . <Mod1-Key> {pdtk_canvas_ctrlkey %W %K 0} + bind . <Mod1-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1} + } + wm title . "Pd" *************** *** 287,291 **** set filename [tk_getOpenFile -defaultextension .pd \ ! -filetypes { {{documentation} {.pd .txt .htm .html}} } \ -initialdir $help_directory] --- 292,296 ---- set filename [tk_getOpenFile -defaultextension .pd \ ! -filetypes { {{documentation} {.pd .txt .htm}} } \ -initialdir $help_directory] *************** *** 925,928 **** --- 930,937 ---- bind $name.c <Alt-Key> {pdtk_canvas_altkey %W %K %A} # bind $name.c <Mod1-Key> {puts stderr [concat mod1 %W %K %A]} + if {$pd_nt == 2} { + bind $name.c <Mod1-Key> {pdtk_canvas_ctrlkey %W %K 0} + bind $name.c <Mod1-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1} + } bind $name.c <Key> {pdtk_canvas_key %W %K %A 0} bind $name.c <Shift-Key> {pdtk_canvas_key %W %K %A 1} *************** *** 2642,2645 **** --- 2651,2663 ---- set height7 [lindex [font metrics -*-courier-bold--normal--36-*] 5] + set tclpatch [info patchlevel] + if {$tclpatch == "8.3.0" || \ + $tclpatch == "8.3.1" || \ + $tclpatch == "8.3.2" || \ + $tclpatch == "8.3.3" } { + set oldtclversion 1 + } else { + set oldtclversion 0 + } pd [concat pd init [pdtk_enquote [pwd]] \ 8 $width1 $height1 \ *************** *** 2650,2654 **** 24 $width6 $height6 \ 36 $width7 $height7 \ ! \;]; # add the audio and help menus to the Pd window. We delayed this --- 2668,2672 ---- 24 $width6 $height6 \ 36 $width7 $height7 \ ! $oldtclversion \;]; # add the audio and help menus to the Pd window. We delayed this

1 0

pd/src makefile,1.3,1.4
by kpeiruza＠users.sourceforge.net 20 Nov '03

20 Nov '03

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1:/tmp/cvs-serv10729/pd/src Modified Files: makefile Log Message: Simply I've executed "autoconf", It seems that configure.in was ok but configure didn't. Regards! Index: makefile =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile 10 Nov 2003 16:13:11 -0000 1.3 --- makefile 20 Nov 2003 19:28:52 -0000 1.4 *************** *** 22,28 **** INCLUDE = -I. GINCLUDE = $(INCLUDE) -I/usr/local/include/tcl8.4 -I/usr/local/include/tk8.4 -I/usr/X11R6/include -I/usr/local/include ! GLIB = -lX11 -L/usr/X11R6/lib -ltcl84 -ltk84 -L/usr/local/lib ! LDFLAGS = -Wl,-export-dynamic -L/usr/local/lib -L/usr/local/lib/pth -lpthread LIB = -lm --- 22,28 ---- INCLUDE = -I. GINCLUDE = $(INCLUDE) -I/usr/local/include/tcl8.4 -I/usr/local/include/tk8.4 -I/usr/X11R6/include -I/usr/local/include ! GLIB = -lX11 -L/usr/X11R6/lib -L/usr/local/lib -ltcl84 -ltk84 ! LDFLAGS = -Wl,-export-dynamic -L/usr/local/lib/pth -lpthread LIB = -lm

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs November 2003