Update of /cvsroot/pure-data/externals/grill/xsample In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17093
Modified Files: license.txt package.txt readme.txt xsample.vcproj Added Files: xsample.mcp Removed Files: xsample.cw Log Message: merge in branch "20041229-unify" - some small cleanups os x fixes minor updates improved buffer handling simplify updates Mac adaptations - made xcode project preparing xsample 0.3.0 release updated for build system some optimizations - fixed loop record bug Completion of attribute functionality, revisited and updated help files
--- xsample.cw DELETED ---
Index: package.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/package.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** package.txt 3 Jan 2005 05:01:59 -0000 1.2 --- package.txt 8 Jan 2005 04:59:40 -0000 1.3 *************** *** 1,12 **** NAME=xsample
! BUILDCLASS=ext ! BUILDMODE=release ! BUILDTYPE=single
PRECOMPILE=prefix.h
- SRCDIR=source - SRCS=main.cpp play.cpp groove.cpp record.cpp inter.cpp ! HDRS=main.h inter.h --- 1,23 ---- + # xsample - extended sample objects for Max/MSP and PD (pure data) + # + # Copyright (c)2001-2005 Thomas Grill (gr@grrrr.org) + # For information on usage and redistribution, and for a DISCLAIMER OF ALL + # WARRANTIES, see the file, "license.txt," in this distribution. + # + # more information on http://grrrr.org/ext + # ------------------------------------------------------------------------ + # + # This file contains information for the building process + # + # DO NOT EDIT!! + # + # ------------------------------------------------------------------------ + NAME=xsample
! SRCDIR=source
PRECOMPILE=prefix.h
SRCS=main.cpp play.cpp groove.cpp record.cpp inter.cpp ! HDRS=prefix.h main.h inter.h
Index: xsample.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/xsample.vcproj,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** xsample.vcproj 17 Dec 2004 05:03:13 -0000 1.10 --- xsample.vcproj 8 Jan 2005 04:59:43 -0000 1.11 *************** *** 21,35 **** Name="VCCLCompilerTool" Optimization="2" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\max\flext\source" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2" StringPooling="TRUE" ! RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" EnableEnhancedInstructionSet="1" UsePrecompiledHeader="2" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool --- 21,40 ---- Name="VCCLCompilerTool" Optimization="2" ! GlobalOptimizations="TRUE" ! InlineFunctionExpansion="0" ! FavorSizeOrSpeed="1" ! OmitFramePointers="TRUE" ! OptimizeForProcessor="3" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src;..\flext\source" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2" StringPooling="TRUE" ! RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" EnableEnhancedInstructionSet="1" UsePrecompiledHeader="2" + PrecompiledHeaderThrough="prefix.h" WarningLevel="3" SuppressStartupBanner="TRUE" + DebugInformationFormat="3" CompileAs="0"/> <Tool *************** *** 41,45 **** LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:\programme\audio\pd\bin,..\flext\pd-msvc" ImportLibrary=".\pd-msvc\r/xsample.lib" TargetMachine="1"/> --- 46,50 ---- LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:\programme\audio\pd\bin" ImportLibrary=".\pd-msvc\r/xsample.lib" TargetMachine="1"/> *************** *** 85,93 **** Optimization="0" OptimizeForProcessor="2" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\max\flext\source" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2" BasicRuntimeChecks="3" ! RuntimeLibrary="5" UsePrecompiledHeader="2" BrowseInformation="1" WarningLevel="3" --- 90,99 ---- Optimization="0" OptimizeForProcessor="2" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src;..\flext\source" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2" BasicRuntimeChecks="3" ! RuntimeLibrary="1" UsePrecompiledHeader="2" + PrecompiledHeaderThrough="prefix.h" BrowseInformation="1" WarningLevel="3" *************** *** 99,107 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="pd.lib flext_d-pdwin.lib" OutputFile="$(outdir)/xsample.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:\programme\audio\pd\bin,..\flext\pd-msvc" GenerateDebugInformation="TRUE" ImportLibrary=".\pd-msvc\d/xsample.lib" --- 105,113 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="pd.lib" OutputFile="$(outdir)/xsample.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:\programme\audio\pd\bin" GenerateDebugInformation="TRUE" ImportLibrary=".\pd-msvc\d/xsample.lib" *************** *** 155,158 **** --- 161,165 ---- EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" + PrecompiledHeaderThrough="prefix.h" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 276,282 **** PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=1" StringPooling="TRUE" ! RuntimeLibrary="1" StructMemberAlignment="2" UsePrecompiledHeader="2" WarningLevel="3" SuppressStartupBanner="TRUE" --- 283,290 ---- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=1" StringPooling="TRUE" ! RuntimeLibrary="0" StructMemberAlignment="2" UsePrecompiledHeader="2" + PrecompiledHeaderThrough="prefix.h" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 333,340 **** <Tool Name="VCCLCompilerTool" ! Optimization="3" GlobalOptimizations="TRUE" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="2" AdditionalIncludeDirectories=""C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\max-includes";"C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\msp-includes";..\flext\source" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=1" --- 341,350 ---- <Tool Name="VCCLCompilerTool" ! Optimization="2" GlobalOptimizations="TRUE" ! InlineFunctionExpansion="0" ! FavorSizeOrSpeed="1" ! OmitFramePointers="TRUE" ! OptimizeForProcessor="3" AdditionalIncludeDirectories=""C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\max-includes";"C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\msp-includes";..\flext\source" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=1" *************** *** 343,347 **** --- 353,359 ---- StructMemberAlignment="2" BufferSecurityCheck="FALSE" + EnableEnhancedInstructionSet="1" UsePrecompiledHeader="2" + PrecompiledHeaderThrough="prefix.h" WarningLevel="3" SuppressStartupBanner="TRUE" *************** *** 395,401 **** Filter=""> <File - RelativePath="make-files.txt"> - </File> - <File RelativePath="readme.txt"> </File> --- 407,410 ----
--- NEW FILE: xsample.mcp --- (This appears to be a binary file; contents omitted.)
Index: license.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/license.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** license.txt 10 Jan 2003 04:36:24 -0000 1.3 --- license.txt 8 Jan 2005 04:59:40 -0000 1.4 *************** *** 1,4 **** xsample - extended sample objects for Max/MSP and pd (pure data) ! Copyright (C) 2001-2003 Thomas Grill
This program is free software; you can redistribute it and/or --- 1,4 ---- xsample - extended sample objects for Max/MSP and pd (pure data) ! Copyright (C) 2001-2005 Thomas Grill
This program is free software; you can redistribute it and/or *************** *** 31,35 **** --- flext ---------------------------------------------- flext - C++ layer for Max/MSP and pd (pure data) externals ! Copyright (C) 2001-2003 Thomas Grill
This program is free software; you can redistribute it and/or --- 31,35 ---- --- flext ---------------------------------------------- flext - C++ layer for Max/MSP and pd (pure data) externals ! Copyright (C) 2001-2005 Thomas Grill
This program is free software; you can redistribute it and/or
Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/readme.txt,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** readme.txt 16 Dec 2004 05:02:23 -0000 1.21 --- readme.txt 8 Jan 2005 04:59:40 -0000 1.22 *************** *** 1,5 **** ! xsample - extended sample objects for Max/MSP and pd (pure data)
! Copyright (c)2001-2004 Thomas Grill (t.grill@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 1,5 ---- ! xsample - extended sample objects for Max/MSP and PD (pure data)
! Copyright (c)2001-2005 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 10,18 **** Donations for further development of the package are HIGHLY APPRECIATED.
! Visit https://www.paypal.com/xclick/business=t.grill%40gmx.net&item_name=xsamp...
----------------------------------------------------------------------------
! IMPORTANT INFORMATION for all MaxMSP users:
1) --- 10,18 ---- Donations for further development of the package are HIGHLY APPRECIATED.
! Visit https://www.paypal.com/xclick/business=gr%40grrrr.org&item_name=xsample&...
----------------------------------------------------------------------------
! IMPORTANT INFORMATION for all Max/MSP users:
1) *************** *** 43,108 **** ----------------------------------------------------------------------------
- You will need the flext C++ layer for PD and Max/MSP externals to compile this. - see http://www.parasitaere-kapazitaeten.net/ext - - - Package files: - - readme.txt: this one - - gpl.txt,license.txt: GPL license stuff - - main.h,main.cpp,inter.cpp,inter.h: base class definition for all the other objects - - record.cpp: xrecord~ - - play.cpp: xplay~ - - groove.cpp: xgroove~ - - ----------------------------------------------------------------------------
BUILDING XSAMPLE from source ----------------------------
! The package should at least compile (and is tested) with the following compilers: ! ! pd - Windows: ! ------------- ! o Microsoft Visual C++ 6 or .NET command line: edit "config-pd-msvc.txt" and run "build-pd-msvc.bat" ! ! o BCC: edit "config-pd-bcc.txt" and run "build-pd-bcc.bat" ! ! o Cygwin GCC: edit "config-pd-cygwin.txt" and run "sh ./build-pd-cygwin.sh" ! > various versions of GCC die during compile with template optimization turned on ! ! o MinGW: edit "config-pd-mingw.txt" and run "build-pd-mingw.bat" ! > MinGW binary folder must be included in the system path! ! ! pd - linux: ! ----------- ! o GCC: edit "config-pd-linux.txt" and run "sh ./build-pd-linux.sh" ! > various versions of GCC die during compile with template optimization turned on ! ! pd - OSX: ! ----------- ! o GCC: edit "config-pd-darwin.txt" and run "sh ./build-pd-darwin.sh" ! > various versions of GCC die during compile with template optimization turned on
- o XCode: use "xsample.xcode" project
! Max/MSP - MacOS9: ! ---------------- ! o Metrowerks CodeWarrior: "xsample.cw" project file
! o Apple MPW-PR: edit & use the "flext.mpw" makefile
- Max/MSP - MacOSX: - ---------------- - o Metrowerks CodeWarrior: "xsample.cw" project file
! o XCode: use "xsample.xcode" project
- Max/MSP - Windows: - ---------------- - o Microsoft Visual C++ 6 or .NET command line: edit "config-max-msvc.txt" and run "build-max-msvc.bat"
----------------------------------------------------------------------------
Goals/features of the package:
--- 43,80 ---- ----------------------------------------------------------------------------
BUILDING XSAMPLE from source ----------------------------
! You will need the flext C++ layer for PD and Max/MSP externals to compile this. ! See http://grrrr.org/ext/flext ! Download, install and compile the package. ! Afterwards you can proceed with building xsample.
! pd/Max - Windows - Microsoft Visual C, Borland C++, MinGW: ! ---------------------------------------------------------- ! Start a command shell with your eventual build environment ! (e.g. run vcvars32.bat for Microsoft Visual Studio)
! then run ! ..\flext\build.bat ! (you would have to substitute ..\flext with the respective path to the flext package)
! pd/Max - OSX/Linux - GCC: ! ------------------------- ! From a shell run ! bash ../flext/build.sh ! (you would have to substitute ../flext with the respective path to the flext package)
+ Max - OS9 - Metrowerks CodeWarrior: + ----------------------------------- + use the "xsample.mcp" project file
----------------------------------------------------------------------------
+ Goals/features of the package:
*************** *** 127,130 **** --- 99,105 ---- - renew units and scalemode on buffer change - fixed looped recording bug (thanks to Tatama Suomo) + - reconsidered all state changes + - more optimizations for interpolation functions + - use the new flext build system
0.3.0: *************** *** 184,207 **** ---------------------------------------------------------------------------
- TODO list:
- general: - - - do a smooth (line~) mixin in xrecord~ help patch - features: - multi-buffer handling (aka multi-channel for pd) - - vasp handling - - performance comparison to respective PD/Max objects - anti-alias filter? (possible?)
- delay min/max changes when cur pos in cross-fade zone
- tests: - - reconsider startup sequence of set buffer,set units,set sclmode,set pos/min/max - bugs: - PD: problems with timed buffer redrawing (takes a lot of cpu time) - flext bug? - - Apple MPW doesn't correctly compile template optimization - Max help files aren't correctly opened due to xsample objects residing in a library (FIXED for OSX!!!) --- 159,171 ----