Nabble - SuperCollider Developers New (Use this!!!!)

SF.net SVN: supercollider:[9822] trunk

2010-02-09T11:03:30Z

Revision: 9822
http://supercollider.svn.sourceforge.net/supercollider/?rev=9822&view=rev
Author: danstowell
Date: 2010-02-09 19:03:30 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
reorganise furniture: couple of small leftovers from folder moves

Added Paths:
-----------
trunk/mac/Standalone Resources/

Removed Paths:
-------------
trunk/Standalone Resources/
trunk/iphone/lib/iphone/
trunk/xtralibs/

Property changes on: trunk/mac/Standalone Resources
___________________________________________________________________
Added: svn:mergeinfo
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: quarks:[1374] DataNetwork

2010-02-09T10:59:49Z

Revision: 1374
http://quarks.svn.sourceforge.net/quarks/?rev=1374&view=rev
Author: nescivi
Date: 2010-02-09 18:59:49 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
added methods for mapping data nodes to sensestage minibee nodes by clients

Modified Paths:
--------------
DataNetwork/DataNetwork.sc
DataNetwork/SWDataNetworkOSC.sc

Modified: DataNetwork/DataNetwork.sc
===================================================================
--- DataNetwork/DataNetwork.sc 2010-02-09 18:58:34 UTC (rev 1373)
+++ DataNetwork/DataNetwork.sc 2010-02-09 18:59:49 UTC (rev 1374)
@@ -24,6 +24,8 @@
var <recTime = false;
var <timelogfile;

+ var <>hive;
+
*new{
^super.new.init;
}
@@ -123,6 +125,18 @@
}
*/

+ mapHivePWM{ |nodeID, miniBee|
+ if ( hive.notNil ){
+ this.nodes[ nodeID ].action = { |data| hive.setPWM( miniBee, data) };
+ };
+ }
+
+ mapHiveDig{ |nodeID, miniBee|
+ if ( hive.notNil ){
+ this.nodes[ nodeID ].action = { |data| hive.setDigital( miniBee, data) };
+ };
+ }
+
registerNode{ |id,sz,type|
var ret,key,nnode;
if ( type == -1){
@@ -326,7 +340,7 @@
recTask.reset.play;
}{
recTask.stop;
- logfile.close;
+ if ( logfile.notNil ){ logfile.close; };
};
}

Modified: DataNetwork/SWDataNetworkOSC.sc
===================================================================
--- DataNetwork/SWDataNetworkOSC.sc 2010-02-09 18:58:34 UTC (rev 1373)
+++ DataNetwork/SWDataNetworkOSC.sc 2010-02-09 18:59:49 UTC (rev 1374)
@@ -231,7 +231,21 @@
if ( verbose > 1, { msg.postln; });
if ( msg.size > 1 ){
addr.port = msg[1]; this.removeAll( addr, msg[2] );
+ }{ if ( verbose > 0, { "missing port in message".postln; }); }; }),
+
+ /// MAPPING TO MINIBEE OUTPUT
+
+ OSCresponderNode( nil, '/map/minibee/pwm', { |t,r,msg,addr|
+ if ( verbose > 1, { msg.postln; });
+ if ( msg.size > 1 ){
+ addr.port = msg[1]; this.mapHivePWM( addr, msg[2], msg.copyToEnd( 3 ) );
+ }{ if ( verbose > 0, { "missing port in message".postln; }); }; }),
+ OSCresponderNode( nil, '/map/minibee/digital', { |t,r,msg,addr|
+ if ( verbose > 1, { msg.postln; });
+ if ( msg.size > 1 ){
+ addr.port = msg[1]; this.mapHiveDig( addr, msg[2], msg.copyToEnd( 3 ) );
}{ if ( verbose > 0, { "missing port in message".postln; }); }; })
+
];

responders.do{ |it| it.add };
@@ -828,6 +842,57 @@
}

+ mapHivePWM{ |addr,name,msg|
+ var there,node;
+ there = this.findClient( addr, name.asSymbol );
+ if ( there.isNil, {
+ this.errorMsg( addr, "/map/minibee/pwm", 15, [name] );
+ },{
+ msg[0] = msg[0].asInteger;
+ node = network.nodes.at( msg[0] );
+ if ( node.notNil,
+ {
+ if ( there.checkForSetter(node), {
+ // old version:
+ // if ( setters.at( msg[0] ) == addr, {
+ network.mapHivePWM( msg[0], msg[1] );
+ addr.sendMsg( '/mapped/node', msg[0] );
+ },{
+ this.errorMsg( addr, "/map/minibee/pwm", 4, msg );
+ });
+ },{
+ this.errorMsg( addr, "/map/minibee/pwm", 5, msg );
+ });
+ this.logMsg( "/map/minibee/pwm:" + msg[0] + " from client with IP"+addr.ip+"and port"+addr.port );
+ });
+ }
+
+ mapHiveDig{ |addr,name,msg|
+ var there,node;
+ there = this.findClient( addr, name.asSymbol );
+ if ( there.isNil, {
+ this.errorMsg( addr, "/map/minibee/digital", 15, [name] );
+ },{
+ msg[0] = msg[0].asInteger;
+ node = network.nodes.at( msg[0] );
+ if ( node.notNil,
+ {
+ if ( there.checkForSetter(node), {
+ // old version:
+ // if ( setters.at( msg[0] ) == addr, {
+ network.mapHiveDig( msg[0], msg[1] );
+ addr.sendMsg( '/mapped/node', msg[0] );
+ },{
+ this.errorMsg( addr, "/map/minibee/digital", 4, msg );
+ });
+ },{
+ this.errorMsg( addr, "/map/minibee/digital", 5, msg );
+ });
+ this.logMsg( "/map/minibee/digital:" + msg[0] + " from client with IP"+addr.ip+"and port"+addr.port );
+ });
+ }
+
+
/// TODO: why am I using a different tactic here??? Fix check for name!

labelNode{ |addr,name,msg|

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: quarks:[1373] FileLog/MultiFileWriter.sc

2010-02-09T10:58:34Z

Revision: 1373
http://quarks.svn.sourceforge.net/quarks/?rev=1373&view=rev
Author: nescivi
Date: 2010-02-09 18:58:34 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
added extra check in close method, in case there is no current file

Modified Paths:
--------------
FileLog/MultiFileWriter.sc

Modified: FileLog/MultiFileWriter.sc
===================================================================
--- FileLog/MultiFileWriter.sc 2010-02-09 11:05:19 UTC (rev 1372)
+++ FileLog/MultiFileWriter.sc 2010-02-09 18:58:34 UTC (rev 1373)
@@ -84,6 +84,7 @@

close{
var newf;
+ if ( curFile.notNil ){
if ( curFile.isOpen ){
newf= pathDir +/+ PathName(curfn).fileName;
curFile.close;
@@ -106,6 +107,7 @@
this.createTarBundle( newf );
};
};
+ }
// }).play(AppClock);
}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9821] trunk

2010-02-09T10:57:58Z

Revision: 9821
http://supercollider.svn.sourceforge.net/supercollider/?rev=9821&view=rev
Author: danstowell
Date: 2010-02-09 18:57:58 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
reorganise furniture: first stage, move things - fixed build scripts to come soon

Added Paths:
-----------
trunk/common/Headers/
trunk/common/Psycollider/
trunk/common/SConstruct
trunk/common/Source/
trunk/common/TestingAndToDo/
trunk/common/build/
trunk/common/include/
trunk/common/setMainVersion.sh
trunk/common/waf
trunk/common/wscript
trunk/iphone/iPhone Resources/
trunk/iphone/iPhone_Language.xcodeproj/
trunk/iphone/iPhone_Synth.xcodeproj/
trunk/iphone/lib/
trunk/iphone/lib/iphone/
trunk/mac/Language.xcodeproj/
trunk/mac/Packager/
trunk/mac/Plugins.xcodeproj/
trunk/mac/Resources/
trunk/mac/SuperColliderAU/
trunk/mac/Synth.xcodeproj/
trunk/mac/clean-compile.sh
trunk/mac/compile.sh
trunk/mac/lib/
trunk/mac/libscsynth_exp
trunk/windows/lib/

Removed Paths:
-------------
trunk/Headers/
trunk/Language.xcodeproj/
trunk/Packager/
trunk/Plugins.xcodeproj/
trunk/Psycollider/
trunk/Resources/
trunk/SConstruct
trunk/Source/
trunk/SuperColliderAU/
trunk/Synth.xcodeproj/
trunk/TestingAndToDo/
trunk/build/
trunk/clean-compile.sh
trunk/compile.sh
trunk/iPhone Resources/
trunk/iPhone_Language.xcodeproj/
trunk/iPhone_Synth.xcodeproj/
trunk/iphone/iPhone_Synth.xcodeproj/project.pbxproj
trunk/iphone/lib/iphone/COPYING_libsndfile
trunk/iphone/lib/iphone/libsndfile_iphone.a
trunk/libscsynth_exp
trunk/setMainVersion.sh
trunk/waf
trunk/wscript
trunk/xtralibs/include/
trunk/xtralibs/iphone/
trunk/xtralibs/mac/
trunk/xtralibs/windows/

Deleted: trunk/SConstruct
===================================================================
--- trunk/SConstruct 2010-02-09 18:24:05 UTC (rev 9820)
+++ trunk/SConstruct 2010-02-09 18:57:58 UTC (rev 9821)
@@ -1,1401 +0,0 @@
-# -*- python -*- =======================================================
-# FILE: SConstruct
-# CONTENTS: scons build script for SuperCollider
-# AUTHOR: sk AT k-hornz DOT de
-# modifications: nescivi AT gmail DOT com
-# ======================================================================
-
-# ======================================================================
-# NOTE: Please use an indentation level of 4 spaces, i.e. no mixing of
-# tabs and spaces.
-# ======================================================================
-
-# ======================================================================
-# setup
-# ======================================================================
-
-EnsureSConsVersion(0,96)
-EnsurePythonVersion(2,3)
-SConsignFile()
-
-# ======================================================================
-# imports
-# ======================================================================
-
-import glob
-import os
-import subprocess
-import re
-import types
-import tarfile
-import platform # Seems to have more portable uname() than os
-
-# ======================================================================
-# constants
-# ======================================================================
-
-PACKAGE = 'SuperCollider'
-
-
-
-f = open('VERSION')
-VERSION = f.readline()
-f.close()
-
-def short_cpu_name(cpu):
- if cpu == 'Power Macintosh':
- cpu = 'ppc'
- return cpu.lower()
-
-PLATFORM = platform.uname()[0].lower()
-CPU = short_cpu_name(platform.uname()[4])
-
-ANY_FILE_RE = re.compile('.*')
-HELP_FILE_RE = re.compile('.*\.(rtf(d)?|scd|html)$')
-SC_FILE_RE = re.compile('.*\.sc$')
-SRC_FILE_RE = re.compile('.*\.(c(pp)|h)$')
-
-if PLATFORM == 'darwin':
- PLATFORM_SYMBOL = 'SC_DARWIN'
- PLUGIN_EXT = '.scx'
- DEFAULT_AUDIO_API = 'coreaudio'
- DEFAULT_PREFIX = '/usr/local'
-elif PLATFORM == 'freebsd':
- PLATFORM_SYMBOL = 'SC_FREEBSD'
- PLUGIN_EXT = '.so'
- DEFAULT_AUDIO_API = 'jack'
- DEFAULT_PREFIX = '/usr/local'
-elif PLATFORM == 'linux':
- PLATFORM_SYMBOL = 'SC_LINUX'
- PLUGIN_EXT = '.so'
- DEFAULT_AUDIO_API = 'jack'
- DEFAULT_PREFIX = '/usr/local'
-elif PLATFORM == 'windows':
- PLATFORM_SYMBOL = 'SC_WIN32'
- PLUGIN_EXT = '.scx'
- DEFAULT_AUDIO_API = 'portaudio'
- DEFAULT_PREFIX = '/'
-else:
- print 'Unknown platform: %s' % PLATFORM
- Exit(1)
-
-if CPU in [ 'ppc' , 'ppc64' ]:
- DEFAULT_OPT_ARCH = '7450'
-elif CPU in [ 'i586', 'i686' ]:
- # FIXME: better detection
- DEFAULT_OPT_ARCH = CPU
-else:
- DEFAULT_OPT_ARCH = None
-
-if PLATFORM != 'windows':
- subprocess.call(['sh', 'setMainVersion.sh'])
-
-
-# ======================================================================
-# util
-# ======================================================================
-
-
-def make_os_env(*keys):
- env = os.environ
- res = {}
- for key in keys:
- if env.has_key(key):
- res[key] = env[key]
- return res
-
-def CheckPKGConfig(context, version):
- context.Message( 'Checking for pkg-config... ' )
- ret = context.TryAction('pkg-config --atleast-pkgconfig-version=%s' % version)[0]
- context.Result( ret )
- return ret
-
-def CheckPKG(context, name):
- context.Message('Checking for %s... ' % name)
- ret = context.TryAction('pkg-config --exists \'%s\'' % name)[0]
- res = None
- if ret:
- res = Environment(ENV = make_os_env('PATH', 'PKG_CONFIG_PATH'))
- res.ParseConfig('pkg-config --cflags --libs \'%s\'' % name)
- res['PKGCONFIG'] = name
- context.Result(ret)
- return (ret, res)
-
-def get_new_pkg_env():
- return Environment(ENV = make_os_env('PATH', 'PKG_CONFIG_PATH'))
-
-def merge_lib_info(env, *others):
- for other in others:
- env.AppendUnique(CCFLAGS = other.get('CCFLAGS', []))
- env.AppendUnique(CPPDEFINES = other.get('CPPDEFINES', []))
- env.AppendUnique(CPPPATH = other.get('CPPPATH', []))
- env.AppendUnique(CXXFLAGS = other.get('CXXFLAGS', []))
- env.AppendUnique(LIBS = other.get('LIBS', []))
- env.AppendUnique(LIBPATH = other.get('LIBPATH', []))
- env['LINKFLAGS'] = env['LINKFLAGS'] + other.get('LINKFLAGS', "")
-
-def make_pkgconfig_requires(*envs):
- res = []
- for env in envs:
- if env and env.has_key('PKGCONFIG'):
- res.append(env['PKGCONFIG'])
- return res
-
-def build_pkgconfig_file(target, source, env):
- def write_field(file, name, prefix, separator=None):
- if env.has_key(name):
- if separator:
- content = separator.join(env[name])
- else:
- content = env[name]
- file.write('%s%s\n' % (prefix, content))
- out = file(str(target[0]), 'w')
- out.writelines([
- 'prefix=%s\n' % env['PREFIX'],
- 'exec_prefix=${prefix}\n',
- 'libdir=${exec_prefix}/lib\n',
- 'includedir=${prefix}/include/%s\n' % env['PACKAGE'],
- '\n'])
- write_field(out, 'PKGCONFIG_NAME', 'Name: ')
- write_field(out, 'PKGCONFIG_DESC', 'Description: ')
- write_field(out, 'URL', 'URL: ')
- write_field(out, 'VERSION', 'Version: ')
- write_field(out, 'PKGCONFIG_REQUIRES', 'Requires: ', ', ')
- write_field(out, 'PKGCONFIG_REQUIRES_PRIVATE', 'Requires.private: ', ', ')
- write_field(out, 'PKGCONFIG_LIBS', 'Libs: -L${libdir} ', ' ')
- write_field(out, 'PKGCONFIG_LIBS_PRIVATE', 'Libs.private: ', ' ')
- write_field(out, 'PKGCONFIG_CFLAGS', 'Cflags: ', ' ')
- out.close()
-
-def flatten_dir(dir):
- res = []
- for root, dirs, files in os.walk(dir):
- if 'CVS' in dirs: dirs.remove('CVS')
- if '.svn' in dirs: dirs.remove('.svn')
- for f in files:
- res.append(os.path.join(root, f))
- return res
-
-def install_dir(env, src_dir, dst_dir, filter_re, strip_levels=0):
- nodes = []
- for root, dirs, files in os.walk(src_dir):
- src_paths = []
- dst_paths = []
- if 'CVS' in dirs: dirs.remove('CVS')
- if '.svn' in dirs: dirs.remove('.svn')
- for d in dirs[:]:
- if filter_re.match(d):
- src_paths += flatten_dir(os.path.join(root, d))
- dirs.remove(d)
- for f in files:
- if filter_re.match(f):
- src_paths.append(os.path.join(root, f))
- dst_paths += map(
- lambda f:
- os.path.join(
- dst_dir,
- *f.split(os.path.sep)[strip_levels:]),
- src_paths)
- nodes += env.InstallAs(dst_paths, src_paths)
- return nodes
-
-def is_installing():
- pat = re.compile('^install.*$')
- for x in COMMAND_LINE_TARGETS:
- if pat.match(x): return True
- return False
-
-def is_home_directory(dir):
- return os.path.normpath(dir) == os.path.normpath(os.environ.get('HOME', '/'))
-
-def bin_dir(prefix):
- return os.path.join(prefix, 'bin')
-def lib_dir(prefix):
- return os.path.join(prefix, 'lib')
-
-def pkg_data_dir(prefix, *args):
- if PLATFORM == 'darwin':
- base = '/Library/Application Support'
- if is_home_directory(prefix):
- base = os.path.join(prefix, base)
- else:
- base = os.path.join(prefix, 'share')
- return os.path.join(base, PACKAGE, *args)
-def pkg_doc_dir(prefix, *args):
- if PLATFORM == 'darwin':
- base = '/Library/Documentation'
- if is_home_directory(prefix):
- base = os.path.join(prefix, base)
- else:
- base = os.path.join(prefix, 'share', 'doc')
- return os.path.join(base, PACKAGE, *args)
-def pkg_include_dir(prefix, *args):
- return os.path.join(prefix, 'include', PACKAGE, *args)
-def pkg_lib_dir(prefix, *args):
- return os.path.join(lib_dir(prefix), PACKAGE, *args)
-
-def pkg_classlib_dir(prefix, *args):
- return pkg_data_dir(prefix, 'SCClassLibrary', *args)
-def pkg_extension_dir(prefix, *args):
- return pkg_data_dir(prefix, 'Extensions', *args)
-
-def make_opt_flags(env):
- flags = [
- "-O3",
- ## "-fomit-frame-pointer", # can behave strangely for sclang
- "-ffast-math",
- "-fno-finite-math-only",
- "-fstrength-reduce"
- ]
- arch = env.get('OPT_ARCH')
- if arch:
- if CPU in [ 'ppc' , 'ppc64' ]:
- flags.extend([ "-mcpu=%s" % (arch,) ])
- else:
- flags.extend([ "-march=%s" % (arch,) ])
- if CPU in [ 'ppc' , 'ppc64' ]:
- flags.extend([ "-fsigned-char", "-mhard-float",
- ## "-mpowerpc-gpopt", # crashes sqrt
- "-mpowerpc-gfxopt"
- ])
- return flags
-
-def make_static_object(env, source, postfix="_a"):
- obj = os.path.splitext(source)[0] + postfix
- return env.StaticObject(obj, source)
-
-def make_static_objects(env, sources, postfix="_a"):
- return map(lambda x: make_static_object(env, x, postfix), sources)
-
-# ======================================================================
-# command line options
-# ======================================================================
-
-opts = Options('scache.conf', ARGUMENTS)
-opts.AddOptions(
- BoolOption('ALSA',
- 'Build with ALSA sequencer support', 1),
- BoolOption('ALTIVEC',
- 'Build with Altivec support', 1),
- ('OPT_ARCH', 'Architecture to optimize for', DEFAULT_OPT_ARCH),
- EnumOption('AUDIOAPI',
- 'Build with specified audio API support',
- DEFAULT_AUDIO_API, ('jack', 'coreaudio', 'portaudio')),
- ('CC', 'C compiler executable'),
- ('CCFLAGS', 'C compiler flags'),
- ('CXX', 'C++ compiler executable'),
- ('CXXFLAGS', 'C++ compiler flags'),
- BoolOption('DEBUG',
- 'Build with debugging information', 0),
- PathOption('DESTDIR',
- 'Intermediate installation prefix for packaging', '/'),
- BoolOption('DEVELOPMENT',
- 'Build and install the development files', 0),
- BoolOption('FFTW',
- 'Use the FFTW libraries', PLATFORM != 'darwin'),
- BoolOption('JACK_DLL',
- 'Build with delay locked loop support', 0),
- BoolOption('JACK_DEBUG_DLL',
- 'Build with delay locked loop debugging support', 0),
- BoolOption('LANG',
- 'Build the language application', 1),
- BoolOption('LID',
- 'Build with Linux Input Device support [linux]', PLATFORM == 'linux'),
- BoolOption('NO_LIBSNDFILE',
- 'Disable libsndfile (audio file reading/writing)', 0),
- BoolOption('WII',
- 'Build with Linux WII support [linux]', PLATFORM == 'linux'),
- PathOption('PREFIX',
- 'Installation prefix', DEFAULT_PREFIX),
- BoolOption('RENDEZVOUS',
- 'Enable Zeroconf/Rendezvous.', 1),
- BoolOption('SCEL',
- 'Enable the SCEL user interface; NOTE for the HTML help system you need emacs-w3m', 1),
- BoolOption('SCVIM',
- 'Enable the SCVIM user interface; NOTE see the README in /editors/scvim for setting variables', 1),
- BoolOption('SCED',
- 'Enable the SCED (based on gedit) user interface; NOTE see the README in /editors/sced for setting variables', 0),
- BoolOption('SSE',
- 'Build with SSE support', 1),
- BoolOption('SSE2',
- 'Build with SSE2 support', 1),
- BoolOption('STRIP',
- 'Strip symbols from binaries', 0),
- BoolOption('CROSSCOMPILE',
- 'Crosscompile for another platform (does not do SSE support check)', 0),
- BoolOption('TERMINAL_CLIENT',
- 'Build with terminal client interface', 1),
- BoolOption('CURL',
- 'Build with libcurl - allows server to load files from remote servers by URL', 0),
- BoolOption('READLINE',
- 'Build with GNU readline for nice command-line sclang interface', PLATFORM == 'linux'),
- BoolOption('GPL3',
- 'Allow the inclusion of gpl-3 licensed code. Makes the license of the whole package gpl-3', 1),
- PackageOption('X11',
- 'Build with X11 support', 1),
- BoolOption('SCLANG64',
- 'Build 64bit sclang (only affects compilation on 64bit systems)', 0),
- )
-
-if PLATFORM == 'darwin':
- opts.AddOptions(
- BoolOption('UNIVERSAL',
- 'Build universal binaries (see UNIVERSAL_ARCHS)', 1),
- BoolOption('INTERNAL_LIBSNDFILE',
- 'Use internal version of libsndfile', 1),
-# ListOption('UNIVERSAL_ARCHS',
-# 'Architectures to build for',
-# 'all', ['ppc', 'i386'])
- )
-
-# ======================================================================
-# basic environment
-# ======================================================================
-
-env = Environment(options = opts,
- ENV = make_os_env('PATH', 'PKG_CONFIG_PATH'),
- PACKAGE = PACKAGE,
- VERSION = VERSION,
- URL = 'http://supercollider.sourceforge.net',
- TARBALL = PACKAGE + VERSION + '.tbz2')
-env.Append(PATH = ['/usr/local/bin', '/usr/bin', '/bin'])
-
-# for nova-simd
-env.Append(CPPPATH = ["xtralibs/include/nova-simd"])
-env.Append(CPPDEFINES = ["NOVA_SIMD"])
-
-if not env['GPL3']:
- env.Append(CPPDEFINES = ["NO_GPL3_CODE"])
- if env['READLINE']:
- print 'WARNING: option READLINE is on and option GPL3 is off, yet readline is GPL3+ licensed, so it will NOT be activated.'
-
-# checks for DISTCC and CCACHE as used in modern linux-distros:
-
-if os.path.exists('/usr/lib/distcc/bin'):
- os.environ['PATH'] = '/usr/lib/distcc/bin:' + os.environ['PATH']
- #env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS']
- env['ENV']['DISTCC_HOSTS'] = os.environ.get('DISTCC_HOSTS')
-
-if os.path.exists('/usr/lib/ccache/bin'):
- os.environ['PATH'] = '/usr/lib/ccache/bin:' + os.environ['PATH']
- #env['ENV']['CCACHE_DIR'] = os.environ['CCACHE_DIR']
- env['ENV']['CCACHE_DIR'] = os.environ.get('CCACHE_DIR')
-
-env['ENV']['PATH'] = os.environ['PATH']
-if PLATFORM == 'windows':
- env['ENV']['HOME'] = os.environ['HOMEPATH']
-else:
- env['ENV']['HOME'] = os.environ['HOME']
-
-if PLATFORM == 'linux':
- env['amd64'] = 'x86_64' in platform.uname()
- if env['amd64']:
- print "we are on amd64 linux"
-
-
-# ======================================================================
-# installation directories
-# ======================================================================
-
-FINAL_PREFIX = '$PREFIX'
-INSTALL_PREFIX = os.path.join('$DESTDIR', '$PREFIX')
-
-if env['PREFIX'] == '/usr':
- FINAL_CONFIG_PREFIX = '/etc'
-else:
- FINAL_CONFIG_PREFIX = os.path.join(env['PREFIX'], 'etc')
-CONFIG_PREFIX = '$DESTDIR' + FINAL_CONFIG_PREFIX
-
-env.Append(
- CPPDEFINES = [('SC_DATA_DIR', '\\"' + pkg_data_dir(FINAL_PREFIX) + '\\"')])
-
-# ======================================================================
-# configuration
-# ======================================================================
-
-def make_conf(env):
- return Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig,
- 'CheckPKG' : CheckPKG })
-
-def isDefaultBuild():
- return not env.GetOption('clean') and not 'debian' in COMMAND_LINE_TARGETS
-
-conf = make_conf(env)
-
-# libraries
-libraries = { }
-features = { }
-
-if isDefaultBuild():
- if not conf.CheckPKGConfig('0'):
- print 'pkg-config not found.'
- Exit(1)
-
- # sndfile
- if env['NO_LIBSNDFILE']:
- libraries['sndfile'] = Environment(CPPDEFINES = ['NO_LIBSNDFILE'])
- else:
- if PLATFORM == 'darwin' and env['INTERNAL_LIBSNDFILE']:
- libraries['sndfile'] = Environment(LINKFLAGS = ['xtralibs/mac/scUBlibsndfile.a'],
- CPPPATH = ['#xtralibs/include/libsndfile'])
- else:
- success, libraries['sndfile'] = conf.CheckPKG('sndfile >= 1.0.16')
- if not success: Exit(1)
- succes2, libraries['sndfile18'] = conf.CheckPKG('sndfile >= 1.0.18')
- if succes2:
- libraries['sndfile'].Append(CPPDEFINES = ['LIBSNDFILE_1018'])
-
- # libcurl
- success, libraries['libcurl'] = conf.CheckPKG('libcurl >= 7')
- if env['CURL'] and not success:
- print 'CURL option was set, but libcurl not found.'
- Exit(1)
-
- # FFTW
- libraries['fftwf'] = Environment()
- if env['FFTW']:
- success, libraries['fftwf'] = conf.CheckPKG('fftw3f')
- if success:
- libraries['fftwf'].Append(CPPDEFINES = ['SC_FFT_FFTW'])
- else:
- libraries['fftwf'].Append(CPPDEFINES = ['SC_FFT_NONE'])
- else:
- libraries['fftwf'].Append(CPPDEFINES = ['SC_FFT_NONE'])
- if PLATFORM == 'darwin':
- # needed for vector multiplication
- libraries['fftwf'] = Environment(LINKFLAGS = '-framework vecLib')
-else:
- libraries['sndfile'] = get_new_pkg_env()
- libraries['fftwf'] = get_new_pkg_env()
- libraries['libcurl'] = get_new_pkg_env()
-
-# audio api
-if env['AUDIOAPI'] == 'jack':
- features['audioapi'] = 'Jack'
- success, libraries['audioapi'] = conf.CheckPKG('jack >= 0.100')
- if success:
- libraries['audioapi'].Append(
- CPPDEFINES = [('SC_AUDIO_API', 'SC_AUDIO_API_JACK')],
- ADDITIONAL_SOURCES = ['Source/server/SC_Jack.cpp']
- )
- else:
- success, libraries['audioapi'] = conf.CheckPKG('jack')
- if isDefaultBuild():
- if not success: Exit(1)
- else:
- libraries['audioapi'] = get_new_pkg_env()
- libraries['audioapi'].Append(
- CPPDEFINES = [('SC_AUDIO_API', 'SC_AUDIO_API_JACK'),
- 'SC_USE_JACK_CLIENT_NEW'],
- ADDITIONAL_SOURCES = ['Source/server/SC_Jack.cpp']
- )
- libraries['audioapi'].Append(
- CPPDEFINES = [('SC_JACK_USE_DLL', env['JACK_DLL']),
- ('SC_JACK_DEBUG_DLL', env['JACK_DEBUG_DLL'])]
- )
-elif env['AUDIOAPI'] == 'coreaudio':
- features['audioapi'] = 'CoreAudio'
- libraries['audioapi'] = Environment(
- CPPDEFINES = [('SC_AUDIO_API', 'SC_AUDIO_API_COREAUDIO')],
- LINKFLAGS = '-framework CoreAudio',
- ADDITIONAL_SOURCES = []
- )
-elif env['AUDIOAPI'] == 'portaudio':
- features['audioapi'] = 'Portaudio'
- libraries['audioapi'] = Environment(
- CPPDEFINES = [('SC_AUDIO_API', 'SC_AUDIO_API_PORTAUDIO')],
- LIBS = ['portaudio'],
- ADDITIONAL_SOURCES = []
- )
-
-# rendezvous
-if env['RENDEZVOUS']:
- features['rendezvous'], libraries['rendezvous'] = conf.CheckPKG('avahi-client')
- if features['rendezvous']:
- libraries['rendezvous'].Append(CPPDEFINES = ['HAVE_AVAHI'])
- else:
- features['rendezvous'], libraries['rendezvous'] = conf.CheckPKG('howl')
- if features['rendezvous']:
- libraries['rendezvous'].Append(CPPDEFINES = ['HAVE_HOWL'])
-else:
- features['rendezvous'] = False
- libraries['rendezvous'] = False
-
-# alsa
-if env['ALSA']:
- features['alsa'], libraries['alsa'] = conf.CheckPKG('alsa')
-else:
- features['alsa'] = False
-
-if features['alsa']:
- libraries['alsa'].Append(CPPDEFINES = ['HAVE_ALSA'])
-
-# midi
-if conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/CoreMIDI.h'):
- features['midiapi'] = 'CoreMIDI'
- libraries['midiapi'] = Environment(
- LINKFLAGS = '-framework CoreMIDI',
- )
-elif features['alsa']:
- features['midiapi'] = 'ALSA'
- libraries['midiapi'] = libraries['alsa'].Clone()
-else:
- features['midiapi'] = None
-
-# lid
-features['lid'] = env['LID'] and conf.CheckCHeader('linux/input.h')
-
-# wii on linux
-if PLATFORM == 'linux':
- features['wii'] = env['WII'] and conf.CheckCHeader('cwiid.h')
-else:
- features['wii'] = env['WII']
-
-# libicu
-if env['LANG']:
- if PLATFORM == 'darwin' or conf.CheckCHeader('unicode/uregex.h'):
- libraries['libicu'] = Environment(
- LINKFLAGS = '-licui18n -licuuc -licudata',
- )
- else:
- print "libicu not found"
- Exit(1)
-
-# readline
-if env['LANG'] and env['READLINE'] and env['GPL3']:
- if conf.CheckCHeader('readline/readline.h'):
- libraries['readline'] = Environment(
- LINKFLAGS = '-lreadline',
- )
- else:
- print "libreadline not found"
- Exit(1)
-
-# only _one_ Configure context can be alive at a time
-env = conf.Finish()
-
-# altivec
-if env['ALTIVEC']:
- if PLATFORM == 'darwin':
- altivec_flags = [ '-faltivec' ]
- else:
- altivec_flags = [ '-maltivec', '-mabi=altivec' ]
- libraries['altivec'] = env.Clone()
- libraries['altivec'].Append(
- CCFLAGS = altivec_flags,
- CPPDEFINES = [('SC_MEMORY_ALIGNMENT', 16)])
- altiConf = Configure(libraries['altivec'])
- features['altivec'] = altiConf.CheckCHeader('altivec.h')
- altiConf.Finish()
-else:
- features['altivec'] = False
-
-# sse
-if env['SSE']:
- libraries['sse'] = env.Clone()
- libraries['sse'].Append(
- CCFLAGS = ['-msse', '-mfpmath=sse'],
- CPPDEFINES = [('SC_MEMORY_ALIGNMENT', 16)])
- if env['SSE2']:
- libraries['sse'].Append(
- CCFLAGS = ['-msse2'])
-
- sseConf = Configure(libraries['sse'])
- hasSSEHeader = sseConf.CheckCHeader('xmmintrin.h')
- if env['CROSSCOMPILE']:
- build_host_supports_sse = True
- print 'NOTICE: cross compiling for another platform: assuming SSE support'
- else:
- build_host_supports_sse = False
- #if CPU != 'ppc':
- if CPU not in [ 'ppc' , 'ppc64' ]:
- if PLATFORM == 'freebsd':
- machine_info = os.popen ("sysctl -a hw.instruction_sse").read()[:-1]
- x86_flags = 'no'
- if "1" in [x for x in machine_info]:
- build_host_supports_sse = True
- x86_flags = 'sse'
- elif PLATFORM != 'darwin':
- flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
- x86_flags = flag_line.split (": ")[1:][0].split ()
- else:
- machine_info = os.popen ("sysctl -a machdep.cpu").read()[:-1]
- x86_flags = machine_info.split()
- if "sse" in [x.lower() for x in x86_flags]:
- build_host_supports_sse = True
- print 'NOTICE: CPU has SSE support'
- else:
- print 'NOTICE: CPU does not have SSE support'
- features['sse'] = hasSSEHeader and build_host_supports_sse
- sseConf.Finish()
-else:
- features['sse'] = False
-
-if env['X11']:
-# features['x11'], libraries['x11'] = conf.CheckPKG('xt')
- if type(env['X11']) != types.StringType:
- if os.path.exists('/usr/X11R6'):
- env['X11'] = '/usr/X11R6'
- elif os.path.exists('/usr/lib/X11'):
- env['X11'] = '/usr/lib/X11'
- else: env['X11'] = '/usr'
- x11Env = Environment(
- CPPPATH = [os.path.join(env['X11'], 'include')],
- LIBPATH = [os.path.join(env['X11'], 'lib')])
- x11Conf = Configure(x11Env)
- features['x11'] = x11Conf.CheckCHeader('X11/Intrinsic.h') \
- and x11Conf.CheckLib('X11', 'XQueryPointer')
- libraries['x11'] = x11Conf.Finish()
-else:
- features['x11'] = False
-
-
-opts.Save('scache.conf', env)
-Help(opts.GenerateHelpText(env))
-
-# defines and compiler flags
-
-env.Append(
- CPPDEFINES = [ '_REENTRANT', PLATFORM_SYMBOL ],
- CCFLAGS = [ '-Wno-unknown-pragmas' ],
- CXXFLAGS = [ '-Wno-deprecated' ]
- )
-
-# debugging flags
-if env['DEBUG']:
- env.Append(CCFLAGS = '-g')
-else:
- env.Append(
- CCFLAGS = make_opt_flags(env),
- CPPDEFINES = ['NDEBUG'])
- if env['STRIP']:
- env.Append(LINKFLAGS = "-Wl,-s")
-
-# platform specific
-if False: #PLATFORM == 'darwin':
- # universal binary support
- if env['UNIVERSAL']:
- archs = map(lambda x: ['-arch', x], ['ppc', 'i386'])
- env.Append(
- CCFLAGS = archs,
- LINKFLAGS = archs
- )
-
-# vectorization
-if features['altivec']:
- merge_lib_info(env, libraries['altivec'])
-elif features['sse']:
- merge_lib_info(env, libraries['sse'])
-else:
- env.AppendUnique(CPPDEFINES = [('SC_MEMORY_ALIGNMENT', 1)])
-
-# ======================================================================
-# Source/common
-# ======================================================================
-
-commonEnv = env.Clone()
-commonEnv.Append(
- CPPPATH = ['#Headers/common',
- '#Headers/plugin_interface',
- '#Headers/server'],
- CCFLAGS = ['-fPIC'],
- CXXFLAGS = ['-fPIC']
- )
-
-# strtod
-conf = Configure(commonEnv)
-if conf.CheckFunc('strtod'):
- commonEnv.Append(
- CPPDEFINES = 'HAVE_STRTOD'
- )
-commonEnv = conf.Finish()
-
-
-# ======================================================================
-# back to common
-# ======================================================================
-
-commonSources = Split('''
-Source/common/SC_AllocPool.cpp
-Source/common/SC_DirUtils.cpp
-Source/common/SC_Sem.cpp
-Source/common/SC_StringBuffer.cpp
-Source/common/SC_StringParser.cpp
-Source/common/scsynthsend.cpp
-Source/common/sc_popen.cpp
-''')
-if PLATFORM == 'darwin':
- commonSources += [
- 'Source/common/SC_StandAloneInfo_Darwin.cpp'
- ]
-if env['CURL']:
- commonEnv.Append(CPPDEFINES = ['HAVE_LIBCURL'])
- merge_lib_info(commonEnv, libraries['libcurl'])
-libcommon = commonEnv.Library('build/common', commonSources)
-
-#if env['amd64']:
- #commonSources32 = list(commonSources)
- #commonEnv32 = commonEnv.Clone()
- #commonEnv32.Append(
- #CCFLAGS = ['-m32'],
- #)
- #libcommon32 = commonEnv32.Library('build/common32', commonSources32)
-
-
-# ======================================================================
-# Source/server
-# ======================================================================
-
-serverEnv = env.Clone()
-serverEnv.Append(
- CPPPATH = ['#Headers/common',
- '#Headers/plugin_interface',
- '#Headers/server'],
- CPPDEFINES = [('SC_PLUGIN_DIR', '\\"' + pkg_lib_dir(FINAL_PREFIX, 'plugins') + '\\"'), ('SC_PLUGIN_EXT', '\\"' + PLUGIN_EXT + '\\"')],
- LIBPATH = 'build')
-libscsynthEnv = serverEnv.Clone(
- PKGCONFIG_NAME = 'libscsynth',
- PKGCONFIG_DESC = 'SuperCollider synthesis server library',
- PKGCONFIG_PREFIX = FINAL_PREFIX,
- PKGCONFIG_REQUIRES = make_pkgconfig_requires(libraries['sndfile'],
- libraries['audioapi'],
- libraries['rendezvous']),
- PKGCONFIG_LIBS = ['-lscsynth'],
-# PKGCONFIG_LIBS_PRIVATE = ['-lm', '-lpthread', '-ldl'],
- PKGCONFIG_CFLAGS = ['-D' + PLATFORM_SYMBOL, '-I${includedir}/common', '-I${includedir}/plugin_interface', '-I${includedir}/server']
- )
-
-# platform specific
-
-# functionality of libdl is included in libc on freebsd
-if PLATFORM == 'freebsd':
- serverEnv.Append(LIBS = ['common', 'pthread'])
-else:
- serverEnv.Append(LIBS = ['common', 'pthread', 'dl'])
-
-if PLATFORM == 'darwin':
- serverEnv.Append(
- LINKFLAGS = [
- '-framework', 'CoreServices'])
- #'-dylib_install_name', FINAL_PREFIX + '/lib/libsclang.dylib'])
-elif PLATFORM == 'linux':
- serverEnv.Append(
- CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')],
- LINKFLAGS = '-Wl,-rpath,' + FINAL_PREFIX + '/lib')
-
-elif PLATFORM == 'freebsd':
- serverEnv.Append(CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')])
-
-# required libraries
-merge_lib_info(
- serverEnv,
- libraries['sndfile'], libraries['audioapi'])
-
-# optional features
-if features['rendezvous']:
- serverEnv.Append(CPPDEFINES = ['USE_RENDEZVOUS'])
- merge_lib_info(serverEnv, libraries['rendezvous'])
-
-if env['CURL']:
- serverEnv.Append(CPPDEFINES = ['HAVE_LIBCURL'])
- merge_lib_info(serverEnv, libraries['libcurl'])
-
-libscsynthSources = Split('''
-Source/server/Rendezvous.cpp
-Source/server/Samp.cpp
-Source/server/SC_BufGen.cpp
-Source/server/SC_Carbon.cpp
-Source/server/SC_Complex.cpp
-Source/server/SC_ComPort.cpp
-Source/server/SC_CoreAudio.cpp
-Source/server/SC_Dimension.cpp
-Source/server/SC_Errors.cpp
-Source/server/SC_Graph.cpp
-Source/server/SC_GraphDef.cpp
-Source/server/SC_Group.cpp
-Source/server/SC_Lib_Cintf.cpp
-Source/server/SC_Lib.cpp
-Source/server/SC_MiscCmds.cpp
-Source/server/SC_Node.cpp
-Source/server/SC_Rate.cpp
-Source/server/SC_SequencedCommand.cpp
-Source/server/SC_Str4.cpp
-Source/server/SC_SyncCondition.cpp
-Source/server/SC_Unit.cpp
-Source/server/SC_UnitDef.cpp
-Source/server/SC_World.cpp
-''') + libraries['audioapi']['ADDITIONAL_SOURCES']
-
-scsynthSources = ['Source/server/scsynth_main.cpp']
-
-libscsynth = serverEnv.SharedLibrary('build/scsynth', libscsynthSources)
-env.Alias('install-programs', env.Install(lib_dir(INSTALL_PREFIX), [libscsynth]))
-
-libscsynthStaticSources = libscsynthSources + make_static_objects(serverEnv, commonSources, "_libscsynthStatic");
-libscsynthStatic = serverEnv.StaticLibrary('build/scsynth', libscsynthStaticSources)
-env.Alias('install-programs', env.Install(lib_dir(INSTALL_PREFIX), [libscsynthStatic]))
-
-scsynth = serverEnv.Program('build/scsynth', scsynthSources, LIBS = ['scsynth'])
-env.Alias('install-programs', env.Install(bin_dir(INSTALL_PREFIX), [scsynth]))
-
-# ======================================================================
-# Source/plugins
-# ======================================================================
-
-pluginEnv = env.Clone(
- SHLIBPREFIX = '',
- SHLIBSUFFIX = PLUGIN_EXT
- )
-pluginEnv.Append(
- CPPPATH = ['#Headers/common',
- '#Headers/plugin_interface',
- '#Headers/server'],
- PKGCONFIG_NAME = 'libscplugin',
- PKGCONFIG_DESC = 'SuperCollider synthesis plugin headers',
- PKGCONFIG_PREFIX = FINAL_PREFIX,
- #PKGCONFIG_REQUIRES = make_pkgconfig_requires(libraries['scsynth']),
- #PKGCONFIG_LIBS = [],
-# PKGCONFIG_LIBS_PRIVATE = ['-lm', '-lpthread', '-ldl'],
- PKGCONFIG_CFLAGS = ['-D' + PLATFORM_SYMBOL, '-I${includedir}/common', '-I${includedir}/plugin_interface', '-I${includedir}/server']
- )
-if PLATFORM == 'darwin':
- pluginEnv['SHLINKFLAGS'] = '$LINKFLAGS -bundle -flat_namespace -undefined suppress'
-
-# we merge this in even if no libsndfile (it'll pass in the NO_LIBSNDFILE flag)
-merge_lib_info(
- pluginEnv,
- libraries['sndfile'])
-
-
-plugins = []
-
-def make_plugin_target(name):
- return os.path.join('build', 'plugins', name)
-
-# simple plugins
-for name in Split('''
-BinaryOpUGens
-ChaosUGens
-DelayUGens
-DemandUGens
-DynNoiseUGens
-FilterUGens
-GendynUGens
-IOUGens
-LFUGens
-MulAddUGens
-NoiseUGens
-OscUGens
-PanUGens
-PhysicalModelingUGens
-TestUGens
-TriggerUGens
-UnaryOpUGens
-GrainUGens
-ReverbUGens
-'''):
- plugins.append(
- pluginEnv.SharedLibrary(
- make_plugin_target(name), os.path.join('Source', 'plugins', name + '.cpp')))
-
-# complex
-complexEnv = pluginEnv.Clone()
-complexSources = Split('Source/plugins/SCComplex.cpp')
-complexEnv.SharedObject('Source/plugins/SCComplex.o', complexSources)
-
-# fft ugens
-fftEnv = pluginEnv.Clone()
-fftSources = Split('Source/common/SC_fftlib.cpp Source/plugins/SCComplex.o')
-merge_lib_info(fftEnv, libraries['fftwf'])
-plugins.append(
- fftEnv.SharedLibrary(
- make_plugin_target('FFT_UGens'),
- ['Source/plugins/FFTInterfaceTable.cpp',
- 'Source/plugins/FFT_UGens.cpp',
- 'Source/plugins/PV_UGens.cpp',
- 'Source/plugins/PartitionedConvolution.cpp'] + fftSources))
-
-plugins.append(
- fftEnv.SharedLibrary(
- make_plugin_target('PV_ThirdParty'),
- ['Source/plugins/Convolution.cpp',
- 'Source/plugins/FFT2InterfaceTable.cpp',
- 'Source/plugins/FeatureDetection.cpp',
- 'Source/plugins/PV_ThirdParty.cpp'] + fftSources))
-
-# fft 'unpacking' ugens
-plugins.append(
- pluginEnv.SharedLibrary(
- make_plugin_target('UnpackFFTUGens'), ['Source/plugins/SCComplex.o', 'Source/plugins/UnpackFFTUGens.cpp']))
-
-# machine listening ugens
-# fft ugens
-mlEnv = pluginEnv.Clone()
-mlSources = Split('Source/plugins/ML.cpp Source/plugins/Loudness.cpp Source/plugins/BeatTrack.cpp Source/plugins/Onsets.cpp Source/plugins/onsetsds.c Source/plugins/KeyTrack.cpp Source/plugins/MFCC.cpp Source/plugins/SCComplex.o Source/plugins/BeatTrack2.cpp Source/plugins/ML_SpecStats.cpp')
-plugins.append(
- mlEnv.SharedLibrary(
- make_plugin_target('ML_UGens'), mlSources))
-
-# diskio ugens
-if not env['NO_LIBSNDFILE']: # (libsndfile needed for all of these, so skip if unavailable)
- diskIOEnv = pluginEnv.Clone(
- LIBS = ['common', 'm'],
- LIBPATH = 'build'
- )
- if PLATFORM == 'darwin':
- diskIOEnv.Append(
- LINKFLAGS = '-framework CoreServices'
- )
-
- diskIOSources = [
- diskIOEnv.SharedObject('Source/plugins/SC_SyncCondition', 'Source/server/SC_SyncCondition.cpp'),
- 'Source/plugins/DiskIO_UGens.cpp']
- merge_lib_info(diskIOEnv, libraries['sndfile'])
- plugins.append(
- diskIOEnv.SharedLibrary(
- make_plugin_target('DiskIO_UGens'), diskIOSources))
-
-# ui ugens
-if PLATFORM == 'darwin':
- uiUGensEnv = pluginEnv.Clone(
- LIBS = 'm',
- LINKFLAGS = '-framework CoreServices -framework Carbon'
- )
- plugins.append(
- uiUGensEnv.SharedLibrary(make_plugin_target('MouseUGens'), 'Source/plugins/MouseUGens.cpp'))
- plugins.append(
- uiUGensEnv.SharedLibrary(make_plugin_target('KeyboardUGens'), 'Source/plugins/KeyboardUGens.cpp'))
-elif features['x11']:
- uiUGensEnv = pluginEnv.Clone()
- merge_lib_info(uiUGensEnv, libraries['x11'])
- plugins.append(
- uiUGensEnv.SharedLibrary(make_plugin_target('MouseUGens'), 'Source/plugins/MouseUGens.cpp'))
- plugins.append(
- uiUGensEnv.SharedLibrary(make_plugin_target('KeyboardUGens'), 'Source/plugins/KeyboardUGens.cpp'))
-
-env.Alias('install-plugins', env.Install(
- pkg_lib_dir(INSTALL_PREFIX, 'plugins'), plugins))
-
-# ======================================================================
-# Source/lang
-# ======================================================================
-
-if env['TERMINAL_CLIENT'] == True:
- env['TERMINAL_CLIENT'] = 1
-else:
- env['TERMINAL_CLIENT'] = 0
-
-langEnv = env.Clone()
-langEnv.Append(
- CPPPATH = ['#Headers/common',
- '#Headers/plugin_interface',
- '#Headers/lang',
- '#Headers/server',
- '#Source/lang/LangSource/Bison'],
- CPPDEFINES = [['USE_SC_TERMINAL_CLIENT', env['TERMINAL_CLIENT']]],
- LIBPATH = 'build'
- )
-
-if env.get('amd64') and not env.get('SCLANG64'):
- langEnv.Append( CFLAGS = ['-m32'],
- CXXFLAGS = ['-m32'],
- LINKFLAGS = ['-m32'],
- CPPDEFINES = "NO_INTERNAL_SERVER")
-else:
- langEnv.Append(LIBS = ['common', 'scsynth'])
- merge_lib_info(langEnv, libraries['audioapi'])
-
-if PLATFORM == 'windows':
- langEnv.Append(CPPDEFINES = "NO_INTERNAL_SERVER")
-
-# functionality of libdl is included in libc on freebsd
-if PLATFORM == 'freebsd':
- langEnv.Append(LIBS = ['pthread', 'm'])
-else:
- langEnv.Append(LIBS = ['pthread', 'dl', 'm'])
-
-if PLATFORM == 'darwin':
- langEnv.Append(
- LIBS = ['icucore'],
- LINKFLAGS = ['-framework', 'CoreServices'], #'-dylib_install_name', FINAL_PREFIX + '/lib/libsclang.dylib'],
- CPPPATH = ['#xtralibs/include/icu/unicode'])
-elif PLATFORM == 'linux':
- langEnv.Append(
- LINKFLAGS = '-Wl,-rpath,build -Wl,-rpath,' + FINAL_PREFIX + '/lib')
-
- if env.get('amd64') and not env.get('SCLANG64'):
- langEnv.Append(LIBPATH="/emul/ia32-linux/usr/lib/,/usr/lib32/",
- LINKFLAGS = '-Wl,-rpath,/emul/ia32-linux/usr/lib/')
-
-elif PLATFORM == 'freebsd':
- langEnv.Append(
- LINKFLAGS = '-Wl,-rpath,build -Wl,-rpath,' + FINAL_PREFIX + '/lib')
-
-if env['CURL']:
- langEnv.Append(CPPDEFINES = ['HAVE_LIBCURL'])
- merge_lib_info(langEnv, libraries['libcurl'])
-
-if env['READLINE'] and env['LANG'] and env['GPL3']:
- langEnv.Append(CPPDEFINES = ['HAVE_READLINE'])
- merge_lib_info(langEnv, libraries['readline'])
-
-
-libsclangEnv = langEnv.Clone(
- PKGCONFIG_NAME = 'libsclang',
- PKGCONFIG_DESC = 'SuperCollider synthesis language library',
- PKGCONFIG_PREFIX = FINAL_PREFIX,
- PKGCONFIG_REQUIRES = make_pkgconfig_requires(libraries['sndfile']) + ['libscsynth'],
- PKGCONFIG_LIBS = ['-lsclang'],
- PKGCONFIG_CFLAGS = ['-D' + PLATFORM_SYMBOL, '-I${includedir}/common', '-I${includedir}/plugin_interface', '-I${includedir}/lang', '-I${includedir}/server']
- )
-
-# required libraries
-merge_lib_info(langEnv, libraries['sndfile'])
-
-libsclangSources = Split('''
-Source/lang/LangSource/AdvancingAllocPool.cpp
-Source/lang/LangSource/ByteCodeArray.cpp
-Source/lang/LangSource/DumpParseNode.cpp
-Source/lang/LangSource/GC.cpp
-Source/lang/LangSource/InitAlloc.cpp
-Source/lang/LangSource/PyrFileUtils.cpp
-Source/lang/LangSource/PyrInterpreter3.cpp
-Source/lang/LangSource/PyrLexer.cpp
-Source/lang/LangSource/PyrMathOps.cpp
-Source/lang/LangSource/PyrMathSupport.cpp
-Source/lang/LangSource/PyrMessage.cpp
-Source/lang/LangSource/PyrObject.cpp
-Source/lang/LangSource/PyrParseNode.cpp
-Source/lang/LangSource/PyrSignal.cpp
-Source/lang/LangSource/PyrSymbolTable.cpp
-Source/lang/LangSource/SC_LanguageClient.cpp
-Source/lang/LangSource/SC_LibraryConfig.cpp
-Source/lang/LangSource/SC_TerminalClient.cpp
-Source/lang/LangSource/Samp.cpp
-Source/lang/LangSource/SimpleStack.cpp
-Source/lang/LangSource/VMGlobals.cpp
-Source/lang/LangSource/alloca.cpp
-Source/lang/LangSource/dumpByteCodes.cpp
-Source/lang/LangSource/Bison/lang11d_tab.cpp
-Source/lang/LangPrimSource/SC_Wii.cpp
-Source/lang/LangPrimSource/PyrSignalPrim.cpp
-Source/lang/LangPrimSource/PyrSched.cpp
-Source/lang/LangPrimSource/PyrPrimitive.cpp
-Source/lang/LangPrimSource/PyrMathPrim.cpp
-Source/lang/LangPrimSource/SC_ComPort.cpp
-Source/lang/LangPrimSource/OSCData.cpp
-Source/lang/LangPrimSource/PyrArchiver.cpp
-Source/lang/LangPrimSource/PyrArrayPrimitives.cpp
-Source/lang/LangPrimSource/PyrBitPrim.cpp
-Source/lang/LangPrimSource/PyrCharPrim.cpp
-Source/lang/LangPrimSource/PyrFilePrim.cpp
-Source/lang/LangPrimSource/PyrListPrim.cpp
-Source/lang/LangPrimSource/PyrPlatformPrim.cpp
-Source/lang/LangPrimSource/PyrSerialPrim.cpp
-Source/lang/LangPrimSource/PyrStringPrim.cpp
-Source/lang/LangPrimSource/PyrUStringPrim.cpp
-Source/lang/LangPrimSource/PyrSymbolPrim.cpp
-Source/lang/LangPrimSource/PyrUnixPrim.cpp
-Source/common/fftlib.c
-''')
-
-if env['LANG']:
- merge_lib_info(langEnv, libraries['libicu'])
-
-# optional features
-if features['midiapi']:
- merge_lib_info(langEnv, libraries['midiapi'])
- if features['midiapi'] == 'CoreMIDI':
- libsclangSources += ['Source/lang/LangPrimSource/SC_CoreMIDI.cpp']
- else:
- libsclangSources += ['Source/lang/LangPrimSource/SC_AlsaMIDI.cpp']
-else:
- # fallback implementation
- libsclangSources += ['Source/lang/LangPrimSource/SC_AlsaMIDI.cpp']
-
-if PLATFORM == 'darwin':
- langEnv.Append(
- CPPPATH = ['#Source/lang/LangPrimSource/HID_Utilities',
- '#Source/lang/LangPrimSource/WiiMote_OSX'],
- LINKFLAGS = '-framework Carbon -framework IOKit -framework IOBluetooth'
- )
- libsclangSources += Split('''
-Source/lang/LangPrimSource/SC_HID.cpp
-Source/lang/LangPrimSource/SC_CoreAudioPrim.cpp
-Source/lang/LangPrimSource/HID_Utilities/HID_Error_Handler.c
-Source/lang/LangPrimSource/HID_Utilities/HID_Name_Lookup.c
-Source/lang/LangPrimSource/HID_Utilities/HID_Queue_Utilities.c
-Source/lang/LangPrimSource/HID_Utilities/HID_Utilities.c
-Source/lang/LangPrimSource/WiiMote_OSX/wiiremote.c
-''')
-
-if env.has_key('amd64') and env['amd64']:
- libsclangSources += commonSources
-
-if PLATFORM == 'linux':
- # HAVE_LID does the right thing in SC_LID.cpp source
- libsclangSources += ['Source/lang/LangPrimSource/SC_LID.cpp']
- if features['wii']:
- langEnv.Append(CPPDEFINES = 'HAVE_WII')
- langEnv.Append(LINKFLAGS = '-lcwiid')
- #langEnv.Append(LINKFLAGS = '-lbluetooth')
- #langEnv.Append(CPPPATH = '-I/usr/local/include/libcwiimote-0.4.0/libcwiimote/' ) #FIXME: to proper include directory
- if features['lid']:
- langEnv.Append(CPPDEFINES = 'HAVE_LID')
-
-if PLATFORM == 'darwin':
- langEnv.Append(CPPDEFINES = 'HAVE_SPEECH')
- libsclangSources += ['Source/lang/LangPrimSource/SC_Speech.cpp']
-
-sclangSources = ['Source/lang/LangSource/cmdLineFuncs.cpp']
-
-if env['LANG']:
- libsclang = langEnv.SharedLibrary('build/sclang', libsclangSources)
- env.Alias('install-bin', env.Install(lib_dir(INSTALL_PREFIX), [libsclang]))
- if PLATFORM == 'darwin':
- sclangLibs = ['scsynth', 'sclang']
- else:
- sclangLibs = ['sclang']
- sclang = langEnv.Program('build/sclang', sclangSources, LIBS=sclangLibs)
- env.Alias('install-programs', env.Install(bin_dir(INSTALL_PREFIX), [sclang]))
-
-# ======================================================================
-# doc/doxygen
-# ======================================================================
-
-# doxygen = env.Command(None, 'doc/doxygen/html/index.html', 'doxygen doc/doxygen/doxygen.cfg')
-# env.Alias('doxygen', doxygen)
-
-# ======================================================================
-# installation
-# ======================================================================
-
-installEnv = Environment(
- ALL = ['install-bin', 'install-data'],
- BIN = ['install-plugins', 'install-programs'],
- DATA = ['install-doc']
- )
-if env['LANG']:
- installEnv.Append(DATA = ['install-library'])
-
-if is_installing():
- # class library
- env.Alias('install-library', install_dir(
- env, 'build/SCClassLibrary',
- pkg_data_dir(INSTALL_PREFIX),
- SC_FILE_RE, 1))
- # help files
- env.Alias('install-library', install_dir(
- env, 'build/Help',
- pkg_data_dir(INSTALL_PREFIX),
- HELP_FILE_RE, 1))
- # example files
- env.Alias('install-library', install_dir(
- env, 'build/examples',
- pkg_data_dir(INSTALL_PREFIX),
- HELP_FILE_RE, 1))
- # scel
- if env['SCEL']:
- env.Alias('install-library', install_dir(
- env, 'editors/scel/sc',
- pkg_extension_dir(INSTALL_PREFIX, 'scide_scel'),
- SC_FILE_RE, 3))
- # scvim
-# if env['SCVIM']:
-# env.Alias('install-library', install_dir(
-# env, 'editors/scvim/scclasses',
-# pkg_extension_dir(INSTALL_PREFIX, 'scvim'),
-# SC_FILE_RE, 3))
-# # scvim helpfiles
-# if env['SCVIM']:
-# env.Alias('install-library', install_dir(
-# env, 'editors/scvim/cache/doc',
-# pkg_data_dir(INSTALL_PREFIX, 'scvim-help'),
-# HELP_FILE_RE, 4))
-
-#scvim : unhtml help files
-#if env['SCVIM']:
- #os.execvpe("editors/scvim/bin/scvim_make_help", [ "-c", "-s", "build/Help"],"SCVIM=editors/scvim/")
- #os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
-
-#if env['SCVIM']:
- #vimenv = env.Clone()
- #SConscript('editors/test/SConstruct', exports=['vimenv'])
-
-#if env['SCVIM']:
- #print 'installing scvim'
- #vimenv = env.Clone()
- ##env.Append(FROMTOP=True)
- #SConscript('editors/scvim/SConstruct', exports=['vimenv'])
-
-#### scvim and sced scripts need to be called independently, until someone fixes setting the proper variables from the parent script
-
-if env['SCVIM']:
- print '----------------------------------------------------'
-# SConscript('editors/scvim/SConstruct', exports=['env'])
- print 'To install SCVIM, please use scons in the directory editors/scvim/'
-
-if env['SCED']:
-# SConscript('editors/sced/SConstruct', 'env')
- print '----------------------------------------------------'
- print 'To install SCED, please use the scons in the directory editors/sced/'
-
-# scel
-if env['SCEL']:
- env.Command('editors/scel/el/sclang-vars.el', 'editors/scel/el/sclang-vars.el.in',
- 'sed \'s,@PKG_DATA_DIR@,%s,g\' < $SOURCE > $TARGET' %
- pkg_data_dir(FINAL_PREFIX))
- el_files = glob.glob('editors/scel/el/*.el') + ['editors/scel/el/sclang-vars.el']
- elc_files = map(lambda f: os.path.splitext(f)[0] + '.elc', el_files)
- elisp_dir = os.path.join(INSTALL_PREFIX, 'share', 'emacs', 'site-lisp')
- env.Command(elc_files, el_files,
- 'emacs -batch --eval "(add-to-list \'load-path (expand-file-name \\"editors/scel/el/\\"))" -f batch-byte-compile $SOURCES')
- env.Alias('install-elisp', env.Install(elisp_dir, el_files + elc_files))
- installEnv.Append(DATA = 'install-elisp')
-
-# example library configuration file
-env.Command('linux/examples/sclang.cfg', 'linux/examples/sclang.cfg.in',
- 'sed \'s,@PKG_DATA_DIR@,%s,g\' < $SOURCE > $TARGET' %
- pkg_data_dir(FINAL_PREFIX))
-
-# headers
-if env['DEVELOPMENT']:
- header_dirs = Split('common plugin_interface server lang')
- if PLATFORM == 'darwin':
- header_dirs += 'app'
- for d in header_dirs:
- env.Alias('install-dev', install_dir(
- env, os.path.join('Headers', d),
- pkg_include_dir(INSTALL_PREFIX),
- re.compile('.*\.h(h|pp)?'), 1)
- )
- # other useful headers
- env.Alias('install-dev',
- env.Install(pkg_include_dir(INSTALL_PREFIX, 'plugin_interface'), 'Source/plugins/FFT_UGens.h'))
- pkgconfig_files = [
- libscsynthEnv.Command('linux/libscsynth.pc', 'SConstruct',
- build_pkgconfig_file),
- libsclangEnv.Command('linux/libsclang.pc', 'SConstruct',
- build_pkgconfig_file),
- pluginEnv.Command('linux/libscplugin.pc', 'SConstruct',
- build_pkgconfig_file)]
- pkgconfig_dir = os.path.join(lib_dir(INSTALL_PREFIX), 'pkgconfig')
- env.Alias('install-dev', env.Install(pkgconfig_dir, pkgconfig_files))
- installEnv.Append(ALL = 'install-dev')
-
-# documentation
-if is_installing():
- # TODO: build html documentation?
- doc_dir = pkg_doc_dir(INSTALL_PREFIX)
- env.Alias('install-doc',
- install_dir(env, 'doc', doc_dir, ANY_FILE_RE, 0) +
- install_dir(env, 'build/examples', doc_dir, ANY_FILE_RE, 1) +
- install_dir(env, 'build/TestingAndToDo', doc_dir, ANY_FILE_RE, 1))
-
-env.Alias('install-bin', installEnv['BIN'])
-env.Alias('install-data', installEnv['DATA'])
-env.Alias('install', installEnv['ALL'])
-
-# ======================================================================
-# distribution
-# ======================================================================
-
-DIST_FILES = Split('''
-COPYING
-SConstruct
-clean-compile.sh
-compile.sh
-distro
-linux/examples/onetwoonetwo.sc
-linux/examples/sclang.cfg.in
-linux/examples/sclang.sc
-editors/scel/README
-editors/scvim/README
-editors/sced/README
-scsynthlib_exp
-''')
-
-DIST_SPECS = [
- ('build', HELP_FILE_RE),
- ('Headers', SRC_FILE_RE),
- ('editors/scel/sc', SC_FILE_RE),
- ('editors/scel/el', re.compile('.*\.el$')),
- ('editors/scvim/scclasses', SC_FILE_RE),
- ('Source', SRC_FILE_RE)
- ]
-
-def dist_paths():
- paths = DIST_FILES[:]
- specs = DIST_SPECS[:]
- while specs:
- base, re = specs.pop()
- if not re: re = ANY_FILE_RE
- for root, dirs, files in os.walk(base):
- if 'CVS' in dirs: dirs.remove('CVS')
- if '.svn' in dirs: dirs.remove('.svn')
- for path in dirs[:]:
- if re.match(path):
- specs.append((os.path.join(root, path), re))
- dirs.remove(path)
- for path in files:
- if re.match(path):
- paths.append(os.path.join(root, path))
- paths.sort()
- return paths
-
-def build_tar(env, target, source):
- paths = dist_paths()
- tarfile_name = str(target[0])
- tar_name = os.path.splitext(os.path.basename(tarfile_name))[0]
- tar = tarfile.open(tarfile_name, "w:bz2")
- for path in paths:
- tar.add(path, os.path.join(tar_name, path))
- tar.close()
-
-if 'dist' in COMMAND_LINE_TARGETS:
- env.Alias('dist', env['TARBALL'])
- env.Command(env['TARBALL'], 'SConstruct', build_tar)
-
-# ======================================================================
-# cleanup
-# ======================================================================
-
-if 'scrub' in COMMAND_LINE_TARGETS:
- env.Clean('scrub', Split('config.log scache.conf .sconf_temp'))
-
-# ======================================================================
-# configuration summary
-# ======================================================================
-
-def yesorno(p):
- if p: return 'yes'
- else: return 'no'
-
-print '------------------------------------------------------------------------'
-print ' ALTIVEC: %s' % yesorno(features['altivec'])
-print ' AUDIOAPI: %s' % features['audioapi']
-print ' MIDIAPI: %s' % features['midiapi']
-print ' DEBUG: %s' % yesorno(env['DEBUG'])
-# print ' DESTDIR: %s' % env['DESTDIR']
-print ' DEVELOPMENT: %s' % yesorno(env['DEVELOPMENT'])
-print ' LANG: %s' % yesorno(env['LANG'])
-print ' LID: %s' % yesorno(features['lid'])
-print ' NO_LIBSNDFILE: %s' % yesorno(env['NO_LIBSNDFILE'])
-print ' WII: %s' % yesorno(features['wii'])
-print ' PREFIX: %s' % env['PREFIX']
-print ' RENDEZVOUS: %s' % yesorno(features['rendezvous'])
-print ' SCEL: %s' % yesorno(env['SCEL'])
-print ' SCVIM: %s' % yesorno(env['SCVIM'])
-print ' SCED: %s' % yesorno(env['SCED'])
-print ' SSE: %s' % yesorno(features['sse'])
-print ' STRIP: %s' % yesorno(env['STRIP'])
-print ' CROSSCOMPILE: %s' % yesorno(env['CROSSCOMPILE'])
-print ' TERMINAL_CLIENT: %s' % yesorno(env['TERMINAL_CLIENT'])
-print ' X11: %s' % yesorno(features['x11'])
-print ' GPL3: %s' % yesorno(env['GPL3'])
-print ' SCLANG64: %s' % yesorno(env.get('SCLANG64'))
-print '------------------------------------------------------------------------'
-
-# ======================================================================
-# EOF
-

Deleted: trunk/clean-compile.sh
===================================================================
--- trunk/clean-compile.sh 2010-02-09 18:24:05 UTC (rev 9820)
+++ trunk/clean-compile.sh 2010-02-09 18:57:58 UTC (rev 9821)
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# This script cleans all targets, then invokes compile.sh
-
-# clean
-echo "Cleaning scsynth..."
-xcodebuild -project Synth.xcodeproj -target "All" $* clean || exit
-
-echo "Cleaning plugins..."
-xcodebuild -project Plugins.xcodeproj -target "All" $* clean || exit
-
-echo "Cleaning sclang..."
-xcodebuild -project Language.xcodeproj -target "All" $* clean || exit
-
-echo "Clean Done."
-
-# Now let compile.sh do its job:
-./compile.sh $*

Property changes on: trunk/common/Headers
___________________________________________________________________
Added: svn:mergeinfo
+

Property changes on: trunk/common/Psycollider
___________________________________________________________________
Added: svn:mergeinfo
+

Copied: trunk/common/SConstruct (from rev 9819, trunk/SConstruct)
===================================================================
--- trunk/common/SConstruct (rev 0)
+++ trunk/common/SConstruct 2010-02-09 18:57:58 UTC (rev 9821)
@@ -0,0 +1,1401 @@
+# -*- python -*- =======================================================
+# FILE: SConstruct
+# CONTENTS: scons build script for SuperCollider
+# AUTHOR: sk AT k-hornz DOT de
+# modifications: nescivi AT gmail DOT com
+# ======================================================================
+
+# ======================================================================
+# NOTE: Please use an indentation level of 4 spaces, i.e. no mixing of
+# tabs and spaces.
+# ======================================================================
+
+# ======================================================================
+# setup
+# ======================================================================
+
+EnsureSConsVersion(0,96)
+EnsurePythonVersion(2,3)
+SConsignFile()
+
+# ======================================================================
+# imports
+# ======================================================================
+
+import glob
+import os
+import subprocess
+import re
+import types
+import tarfile
+import platform # Seems to have more portable uname() than os
+
+# ======================================================================
+# constants
+# ======================================================================
+
+PACKAGE = 'SuperCollider'
+
+
+
+f = open('VERSION')
+VERSION = f.readline()
+f.close()
+
+def short_cpu_name(cpu):
+ if cpu == 'Power Macintosh':
+ cpu = 'ppc'
+ return cpu.lower()
+
+PLATFORM = platform.uname()[0].lower()
+CPU = short_cpu_name(platform.uname()[4])
+
+ANY_FILE_RE = re.compile('.*')
+HELP_FILE_RE = re.compile('.*\.(rtf(d)?|scd|html)$')
+SC_FILE_RE = re.compile('.*\.sc$')
+SRC_FILE_RE = re.compile('.*\.(c(pp)|h)$')
+
+if PLATFORM == 'darwin':
+ PLATFORM_SYMBOL = 'SC_DARWIN'
+ PLUGIN_EXT = '.scx'
+ DEFAULT_AUDIO_API = 'coreaudio'
+ DEFAULT_PREFIX = '/usr/local'
+elif PLATFORM == 'freebsd':
+ PLATFORM_SYMBOL = 'SC_FREEBSD'
+ PLUGIN_EXT = '.so'
+ DEFAULT_AUDIO_API = 'jack'
+ DEFAULT_PREFIX = '/usr/local'
+elif PLATFORM == 'linux':
+ PLATFORM_SYMBOL = 'SC_LINUX'
+ PLUGIN_EXT = '.so'
+ DEFAULT_AUDIO_API = 'jack'
+ DEFAULT_PREFIX = '/usr/local'
+elif PLATFORM == 'windows':
+ PLATFORM_SYMBOL = 'SC_WIN32'
+ PLUGIN_EXT = '.scx'
+ DEFAULT_AUDIO_API = 'portaudio'
+ DEFAULT_PREFIX = '/'
+else:
+ print 'Unknown platform: %s' % PLATFORM
+ Exit(1)
+
+if CPU in [ 'ppc' , 'ppc64' ]:
+ DEFAULT_OPT_ARCH = '7450'
+elif CPU in [ 'i586', 'i686' ]:
+ # FIXME: better detection
+ DEFAULT_OPT_ARCH = CPU
+else:
+ DEFAULT_OPT_ARCH = None
+
+if PLATFORM != 'windows':
+ subprocess.call(['sh', 'setMainVersion.sh'])
+
+
+# ======================================================================
+# util
+# ======================================================================
+
+
+def make_os_env(*keys):
+ env = os.environ
+ res = {}
+ for key in keys:
+ if env.has_key(key):
+ res[key] = env[key]
+ return res
+
+def CheckPKGConfig(context, version):
+ context.Message( 'Checking for pkg-config... ' )
+ ret = context.TryAction('pkg-config --atleast-pkgconfig-version=%s' % version)[0]
+ context.Result( ret )
+ return ret
+
+def CheckPKG(context, name):
+ context.Message('Checking for %s... ' % name)
+ ret = context.TryAction('pkg-config --exists \'%s\'' % name)[0]
+ res = None
+ if ret:
+ res = Environment(ENV = make_os_env('PATH', 'PKG_CONFIG_PATH'))
+ res.ParseConfig('pkg-config --cflags --libs \'%s\'' % name)
+ res['PKGCONFIG'] = name
+ context.Result(ret)
+ return (ret, res)
+
+def get_new_pkg_env():
+ return Environment(ENV = make_os_env('PATH', 'PKG_CONFIG_PATH'))
+
+def merge_lib_info(env, *others):
+ for other in others:
+ env.AppendUnique(CCFLAGS = other.get('CCFLAGS', []))
+ env.AppendUnique(CPPDEFINES = other.get('CPPDEFINES', []))
+ env.AppendUnique(CPPPATH = other.get('CPPPATH', []))
+ env.AppendUnique(CXXFLAGS = other.get('CXXFLAGS', []))
+ env.AppendUnique(LIBS = other.get('LIBS', []))
+ env.AppendUnique(LIBPATH = other.get('LIBPATH', []))
+ env['LINKFLAGS'] = env['LINKFLAGS'] + other.get('LINKFLAGS', "")
+
+def make_pkgconfig_requires(*envs):
+ res = []
+ for env in envs:
+ if env and env.has_key('PKGCONFIG'):
+ res.append(env['PKGCONFIG'])
+ return res
+
+def build_pkgconfig_file(target, source, env):
+ def write_field(file, name, prefix, separator=None):
+ if env.has_key(name):
+ if separator:
+ content = separator.join(env[name])
+ else:
+ content = env[name]
+ file.write('%s%s\n' % (prefix, content))
+ out = file(str(target[0]), 'w')
+ out.writelines([
+ 'prefix=%s\n' % env['PREFIX'],
+ 'exec_prefix=${prefix}\n',
+ 'libdir=${exec_prefix}/lib\n',
+ 'includedir=${prefix}/include/%s\n' % env['PACKAGE'],
+ '\n'])
+ write_field(out, 'PKGCONFIG_NAME', 'Name: ')
+ write_field(out, 'PKGCONFIG_DESC', 'Description: ')
+ write_field(out, 'URL', 'URL: ')
+ write_field(out, 'VERSION', 'Version: ')
+ write_field(out, 'PKGCONFIG_REQUIRES', 'Requires: ', ', ')
+ write_field(out, 'PKGCONFIG_REQUIRES_PRIVATE', 'Requires.private: ', ', ')
+ write_field(out, 'PKGCONFIG_LIBS', 'Libs: -L${libdir} ', ' ')
+ write_field(out, 'PKGCONFIG_LIBS_PRIVATE', 'Libs.private: ', ' ')
+ write_field(out, 'PKGCONFIG_CFLAGS', 'Cflags: ', ' ')
+ out.close()
+
+def flatten_dir(dir):
+ res = []
+ for root, dirs, files in os.walk(dir):
+ if 'CVS' in dirs: dirs.remove('CVS')
+ if '.svn' in dirs: dirs.remove('.svn')
+ for f in files:
+ res.append(os.path.join(root, f))
+ return res
+
+def install_dir(env, src_dir, dst_dir, filter_re, strip_levels=0):
+ nodes = []
+ for root, dirs, files in os.walk(src_dir):
+ src_paths = []
+ dst_paths = []
+ if 'CVS' in dirs: dirs.remove('CVS')
+ if '.svn' in dirs: dirs.remove('.svn')
+ for d in dirs[:]:
+ if filter_re.match(d):
+ src_paths += flatten_dir(os.path.join(root, d))
+ dirs.remove(d)
+ for f in files:
+ if filter_re.match(f):
+ src_paths.append(os.path.join(root, f))
+ dst_paths += map(
+ lambda f:
+ os.path.join(
+ dst_dir,
+ *f.split(os.path.sep)[strip_levels:]),
+ src_paths)
+ nodes += env.InstallAs(dst_paths, src_paths)
+ return nodes
+
+def is_installing():
+ pat = re.compile('^install.*$')
+ for x in COMMAND_LINE_TARGETS:
+ if pat.match(x): return True
+ return False
+
+def is_home_directory(dir):
+ return os.path.normpath(dir) == os.path.normpath(os.environ.get('HOME', '/'))
+
+def bin_dir(prefix):
+ return os.path.join(prefix, 'bin')
+def lib_dir(prefix):
+ return os.path.join(prefix, 'lib')
+
+def pkg_data_dir(prefix, *args):
+ if PLATFORM == 'darwin':
+ base = '/Library/Application Support'
+ if is_home_directory(prefix):
+ base = os.path.join(prefix, base)
+ else:
+ base = os.path.join(prefix, 'share')
+ return os.path.join(base, PACKAGE, *args)
+def pkg_doc_dir(prefix, *args):
+ if PLATFORM == 'darwin':
+ base = '/Library/Documentation'
+ if is_home_directory(prefix):
+ base = os.path.join(prefix, base)
+ else:
+ base = os.path.join(prefix, 'share', 'doc')
+ return os.path.join(base, PACKAGE, *args)
+def pkg_include_dir(prefix, *args):
+ return os.path.join(prefix, 'include', PACKAGE, *args)
+def pkg_lib_dir(prefix, *args):
+ return os.path.join(lib_dir(prefix), PACKAGE, *args)
+
+def pkg_classlib_dir(prefix, *args):
+ return pkg_data_dir(prefix, 'SCClassLibrary', *args)
+def pkg_extension_dir(prefix, *args):
+ return pkg_data_dir(prefix, 'Extensions', *args)
+
+def make_opt_flags(env):
+ flags = [
+ "-O3",
+ ## "-fomit-frame-pointer", # can behave strangely for sclang
+ "-ffast-math",
+ "-fno-finite-math-only",
+ "-fstrength-reduce"
+ ]
+ arch = env.get('OPT_ARCH')
+ if arch:
+ if CPU in [ 'ppc' , 'ppc64' ]:
+ flags.extend([ "-mcpu=%s" % (arch,) ])
+ else:
+ flags.extend([ "-march=%s" % (arch,) ])
+ if CPU in [ 'ppc' , 'ppc64' ]:
+ flags.extend([ "-fsigned-char", "-mhard-float",
+ ## "-mpowerpc-gpopt", # crashes sqrt
+ "-mpowerpc-gfxopt"
+ ])
+ return flags
+
+def make_static_object(env, source, postfix="_a"):
+ obj = os.path.splitext(source)[0] + postfix
+ return env.StaticObject(obj, source)
+
+def make_static_objects(env, sources, postfix="_a"):
+ return map(lambda x: make_static_object(env, x, postfix), sources)
+
+# ======================================================================
+# command line options
+# ======================================================================
+
+opts = Options('scache.conf', ARGUMENTS)
+opts.AddOptions(
+ BoolOption('ALSA',
+ 'Build with ALSA sequencer support', 1),
+ BoolOption('ALTIVEC',
+ 'Build with Altivec support', 1),
+ ('OPT_ARCH', 'Architecture to optimize for', DEFAULT_OPT_ARCH),
+ EnumOption('AUDIOAPI',
+ 'Build with specified audio API support',
+ DEFAULT_AUDIO_API, ('jack', 'coreaudio', 'portaudio')),
+ ('CC', 'C compiler executable'),
+ ('CCFLAGS', 'C compiler flags'),
+ ('CXX', 'C++ compiler executable'),
+ ('CXXFLAGS', 'C++ compiler flags'),
+ BoolOption('DEBUG',
+ 'Build with debugging information', 0),
+ PathOption('DESTDIR',
+ 'Intermediate installation prefix for packaging', '/'),
+ BoolOption('DEVELOPMENT',
+ 'Build and install the development files', 0),
+ BoolOption('FFTW',
+ 'Use the FFTW libraries', PLATFORM != 'darwin'),
+ BoolOption('JACK_DLL',
+ 'Build with delay locked loop support', 0),
+ BoolOption('JACK_DEBUG_DLL',
+ 'Build with delay locked loop debugging support', 0),
+ BoolOption('LANG',
+ 'Build the language application', 1),
+ BoolOption('LID',
+ 'Build with Linux Input Device support [linux]', PLATFORM == 'linux'),
+ BoolOption('NO_LIBSNDFILE',
+ 'Disable libsndfile (audio file reading/writing)', 0),
+ BoolOption('WII',
+ 'Build with Linux WII support [linux]', PLATFORM == 'linux'),
+ PathOption('PREFIX',
+ 'Installation prefix', DEFAULT_PREFIX),
+ BoolOption('RENDEZVOUS',
+ 'Enable Zeroconf/Rendezvous.', 1),
+ BoolOption('SCEL',
+ 'Enable the SCEL user interface; NOTE for the HTML help system you need emacs-w3m', 1),
+ BoolOption('SCVIM',
+ 'Enable the SCVIM user interface; NOTE see the README in /editors/scvim for setting variables', 1),
+ BoolOption('SCED',
+ 'Enable the SCED (based on gedit) user interface; NOTE see the README in /editors/sced for setting variables', 0),
+ BoolOption('SSE',
+ 'Build with SSE support', 1),
+ BoolOption('SSE2',
+ 'Build with SSE2 support', 1),
+ BoolOption('STRIP',
+ 'Strip symbols from binaries', 0),
+ BoolOption('CROSSCOMPILE',
+ 'Crosscompile for another platform (does not do SSE support check)', 0),
+ BoolOption('TERMINAL_CLIENT',
+ 'Build with terminal client interface', 1),
+ BoolOption('CURL',
+ 'Build with libcurl - allows server to load files from remote servers by URL', 0),
+ BoolOption('READLINE',
+ 'Build with GNU readline for nice command-line sclang interface', PLATFORM == 'linux'),
+ BoolOption('GPL3',
+ 'Allow the inclusion of gpl-3 licensed code. Makes the license of the whole package gpl-3', 1),
+ PackageOption('X11',
+ 'Build with X11 support', 1),
+ BoolOption('SCLANG64',
+ 'Build 64bit sclang (only affects compilation on 64bit systems)', 0),
+ )
+
+if PLATFORM == 'darwin':
+ opts.AddOptions(
+ BoolOption('UNIVERSAL',
+ 'Build universal binaries (see UNIVERSAL_ARCHS)', 1),
+ BoolOption('INTERNAL_LIBSNDFILE',
+ 'Use internal version of libsndfile', 1),
+# ListOption('UNIVERSAL_ARCHS',
+# 'Architectures to build for',
+# 'all', ['ppc', 'i386'])
+ )
+
+# ======================================================================
+# basic environment
+# ======================================================================
+
+env = Environment(options = opts,
+ ENV = make_os_env('PATH', 'PKG_CONFIG_PATH'),
+ PACKAGE = PACKAGE,
+ VERSION = VERSION,
+ URL = 'http://supercollider.sourceforge.net',
+ TARBALL = PACKAGE + VERSION + '.tbz2')
+env.Append(PATH = ['/usr/local/bin', '/usr/bin', '/bin'])
+
+# for nova-simd
+env.Append(CPPPATH = ["xtralibs/include/nova-simd"])
+env.Append(CPPDEFINES = ["NOVA_SIMD"])
+
+if not env['GPL3']:
+ env.Append(CPPDEFINES = ["NO_GPL3_CODE"])
+ if env['READLINE']:
+ print 'WARNING: option READLINE is on and option GPL3 is off, yet readline is GPL3+ licensed, so it will NOT be activated.'
+
+# checks for DISTCC and CCACHE as used in modern linux-distros:
+
+if os.path.exists('/usr/lib/distcc/bin'):
+ os.environ['PATH'] = '/usr/lib/distcc/bin:' + os.environ['PATH']
+ #env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS']
+ env['ENV']['DISTCC_HOSTS'] = os.environ.get('DISTCC_HOSTS')
+
+if os.path.exists('/usr/lib/ccache/bin'):
+ os.environ['PATH'] = '/usr/lib/ccache/bin:' + os.environ['PATH']
+ #env['ENV']['CCACHE_DIR'] = os.environ['CCACHE_DIR']
+ env['ENV']['CCACHE_DIR'] = os.environ.get('CCACHE_DIR')
+
+env['ENV']['PATH'] = os.environ['PATH']
+if PLATFORM == 'windows':
+ env['ENV']['HOME'] = os.environ['HOMEPATH']
+else:
+ env['ENV']['HOME'] = os.environ['HOME']
+
+if PLATFORM == 'linux':
+ env['amd64'] = 'x86_64' in platform.uname()
+ if env['amd64']:
+ print "we are on amd64 linux"
+
+
+# ======================================================================
+# installation directories
+# ======================================================================
+
+FINAL_PREFIX = '$PREFIX'
+INSTALL_PREFIX = os.path.join('$DESTDIR', '$PREFIX')
+
+if env['PREFIX'] == '/usr':
+ FINAL_CONFIG_PREFIX = '/etc'
+else:
+ FINAL_CONFIG_PREFIX = os.path.join(env['PREFIX'], 'etc')
+CONFIG_PREFIX = '$DESTDIR' + FINAL_CONFIG_PREFIX
+
+env.Append(
+ CPPDEFINES = [('SC_DATA_DIR', '\\"' + pkg_data_dir(FINAL_PREFIX) + '\\"')])
+
+# ======================================================================
+# configuration
+# ======================================================================
+
+def make_conf(env):
+ return Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig,
+ 'CheckPKG' : CheckPKG })
+
+def isDefaultBuild():
+ return not env.GetOption('clean') and not 'debian' in COMMAND_LINE_TARGETS
+
+conf = make_conf(env)
+
+# libraries
+libraries = { }
+features = { }
+
+if isDefaultBuild():
+ if not conf.CheckPKGConfig('0'):
+ print 'pkg-config not found.'
+ Exit(1)
+
+ # sndfile
+ if env['NO_LIBSNDFILE']:
+ libraries['sndfile'] = Environment(CPPDEFINES = ['NO_LIBSNDFILE'])
+ else:
+ if PLATFORM == 'darwin' and env['INTERNAL_LIBSNDFILE']:
+ libraries['sndfile'] = Environment(LINKFLAGS = ['xtralibs/mac/scUBlibsndfile.a'],
+ CPPPATH = ['#xtralibs/include/libsndfile'])
+ else:
+ success, libraries['sndfile'] = conf.CheckPKG('sndfile >= 1.0.16')
+ if not success: Exit(1)
+ succes2, libraries['sndfile18'] = conf.CheckPKG('sndfile >= 1.0.18')
+ if succes2:
+ libraries['sndfile'].Append(CPPDEFINES = ['LIBSNDFILE_1018'])
+
+ # libcurl
+ success, libraries['libcurl'] = conf.CheckPKG('libcurl >= 7')
+ if env['CURL'] and not success:
+ print 'CURL option was set, but libcurl not found.'
+ Exit(1)
+
+ # FFTW
+ libraries['fftwf'] = Environment()
+ if env['FFTW']:
+ success, libraries['fftwf'] = conf.CheckPKG('fftw3f')
+ if success:
+ libraries['fftwf'].Append(CPPDEFINES = ['SC_FFT_FFTW'])
+ else:
+ libraries['fftwf'].Append(CPPDEFINES = ['SC_FFT_NONE'])
+ else:
+ libraries['fftwf'].Append(CPPDEFINES = ['SC_FFT_NONE'])
+ if PLATFORM == 'darwin':
+ # needed for vector multiplication
+ libraries['fftwf'] = Environment(LINKFLAGS = '-framework vecLib')
+else:
+ libraries['sndfile'] = get_new_pkg_env()
+ libraries['fftwf'] = get_new_pkg_env()
+ libraries['libcurl'] = get_new_pkg_env()
+
+# audio api
+if env['AUDIOAPI'] == 'jack':
+ features['audioapi'] = 'Jack'
+ success, libraries['audioapi'] = conf.CheckPKG('jack >= 0.100')
+ if success:
+ libraries['audioapi'].Append(
+ CPPDEFINES = [('SC_AUDIO_API', 'SC_AUDIO_API_JACK')],
+ ADDITIONAL_SOURCES = ['Source/server/SC_Jack.cpp']
+ )
+ else:
+ success, libraries['audioapi'] = conf.CheckPKG('jack')
+ if isDefaultBuild():
+ if not success: Exit(1)
+ else:
+ libraries['audioapi'] = get_new_pkg_env()
+ libraries['audioapi'].Append(
+ CPPDEFINES = [('SC_AUDIO_API', 'SC_AUDIO_API_JACK'),
+ 'SC_USE_JACK_CLIENT_NEW'],
+ ADDITIONAL_SOURCES = ['Source/server/SC_Jack.cpp']
+ )
+ libraries['audioapi'].Append(
+ CPPDEFINES = [('SC_JACK_USE_DLL', env['JACK_DLL']),
+ ('SC_JACK_DEBUG_DLL', env['JACK_DEBUG_DLL'])]
+ )
+elif env['AUDIOAPI'] == 'coreaudio':
+ features['audioapi'] = 'CoreAudio'
+ libraries['audioapi'] = Environment(
+ CPPDEFINES = [('SC_AUDIO_API', 'SC_AUDIO_API_COREAUDIO')],
+ LINKFLAGS = '-framework CoreAudio',
+ ADDITIONAL_SOURCES = []
+ )
+elif env['AUDIOAPI'] == 'portaudio':
+ features['audioapi'] = 'Portaudio'
+ libraries['audioapi'] = Environment(
+ CPPDEFINES = [('SC_AUDIO_API', 'SC_AUDIO_API_PORTAUDIO')],
+ LIBS = ['portaudio'],
+ ADDITIONAL_SOURCES = []
+ )
+
+# rendezvous
+if env['RENDEZVOUS']:
+ features['rendezvous'], libraries['rendezvous'] = conf.CheckPKG('avahi-client')
+ if features['rendezvous']:
+ libraries['rendezvous'].Append(CPPDEFINES = ['HAVE_AVAHI'])
+ else:
+ features['rendezvous'], libraries['rendezvous'] = conf.CheckPKG('howl')
+ if features['rendezvous']:
+ libraries['rendezvous'].Append(CPPDEFINES = ['HAVE_HOWL'])
+else:
+ features['rendezvous'] = False
+ libraries['rendezvous'] = False
+
+# alsa
+if env['ALSA']:
+ features['alsa'], libraries['alsa'] = conf.CheckPKG('alsa')
+else:
+ features['alsa'] = False
+
+if features['alsa']:
+ libraries['alsa'].Append(CPPDEFINES = ['HAVE_ALSA'])
+
+# midi
+if conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/CoreMIDI.h'):
+ features['midiapi'] = 'CoreMIDI'
+ libraries['midiapi'] = Environment(
+ LINKFLAGS = '-framework CoreMIDI',
+ )
+elif features['alsa']:
+ features['midiapi'] = 'ALSA'
+ libraries['midiapi'] = libraries['alsa'].Clone()
+else:
+ features['midiapi'] = None
+
+# lid
+features['lid'] = env['LID'] and conf.CheckCHeader('linux/input.h')
+
+# wii on linux
+if PLATFORM == 'linux':
+ features['wii'] = env['WII'] and conf.CheckCHeader('cwiid.h')
+else:
+ features['wii'] = env['WII']
+
+# libicu
+if env['LANG']:
+ if PLATFORM == 'darwin' or conf.CheckCHeader('unicode/uregex.h'):
+ libraries['libicu'] = Environment(
+ LINKFLAGS = '-licui18n -licuuc -licudata',
+ )
+ else:
+ print "libicu not found"
+ Exit(1)
+
+# readline
+if env['LANG'] and env['READLINE'] and env['GPL3']:
+ if conf.CheckCHeader('readline/readline.h'):
+ libraries['readline'] = Environment(
+ LINKFLAGS = '-lreadline',
+ )
+ else:
+ print "libreadline not found"
+ Exit(1)
+
+# only _one_ Configure context can be alive at a time
+env = conf.Finish()
+
+# altivec
+if env['ALTIVEC']:
+ if PLATFORM == 'darwin':
+ altivec_flags = [ '-faltivec' ]
+ else:
+ altivec_flags = [ '-maltivec', '-mabi=altivec' ]
+ libraries['altivec'] = env.Clone()
+ libraries['altivec'].Append(
+ CCFLAGS = altivec_flags,
+ CPPDEFINES = [('SC_MEMORY_ALIGNMENT', 16)])
+ altiConf = Configure(libraries['altivec'])
+ features['altivec'] = altiConf.CheckCHeader('altivec.h')
+ altiConf.Finish()
+else:
+ features['altivec'] = False
+
+# sse
+if env['SSE']:
+ libraries['sse'] = env.Clone()
+ libraries['sse'].Append(
+ CCFLAGS = ['-msse', '-mfpmath=sse'],
+ CPPDEFINES = [('SC_MEMORY_ALIGNMENT', 16)])
+ if env['SSE2']:
+ libraries['sse'].Append(
+ CCFLAGS = ['-msse2'])
+
+ sseConf = Configure(libraries['sse'])
+ hasSSEHeader = sseConf.CheckCHeader('xmmintrin.h')
+ if env['CROSSCOMPILE']:
+ build_host_supports_sse = True
+ print 'NOTICE: cross compiling for another platform: assuming SSE support'
+ else:
+ build_host_supports_sse = False
+ #if CPU != 'ppc':
+ if CPU not in [ 'ppc' , 'ppc64' ]:
+ if PLATFORM == 'freebsd':
+ machine_info = os.popen ("sysctl -a hw.instruction_sse").read()[:-1]
+ x86_flags = 'no'
+ if "1" in [x for x in machine_info]:
+ build_host_supports_sse = True
+ x86_flags = 'sse'
+ elif PLATFORM != 'darwin':
+ flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
+ x86_flags = flag_line.split (": ")[1:][0].split ()
+ else:
+ machine_info = os.popen ("sysctl -a machdep.cpu").read()[:-1]
+ x86_flags = machine_info.split()
+ if "sse" in [x.lower() for x in x86_flags]:
+ build_host_supports_sse = True
+ print 'NOTICE: CPU has SSE support'
+ else:
+ print 'NOTICE: CPU does not have SSE support'
+ features['sse'] = hasSSEHeader and build_host_supports_sse
+ sseConf.Finish()
+else:
+ features['sse'] = False
+
+if env['X11']:
+# features['x11'], libraries['x11'] = conf.CheckPKG('xt')
+ if type(env['X11']) != types.StringType:
+ if os.path.exists('/usr/X11R6'):
+ env['X11'] = '/usr/X11R6'
+ elif os.path.exists('/usr/lib/X11'):
+ env['X11'] = '/usr/lib/X11'
+ else: env['X11'] = '/usr'
+ x11Env = Environment(
+ CPPPATH = [os.path.join(env['X11'], 'include')],
+ LIBPATH = [os.path.join(env['X11'], 'lib')])
+ x11Conf = Configure(x11Env)
+ features['x11'] = x11Conf.CheckCHeader('X11/Intrinsic.h') \
+ and x11Conf.CheckLib('X11', 'XQueryPointer')
+ libraries['x11'] = x11Conf.Finish()
+else:
+ features['x11'] = False
+
+
+opts.Save('scache.conf', env)
+Help(opts.GenerateHelpText(env))
+
+# defines and compiler flags
+
+env.Append(
+ CPPDEFINES = [ '_REENTRANT', PLATFORM_SYMBOL ],
+ CCFLAGS = [ '-Wno-unknown-pragmas' ],
+ CXXFLAGS = [ '-Wno-deprecated' ]
+ )
+
+# debugging flags
+if env['DEBUG']:
+ env.Append(CCFLAGS = '-g')
+else:
+ env.Append(
+ CCFLAGS = make_opt_flags(env),
+ CPPDEFINES = ['NDEBUG'])
+ if env['STRIP']:
+ env.Append(LINKFLAGS = "-Wl,-s")
+
+# platform specific
+if False: #PLATFORM == 'darwin':
+ # universal binary support
+ if env['UNIVERSAL']:
+ archs = map(lambda x: ['-arch', x], ['ppc', 'i386'])
+ env.Append(
+ CCFLAGS = archs,
+ LINKFLAGS = archs
+ )
+
+# vectorization
+if features['altivec']:
+ merge_lib_info(env, libraries['altivec'])
+elif features['sse']:
+ merge_lib_info(env, libraries['sse'])
+else:
+ env.AppendUnique(CPPDEFINES = [('SC_MEMORY_ALIGNMENT', 1)])
+
+# ======================================================================
+# Source/common
+# ======================================================================
+
+commonEnv = env.Clone()
+commonEnv.Append(
+ CPPPATH = ['#Headers/common',
+ '#Headers/plugin_interface',
+ '#Headers/server'],
+ CCFLAGS = ['-fPIC'],
+ CXXFLAGS = ['-fPIC']
+ )
+
+# strtod
+conf = Configure(commonEnv)
+if conf.CheckFunc('strtod'):
+ commonEnv.Append(
+ CPPDEFINES = 'HAVE_STRTOD'
+ )
+commonEnv = conf.Finish()
+
+
+# ======================================================================
+# back to common
+# ======================================================================
+
+commonSources = Split('''
+Source/common/SC_AllocPool.cpp
+Source/common/SC_DirUtils.cpp
+Source/common/SC_Sem.cpp
+Source/common/SC_StringBuffer.cpp
+Source/common/SC_StringParser.cpp
+Source/common/scsynthsend.cpp
+Source/common/sc_popen.cpp
+''')
+if PLATFORM == 'darwin':
+ commonSources += [
+ 'Source/common/SC_StandAloneInfo_Darwin.cpp'
+ ]
+if env['CURL']:
+ commonEnv.Append(CPPDEFINES = ['HAVE_LIBCURL'])
+ merge_lib_info(commonEnv, libraries['libcurl'])
+libcommon = commonEnv.Library('build/common', commonSources)
+
+#if env['amd64']:
+ #commonSources32 = list(commonSources)
+ #commonEnv32 = commonEnv.Clone()
+ #commonEnv32.Append(
+ #CCFLAGS = ['-m32'],
+ #)
+ #libcommon32 = commonEnv32.Library('build/common32', commonSources32)
+
+
+# ======================================================================
+# Source/server
+# ======================================================================
+
+serverEnv = env.Clone()
+serverEnv.Append(
+ CPPPATH = ['#Headers/common',
+ '#Headers/plugin_interface',
+ '#Headers/server'],
+ CPPDEFINES = [('SC_PLUGIN_DIR', '\\"' + pkg_lib_dir(FINAL_PREFIX, 'plugins') + '\\"'), ('SC_PLUGIN_EXT', '\\"' + PLUGIN_EXT + '\\"')],
+ LIBPATH = 'build')
+libscsynthEnv = serverEnv.Clone(
+ PKGCONFIG_NAME = 'libscsynth',
+ PKGCONFIG_DESC = 'SuperCollider synthesis server library',
+ PKGCONFIG_PREFIX = FINAL_PREFIX,
+ PKGCONFIG_REQUIRES = make_pkgconfig_requires(libraries['sndfile'],
+ libraries['audioapi'],
+ libraries['rendezvous']),
+ PKGCONFIG_LIBS = ['-lscsynth'],
+# PKGCONFIG_LIBS_PRIVATE = ['-lm', '-lpthread', '-ldl'],
+ PKGCONFIG_CFLAGS = ['-D' + PLATFORM_SYMBOL, '-I${includedir}/common', '-I${includedir}/plugin_interface', '-I${includedir}/server']
+ )
+
+# platform specific
+
+# functionality of libdl is included in libc on freebsd
+if PLATFORM == 'freebsd':
+ serverEnv.Append(LIBS = ['common', 'pthread'])
+else:
+ serverEnv.Append(LIBS = ['common', 'pthread', 'dl'])
+
+if PLATFORM == 'darwin':
+ serverEnv.Append(
+ LINKFLAGS = [
+ '-framework', 'CoreServices'])
+ #'-dylib_install_name', FINAL_PREFIX + '/lib/libsclang.dylib'])
+elif PLATFORM == 'linux':
+ serverEnv.Append(
+ CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')],
+ LINKFLAGS = '-Wl,-rpath,' + FINAL_PREFIX + '/lib')
+
+elif PLATFORM == 'freebsd':
+ serverEnv.Append(CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')])
+
+# required libraries
+merge_lib_info(
+ serverEnv,
+ libraries['sndfile'], libraries['audioapi'])
+
+# optional features
+if features['rendezvous']:
+ serverEnv.Append(CPPDEFINES = ['USE_RENDEZVOUS'])
+ merge_lib_info(serverEnv, libraries['rendezvous'])
+
+if env['CURL']:
+ serverEnv.Append(CPPDEFINES = ['HAVE_LIBCURL'])
+ merge_lib_info(serverEnv, libraries['libcurl'])
+
+libscsynthSources = Split('''
+Source/server/Rendezvous.cpp
+Source/server/Samp.cpp
+Source/server/SC_BufGen.cpp
+Source/server/SC_Carbon.cpp
+Source/server/SC_Complex.cpp
+Source/server/SC_ComPort.cpp
+Source/server/SC_CoreAudio.cpp
+Source/server/SC_Dimension.cpp
+Source/server/SC_Errors.cpp
+Source/server/SC_Graph.cpp
+Source/server/SC_GraphDef.cpp
+Source/server/SC_Group.cpp
+Source/server/SC_Lib_Cintf.cpp
+Source/server/SC_Lib.cpp
+Source/server/SC_MiscCmds.cpp
+Source/server/SC_Node.cpp
+Source/server/SC_Rate.cpp
+Source/server/SC_SequencedCommand.cpp
+Source/server/SC_Str4.cpp
+Source/server/SC_SyncCondition.cpp
+Source/server/SC_Unit.cpp
+Source/server/SC_UnitDef.cpp
+Source/server/SC_World.cpp
+''') + libraries['audioapi']['ADDITIONAL_SOURCES']
+
+scsynthSources = ['Source/server/scsynth_main.cpp']
+
+libscsynth = serverEnv.SharedLibrary('build/scsynth', libscsynthSources)
+env.Alias('install-programs', env.Install(lib_dir(INSTALL_PREFIX), [libscsynth]))
+
+libscsynthStaticSources = libscsynthSources + make_static_objects(serverEnv, commonSources, "_libscsynthStatic");
+libscsynthStatic = serverEnv.StaticLibrary('build/scsynth', libscsynthStaticSources)
+env.Alias('install-programs', env.Install(lib_dir(INSTALL_PREFIX), [libscsynthStatic]))
+
+scsynth = serverEnv.Program('build/scsynth', scsynthSources, LIBS = ['scsynth'])
+env.Alias('install-programs', env.Install(bin_dir(INSTALL_PREFIX), [scsynth]))
+
+# ======================================================================
+# Source/plugins
+# ======================================================================
+
+pluginEnv = env.Clone(
+ SHLIBPREFIX = '',
+ SHLIBSUFFIX = PLUGIN_EXT
+ )
+pluginEnv.Append(
+ CPPPATH = ['#Headers/common',
+ '#Headers/plugin_interface',
+ '#Headers/server'],
+ PKGCONFIG_NAME = 'libscplugin',
+ PKGCONFIG_DESC = 'SuperCollider synthesis plugin headers',
+ PKGCONFIG_PREFIX = FINAL_PREFIX,
+ #PKGCONFIG_REQUIRES = make_pkgconfig_requires(libraries['scsynth']),
+ #PKGCONFIG_LIBS = [],
+# PKGCONFIG_LIBS_PRIVATE = ['-lm', '-lpthread', '-ldl'],
+ PKGCONFIG_CFLAGS = ['-D' + PLATFORM_SYMBOL, '-I${includedir}/common', '-I${includedir}/plugin_interface', '-I${includedir}/server']
+ )
+if PLATFORM == 'darwin':
+ pluginEnv['SHLINKFLAGS'] = '$LINKFLAGS -bundle -flat_namespace -undefined suppress'
+
+# we merge this in even if no libsndfile (it'll pass in the NO_LIBSNDFILE flag)
+merge_lib_info(
+ pluginEnv,
+ libraries['sndfile'])
+
+
+plugins = []
+
+def make_plugin_target(name):
+ return os.path.join('build', 'plugins', name)
+
+# simple plugins
+for name in Split('''
+BinaryOpUGens
+ChaosUGens
+DelayUGens
+DemandUGens
+DynNoiseUGens
+FilterUGens
+GendynUGens
+IOUGens
+LFUGens
+MulAddUGens
+NoiseUGens
+OscUGens
+PanUGens
+PhysicalModelingUGens
+TestUGens
+TriggerUGens
+UnaryOpUGens
+GrainUGens
+ReverbUGens
+'''):
+ plugins.append(
+ pluginEnv.SharedLibrary(
+ make_plugin_target(name), os.path.join('Source', 'plugins', name + '.cpp')))
+
+# complex
+complexEnv = pluginEnv.Clone()
+complexSources = Split('Source/plugins/SCComplex.cpp')
+complexEnv.SharedObject('Source/plugins/SCComplex.o', complexSources)
+
+# fft ugens
+fftEnv = pluginEnv.Clone()
+fftSources = Split('Source/common/SC_fftlib.cpp Source/plugins/SCComplex.o')
+merge_lib_info(fftEnv, libraries['fftwf'])
+plugins.append(
+ fftEnv.SharedLibrary(
+ make_plugin_target('FFT_UGens'),
+ ['Source/plugins/FFTInterfaceTable.cpp',
+ 'Source/plugins/FFT_UGens.cpp',
+ 'Source/plugins/PV_UGens.cpp',
+ 'Source/plugins/PartitionedConvolution.cpp'] + fftSources))
+
+plugins.append(
+ fftEnv.SharedLibrary(
+ make_plugin_target('PV_ThirdParty'),
+ ['Source/plugins/Convolution.cpp',
+ 'Source/plugins/FFT2InterfaceTable.cpp',
+ 'Source/plugins/FeatureDetection.cpp',
+ 'Source/plugins/PV_ThirdParty.cpp'] + fftSources))
+
+# fft 'unpacking' ugens
+plugins.append(
+ pluginEnv.SharedLibrary(
+ make_plugin_target('UnpackFFTUGens'), ['Source/plugins/SCComplex.o', 'Source/plugins/UnpackFFTUGens.cpp']))
+
+# machine listening ugens
+# fft ugens
+mlEnv = pluginEnv.Clone()
+mlSources = Split('Source/plugins/ML.cpp Source/plugins/Loudness.cpp Source/plugins/BeatTrack.cpp Source/plugins/Onsets.cpp Source/plugins/onsetsds.c Source/plugins/KeyTrack.cpp Source/plugins/MFCC.cpp Source/plugins/SCComplex.o Source/plugins/BeatTrack2.cpp Source/plugins/ML_SpecStats.cpp')
+plugins.append(
+ mlEnv.SharedLibrary(
+ make_plugin_target('ML_UGens'), mlSources))
+
+# diskio ugens
+if not env['NO_LIBSNDFILE']: # (libsndfile needed for all of these, so skip if unavailable)
+ diskIOEnv = pluginEnv.Clone(
+ LIBS = ['common', 'm'],
+ LIBPATH = 'build'
+ )
+ if PLATFORM == 'darwin':
+ diskIOEnv.Append(
+ LINKFLAGS = '-framework CoreServices'
+ )
+
+ diskIOSources = [
+ diskIOEnv.SharedObject('Source/plugins/SC_SyncCondition', 'Source/server/SC_SyncCondition.cpp'),
+ 'Source/plugins/DiskIO_UGens.cpp']
+ merge_lib_info(diskIOEnv, libraries['sndfile'])
+ plugins.append(
+ diskIOEnv.SharedLibrary(
+ make_plugin_target('DiskIO_UGens'), diskIOSources))
+
+# ui ugens
+if PLATFORM == 'darwin':
+ uiUGensEnv = pluginEnv.Clone(
+ LIBS = 'm',
+ LINKFLAGS = '-framework CoreServices -framework Carbon'
+ )
+ plugins.append(
+ uiUGensEnv.SharedLibrary(make_plugin_target('MouseUGens'), 'Source/plugins/MouseUGens.cpp'))
+ plugins.append(
+ uiUGensEnv.SharedLibrary(make_plugin_target('KeyboardUGens'), 'Source/plugins/KeyboardUGens.cpp'))
+elif features['x11']:
+ uiUGensEnv = pluginEnv.Clone()
+ merge_lib_info(uiUGensEnv, libraries['x11'])
+ plugins.append(
+ uiUGensEnv.SharedLibrary(make_plugin_target('MouseUGens'), 'Source/plugins/MouseUGens.cpp'))
+ plugins.append(
+ uiUGensEnv.SharedLibrary(make_plugin_target('KeyboardUGens'), 'Source/plugins/KeyboardUGens.cpp'))
+
+env.Alias('install-plugins', env.Install(
+ pkg_lib_dir(INSTALL_PREFIX, 'plugins'), plugins))
+
+# ======================================================================
+# Source/lang
+# ======================================================================
+
+if env['TERMINAL_CLIENT'] == True:
+ env['TERMINAL_CLIENT'] = 1
+else:
+ env['TERMINAL_CLIENT'] = 0
+
+langEnv = env.Clone()
+langEnv.Append(
+ CPPPATH = ['#Headers/common',
+ '#Headers/plugin_interface',
+ '#Headers/lang',
+ '#Headers/server',
+ '#Source/lang/LangSource/Bison'],
+ CPPDEFINES = [['USE_SC_TERMINAL_CLIENT', env['TERMINAL_CLIENT']]],
+ LIBPATH = 'build'
+ )
+
+if env.get('amd64') and not env.get('SCLANG64'):
+ langEnv.Append( CFLAGS = ['-m32'],
+ CXXFLAGS = ['-m32'],
+ LINKFLAGS = ['-m32'],
+ CPPDEFINES = "NO_INTERNAL_SERVER")
+else:
+ langEnv.Append(LIBS = ['common', 'scsynth'])
+ merge_lib_info(langEnv, libraries['audioapi'])
+
+if PLATFORM == 'windows':
+ langEnv.Append(CPPDEFINES = "NO_INTERNAL_SERVER")
+
+# functionality of libdl is included in libc on freebsd
+if PLATFORM == 'freebsd':
+ langEnv.Append(LIBS = ['pthread', 'm'])
+else:
+ langEnv.Append(LIBS = ['pthread', 'dl', 'm'])
+
+if PLATFORM == 'darwin':
+ langEnv.Append(
+ LIBS = ['icucore'],
+ LINKFLAGS = ['-framework', 'CoreServices'], #'-dylib_install_name', FINAL_PREFIX + '/lib/libsclang.dylib'],
+ CPPPATH = ['#xtralibs/include/icu/unicode'])
+elif PLATFORM == 'linux':
+ langEnv.Append(
+ LINKFLAGS = '-Wl,-rpath,build -Wl,-rpath,' + FINAL_PREFIX + '/lib')
+
+ if env.get('amd64') and not env.get('SCLANG64'):
+ langEnv.Append(LIBPATH="/emul/ia32-linux/usr/lib/,/usr/lib32/",
+ LINKFLAGS = '-Wl,-rpath,/emul/ia32-linux/usr/lib/')
+
+elif PLATFORM == 'freebsd':
+ langEnv.Append(
+ LINKFLAGS = '-Wl,-rpath,build -Wl,-rpath,' + FINAL_PREFIX + '/lib')
+
+if env['CURL']:
+ langEnv.Append(CPPDEFINES = ['HAVE_LIBCURL'])
+ merge_lib_info(langEnv, libraries['libcurl'])
+
+if env['READLINE'] and env['LANG'] and env['GPL3']:
+ langEnv.Append(CPPDEFINES = ['HAVE_READLINE'])
+ merge_lib_info(langEnv, libraries['readline'])
+
+
+libsclangEnv = langEnv.Clone(
+ PKGCONFIG_NAME = 'libsclang',
+ PKGCONFIG_DESC = 'SuperCollider synthesis language library',
+ PKGCONFIG_PREFIX = FINAL_PREFIX,
+ PKGCONFIG_REQUIRES = make_pkgconfig_requires(libraries['sndfile']) + ['libscsynth'],
+ PKGCONFIG_LIBS = ['-lsclang'],
+ PKGCONFIG_CFLAGS = ['-D' + PLATFORM_SYMBOL, '-I${includedir}/common', '-I${includedir}/plugin_interface', '-I${includedir}/lang', '-I${includedir}/server']
+ )
+
+# required libraries
+merge_lib_info(langEnv, libraries['sndfile'])
+
+libsclangSources = Split('''
+Source/lang/LangSource/AdvancingAllocPool.cpp
+Source/lang/LangSource/ByteCodeArray.cpp
+Source/lang/LangSource/DumpParseNode.cpp
+Source/lang/LangSource/GC.cpp
+Source/lang/LangSource/InitAlloc.cpp
+Source/lang/LangSource/PyrFileUtils.cpp
+Source/lang/LangSource/PyrInterpreter3.cpp
+Source/lang/LangSource/PyrLexer.cpp
+Source/lang/LangSource/PyrMathOps.cpp
+Source/lang/LangSource/PyrMathSupport.cpp
+Source/lang/LangSource/PyrMessage.cpp
+Source/lang/LangSource/PyrObject.cpp
+Source/lang/LangSource/PyrParseNode.cpp
+Source/lang/LangSource/PyrSignal.cpp
+Source/lang/LangSource/PyrSymbolTable.cpp
+Source/lang/LangSource/SC_LanguageClient.cpp
+Source/lang/LangSource/SC_LibraryConfig.cpp
+Source/lang/LangSource/SC_TerminalClient.cpp
+Source/lang/LangSource/Samp.cpp
+Source/lang/LangSource/SimpleStack.cpp
+Source/lang/LangSource/VMGlobals.cpp
+Source/lang/LangSource/alloca.cpp
+Source/lang/LangSource/dumpByteCodes.cpp
+Source/lang/LangSource/Bison/lang11d_tab.cpp
+Source/lang/LangPrimSource/SC_Wii.cpp
+Source/lang/LangPrimSource/PyrSignalPrim.cpp
+Source/lang/LangPrimSource/PyrSched.cpp
+Source/lang/LangPrimSource/PyrPrimitive.cpp
+Source/lang/LangPrimSource/PyrMathPrim.cpp
+Source/lang/LangPrimSource/SC_ComPort.cpp
+Source/lang/LangPrimSource/OSCData.cpp
+Source/lang/LangPrimSource/PyrArchiver.cpp
+Source/lang/LangPrimSource/PyrArrayPrimitives.cpp
+Source/lang/LangPrimSource/PyrBitPrim.cpp
+Source/lang/LangPrimSource/PyrCharPrim.cpp
+Source/lang/LangPrimSource/PyrFilePrim.cpp
+Source/lang/LangPrimSource/PyrListPrim.cpp
+Source/lang/LangPrimSource/PyrPlatformPrim.cpp
+Source/lang/LangPrimSource/PyrSerialPrim.cpp
+Source/lang/LangPrimSource/PyrStringPrim.cpp
+Source/lang/LangPrimSource/PyrUStringPrim.cpp
+Source/lang/LangPrimSource/PyrSymbolPrim.cpp
+Source/lang/LangPrimSource/PyrUnixPrim.cpp
+Source/common/fftlib.c
+''')
+
+if env['LANG']:
+ merge_lib_info(langEnv, libraries['libicu'])
+
+# optional features
+if features['midiapi']:
+ merge_lib_info(langEnv, libraries['midiapi'])
+ if features['midiapi'] == 'CoreMIDI':
+ libsclangSources += ['Source/lang/LangPrimSource/SC_CoreMIDI.cpp']
+ else:
+ libsclangSources += ['Source/lang/LangPrimSource/SC_AlsaMIDI.cpp']
+else:
+ # fallback implementation
+ libsclangSources += ['Source/lang/LangPrimSource/SC_AlsaMIDI.cpp']
+
+if PLATFORM == 'darwin':
+ langEnv.Append(
+ CPPPATH = ['#Source/lang/LangPrimSource/HID_Utilities',
+ '#Source/lang/LangPrimSource/WiiMote_OSX'],
+ LINKFLAGS = '-framework Carbon -framework IOKit -framework IOBluetooth'
+ )
+ libsclangSources += Split('''
+Source/lang/LangPrimSource/SC_HID.cpp
+Source/lang/LangPrimSource/SC_CoreAudioPrim.cpp
+Source/lang/LangPrimSource/HID_Utilities/HID_Error_Handler.c
+Source/lang/LangPrimSource/HID_Utilities/HID_Name_Lookup.c
+Source/lang/LangPrimSource/HID_Utilities/HID_Queue_Utilities.c
+Source/lang/LangPrimSource/HID_Utilities/HID_Utilities.c
+Source/lang/LangPrimSource/WiiMote_OSX/wiiremote.c
+''')
+
+if env.has_key('amd64') and env['amd64']:
+ libsclangSources += commonSources
+
+if PLATFORM == 'linux':
+ # HAVE_LID does the right thing in SC_LID.cpp source
+ libsclangSources += ['Source/lang/LangPrimSource/SC_LID.cpp']
+ if features['wii']:
+ langEnv.Append(CPPDEFINES = 'HAVE_WII')
+ langEnv.Append(LINKFLAGS = '-lcwiid')
+ #langEnv.Append(LINKFLAGS = '-lbluetooth')
+ #langEnv.Append(CPPPATH = '-I/usr/local/include/libcwiimote-0.4.0/libcwiimote/' ) #FIXME: to proper include directory
+ if features['lid']:
+ langEnv.Append(CPPDEFINES = 'HAVE_LID')
+
+if PLATFORM == 'darwin':
+ langEnv.Append(CPPDEFINES = 'HAVE_SPEECH')
+ libsclangSources += ['Source/lang/LangPrimSource/SC_Speech.cpp']
+
+sclangSources = ['Source/lang/LangSource/cmdLineFuncs.cpp']
+
+if env['LANG']:
+ libsclang = langEnv.SharedLibrary('build/sclang', libsclangSources)
+ env.Alias('install-bin', env.Install(lib_dir(INSTALL_PREFIX), [libsclang]))
+ if PLATFORM == 'darwin':
+ sclangLibs = ['scsynth', 'sclang']
+ else:
+ sclangLibs = ['sclang']
+ sclang = langEnv.Program('build/sclang', sclangSources, LIBS=sclangLibs)
+ env.Alias('install-programs', env.Install(bin_dir(INSTALL_PREFIX), [sclang]))
+
+# ======================================================================
+# doc/doxygen
+# ======================================================================
+
+# doxygen = env.Command(None, 'doc/doxygen/html/index.html', 'doxygen doc/doxygen/doxygen.cfg')
+# env.Alias('doxygen', doxygen)
+
+# ======================================================================
+# installation
+# ======================================================================
+
+installEnv = Environment(
+ ALL = ['install-bin', 'install-data'],
+ BIN = ['install-plugins', 'install-programs'],
+ DATA = ['install-doc']
+ )
+if env['LANG']:
+ installEnv.Append(DATA = ['install-library'])
+
+if is_installing():
+ # class library
+ env.Alias('install-library', install_dir(
+ env, 'build/SCClassLibrary',
+ pkg_data_dir(INSTALL_PREFIX),
+ SC_FILE_RE, 1))
+ # help files
+ env.Alias('install-library', install_dir(
+ env, 'build/Help',
+ pkg_data_dir(INSTALL_PREFIX),
+ HELP_FILE_RE, 1))
+ # example files
+ env.Alias('install-library', install_dir(
+ env, 'build/examples',
+ pkg_data_dir(INSTALL_PREFIX),
+ HELP_FILE_RE, 1))
+ # scel
+ if env['SCEL']:
+ env.Alias('install-library', install_dir(
+ env, 'editors/scel/sc',
+ pkg_extension_dir(INSTALL_PREFIX, 'scide_scel'),
+ SC_FILE_RE, 3))
+ # scvim
+# if env['SCVIM']:
+# env.Alias('install-library', install_dir(
+# env, 'editors/scvim/scclasses',
+# pkg_extension_dir(INSTALL_PREFIX, 'scvim'),
+# SC_FILE_RE, 3))
+# # scvim helpfiles
+# if env['SCVIM']:
+# env.Alias('install-library', install_dir(
+# env, 'editors/scvim/cache/doc',
+# pkg_data_dir(INSTALL_PREFIX, 'scvim-help'),
+# HELP_FILE_RE, 4))
+
+#scvim : unhtml help files
+#if env['SCVIM']:
+ #os.execvpe("editors/scvim/bin/scvim_make_help", [ "-c", "-s", "build/Help"],"SCVIM=editors/scvim/")
+ #os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
+
+#if env['SCVIM']:
+ #vimenv = env.Clone()
+ #SConscript('editors/test/SConstruct', exports=['vimenv'])
+
+#if env['SCVIM']:
+ #print 'installing scvim'
+ #vimenv = env.Clone()
+ ##env.Append(FROMTOP=True)
+ #SConscript('editors/scvim/SConstruct', exports=['vimenv'])
+
+#### scvim and sced scripts need to be called independently, until someone fixes setting the proper variables from the parent script
+
+if env['SCVIM']:
+ print '----------------------------------------------------'
+# SConscript('editors/scvim/SConstruct', exports=['env'])
+ print 'To install SCVIM, please use scons in the directory editors/scvim/'
+
+if env['SCED']:
+# SConscript('editors/sced/SConstruct', 'env')
+ print '----------------------------------------------------'
+ print 'To install SCED, please use the scons in the directory editors/sced/'
+
+# scel
+if env['SCEL']:
+ env.Command('editors/scel/el/sclang-vars.el', 'editors/scel/el/sclang-vars.el.in',
+ 'sed \'s,@PKG_DATA_DIR@,%s,g\' < $SOURCE > $TARGET' %
+ pkg_data_dir(FINAL_PREFIX))
+ el_files = glob.glob('editors/scel/el/*.el') + ['editors/scel/el/sclang-vars.el']
+ elc_files = map(lambda f: os.path.splitext(f)[0] + '.elc', el_files)
+ elisp_dir = os.path.join(INSTALL_PREFIX, 'share', 'emacs', 'site-lisp')
+ env.Command(elc_files, el_files,
+ 'emacs -batch --eval "(add-to-list \'load-path (expand-file-name \\"editors/scel/el/\\"))" -f batch-byte-compile $SOURCES')
+ env.Alias('install-elisp', env.Install(elisp_dir, el_files + elc_files))
+ installEnv.Append(DATA = 'install-elisp')
+
+# example library configuration file
+env.Command('linux/examples/sclang.cfg', 'linux/examples/sclang.cfg.in',
+ 'sed \'s,@PKG_DATA_DIR@,%s,g\' < $SOURCE > $TARGET' %
+ pkg_data_dir(FINAL_PREFIX))
+
+# headers
+if env['DEVELOPMENT']:
+ header_dirs = Split('common plugin_interface server lang')
+ if PLATFORM == 'darwin':
+ header_dirs += 'app'
+ for d in header_dirs:
+ env.Alias('install-dev', install_dir(
+ env, os.path.join('Headers', d),
+ pkg_include_dir(INSTALL_PREFIX),
+ re.compile('.*\.h(h|pp)?'), 1)
+ )
+ # other useful headers
+ env.Alias('install-dev',
+ env.Install(pkg_include_dir(INSTALL_PREFIX, 'plugin_interface'), 'Source/plugins/FFT_UGens.h'))
+ pkgconfig_files = [
+ libscsynthEnv.Command('linux/libscsynth.pc', 'SConstruct',
+ build_pkgconfig_file),
+ libsclangEnv.Command('linux/libsclang.pc', 'SConstruct',
+ build_pkgconfig_file),
+ pluginEnv.Command('linux/libscplugin.pc', 'SConstruct',
+ build_pkgconfig_file)]
+ pkgconfig_dir = os.path.join(lib_dir(INSTALL_PREFIX), 'pkgconfig')
+ env.Alias('install-dev', env.Install(pkgconfig_dir, pkgconfig_files))
+ installEnv.Append(ALL = 'install-dev')
+
+# documentation
+if is_installing():
+ # TODO: build html documentation?
+ doc_dir = pkg_doc_dir(INSTALL_PREFIX)
+ env.Alias('install-doc',
+ install_dir(env, 'doc', doc_dir, ANY_FILE_RE, 0) +
+ install_dir(env, 'build/examples', doc_dir, ANY_FILE_RE, 1) +
+ install_dir(env, 'build/TestingAndToDo', doc_dir, ANY_FILE_RE, 1))
+
+env.Alias('install-bin', installEnv['BIN'])
+env.Alias('install-data', installEnv['DATA'])
+env.Alias('install', installEnv['ALL'])
+
+# ======================================================================
+# distribution
+# ======================================================================
+
+DIST_FILES = Split('''
+COPYING
+SConstruct
+clean-compile.sh
+compile.sh
+distro
+linux/examples/onetwoonetwo.sc
+linux/examples/sclang.cfg.in
+linux/examples/sclang.sc
+editors/scel/README
+editors/scvim/README
+editors/sced/README
+scsynthlib_exp
+''')
+
+DIST_SPECS = [
+ ('build', HELP_FILE_RE),
+ ('Headers', SRC_FILE_RE),
+ ('editors/scel/sc', SC_FILE_RE),
+ ('editors/scel/el', re.compile('.*\.el$')),
+ ('editors/scvim/scclasses', SC_FILE_RE),
+ ('Source', SRC_FILE_RE)
+ ]
+
+def dist_paths():
+ paths = DIST_FILES[:]
+ specs = DIST_SPECS[:]
+ while specs:
+ base, re = specs.pop()
+ if not re: re = ANY_FILE_RE
+ for root, dirs, files in os.walk(base):
+ if 'CVS' in dirs: dirs.remove('CVS')
+ if '.svn' in dirs: dirs.remove('.svn')
+ for path in dirs[:]:
+ if re.match(path):
+ specs.append((os.path.join(root, path), re))
+ dirs.remove(path)
+ for path in files:
+ if re.match(path):
+ paths.append(os.path.join(root, path))
+ paths.sort()
+ return paths
+
+def build_tar(env, target, source):
+ paths = dist_paths()
+ tarfile_name = str(target[0])
+ tar_name = os.path.splitext(os.path.basename(tarfile_name))[0]
+ tar = tarfile.open(tarfile_name, "w:bz2")
+ for path in paths:
+ tar.add(path, os.path.join(tar_name, path))
+ tar.close()
+
+if 'dist' in COMMAND_LINE_TARGETS:
+ env.Alias('dist', env['TARBALL'])
+ env.Command(env['TARBALL'], 'SConstruct', build_tar)
+
+# ======================================================================
+# cleanup
+# ======================================================================
+
+if 'scrub' in COMMAND_LINE_TARGETS:
+ env.Clean('scrub', Split('config.log scache.conf .sconf_temp'))
+
+# ======================================================================
+# configuration summary
+# ======================================================================
+
+def yesorno(p):
+ if p: return 'yes'
+ else: return 'no'
+
+print '------------------------------------------------------------------------'
+print ' ALTIVEC: %s' % yesorno(features['altivec'])
+print ' AUDIOAPI: %s' % features['audioapi']
+print ' MIDIAPI: %s' % features['midiapi']
+print ' DEBUG: %s' % yesorno(env['DEBUG'])
+# print ' DESTDIR: %s' % env['DESTDIR']
+print ' DEVELOPMENT: %s' % yesorno(env['DEVELOPMENT'])
+print ' LANG: %s' % yesorno(env['LANG'])
+print ' LID: %s' % yesorno(features['lid'])
+print ' NO_LIBSNDFILE: %s' % yesorno(env['NO_LIBSNDFILE'])

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

show default server?

2009-05-16T09:20:34Z

hi all,

I find the question 'which server is currently default' occurs really often,
and is a regular source of confusion for students. It occurred to me that the
server windows should just show that.

below the diff for an attempt - ok like that?
any better ideas? opinions?

best, adc

Index: Control/Server.sc
===================================================================
--- Control/Server.sc (revision 9164)
+++ Control/Server.sc (working copy)
@@ -185,7 +185,7 @@
}

Server : Model {
- classvar <>local, <>internal, <>default, <>named, <>set, <>program;
+ classvar <>local, <>internal, <default, <>named, <>set, <>program;

var <name, <>addr, <clientID=0;
var <isLocal, <inProcess, <>sendQuit, <>remoteControlled;
@@ -212,6 +212,12 @@

var <pid;

+ *default_ { |server, sync_s = false|
+ default = server; // sync with s?
+ if (sync_s, { thisProcess.interpreter.s = server });
+ this.all.do(_.changed(\default));
+ }
+

Index: GUI/PlusGUI/Control/ServerPlusGUI.sc
===================================================================
--- GUI/PlusGUI/Control/ServerPlusGUI.sc (revision 9164)
+++ GUI/PlusGUI/Control/ServerPlusGUI.sc (working copy)
@@ -15,7 +15,7 @@
}

makeGui { arg w;
- var active, booter, killer, makeDefault, running,
booting, stopped, bundling;
+ var active, booter, killer, makeDefault, running,
booting, stopped, bundling, showDefault;
var recorder, scoper;
var countsViews, ctlr;
var dumping = false, label, gui, font, volumeNum;
@@ -68,12 +68,10 @@
makeDefault = gui.button.new(w, Rect(0,0, 54, 18));
makeDefault.font = font;
makeDefault.canFocus = false;
- makeDefault.states = [["-> default", Color.black,
Color.clear]];
- makeDefault.action = {
- thisProcess.interpreter.s = this;
- Server.default = this;
- };
-
+ makeDefault.states = [["-> default", Color.black,
Color.clear], ["-> default", Color.black, Color.green.alpha_(0.2)]];
+ makeDefault.value_((this == Server.default).binaryValue);
+ makeDefault.action = { Server.default_(this, true) };
+
//w.view.decorator.nextLine;

recorder = gui.button.new(w, Rect(0,0, 66, 18));
@@ -169,6 +167,7 @@
window = nil;
ctlr.remove;
};
+
},{
running = {
active.stringColor_(Color.new255(74, 120, 74));
@@ -202,6 +201,12 @@
ctlr.remove;
};
});
+
+ showDefault = {
+ "// Server.default: % - s: % //
\n\n".postf(Server.default, thisProcess.interpreter.s);
+ makeDefault.value = (Server.default ==
this).binaryValue;
+ };
+
if(serverRunning,running,stopped);

w.view.decorator.nextLine;
@@ -288,8 +293,10 @@
if (unicode == 16rF700, {
slider.increment; });
if (unicode == 16rF703, {
slider.increment; });
if (unicode == 16rF701, {
slider.decrement; });
- if (unicode == 16rF702, {
slider.decrement; }); nil;
- });
+ if (unicode == 16rF702, {
slider.decrement; });
+ nil;
+ })
+ ;
volController = SimpleController(volume)
.put(\amp, {|changer, what, vol|
{
@@ -325,7 +332,9 @@
.put(\cmdPeriod,{
recorder.setProperty(\value,0);
})
- .put(\bundling, bundling);
+ .put(\bundling, bundling)
+ .put(\default, showDefault);
+
this.startAliveThread;
}
}

--
--
Alberto de Campo
Bergstrasse 59/33
A-8020 Graz, Austria
e-mail : [hidden email]
--

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

plotting behaviour

2010-02-02T15:42:59Z

It seems to me that ArrayedCollection:plot would deserve some second thoughts. I've tried to improve it, so that we get a little more information (also on the long run, it would be good to write a PlotView class).

What I have often come across as uncomfortable behaviour is that the default range is taken to be -1 and 1 for UGen functions. I think it would be better if the appropriate range were estimated from the data and the range printed to one text view for each channel (Or grids of course..).

Another issue is the plotting of multichannel arrays. Two representations may be appropriate: interlaced frames (each frame in a subarray) or parallel channels. Currently plot expects the former. I think it would be better to assume that if you want to express frames, you'd use a flat array and supply numChannels. Otherwise I think it is far more useful to plot parallel arrays.

The attached implementation shows how this would work - please let me know what you think.
Currently it tries to support interlaced data in separate frames, but it would be useful to get rid of this and default to separate rescaling.

// Arrays
[5, 6, 7, 6.5, 4.5, 3.5].plot("Some data")
[5, 6, 7, 6.5, 4.5, 3.5].plot("Some data, in stereo", numChannels:2)
[5, 6, 7, 6.5, 4.5, 3.5].plot("Some data, in stereo", numChannels:2, discrete: true)

// nested arrays
[[5, 6, 7, 6.5, 4.5, 3.5], [5, 6, 7, 6.5, 4.5, 13.5].scramble].plot("Some data")
{ |i| { |j| j + 1 * i % 6 / (j * 0.01 + 1) }.dup(200) }.dup(5).plot("Some 2-d data");

// 3-channel interlaced data
b = [{1.0.rand}.dup(50), { 20.0.rand - 30 }.dup(50),{ 10.0.rand }.dup(50)].lace(150);
b.plot(numChannels:3, minval: nil, maxval: nil); // Common rescaling
b.plot(numChannels:3, minval: [nil, nil, nil], maxval: [nil, nil, nil]); // Separate rescaling

// Envelopes
Env.adsr(0.4, 0.4, 0.8, 0.9).plot
Env([0, 1, -2, 1, 0.4, 0], [0.2, 0.5, 0.1, 0.3], [-3, 0, 4, 2]).plot;

SignalPlusGUI.sc (6K) Download Attachment

SF.net SVN: supercollider:[9820] trunk

2010-02-09T10:24:05Z

Revision: 9820
http://supercollider.svn.sourceforge.net/supercollider/?rev=9820&view=rev
Author: danstowell
Date: 2010-02-09 18:24:05 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
reorganise furniture: add new folders in root; rm unneeded xcode-related folder

Added Paths:
-----------
trunk/common/
trunk/iphone/
trunk/mac/

Removed Paths:
-------------
trunk/Intermediate Build Files/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SynthDef method cleanup

2010-02-04T14:16:51Z

Some methods of SynthDef are a bit hard to read. I've tried to clear thing up a bit and added a flag to send which stores the synthDesc (see patch).

I'm not sure what the general opinion about this is. My experience is that the combinatorics of methods are hard to explain and that memStore is a too complicated name for a simple behaviour. To understand the name, one has to understand the history of supercollider. I would not be against using the method "add" instead, but as we are in a mess already, I tend to just make things work.

The new send message now has three args:

server, completionMsg, store = true;

I can imagine to do:

server, completionMsg, libName = \global;

and if libname is nil, or none, it would not store. This is more flexible but less explicit.

One question: should metadata not consistently respond something to "at" ? At least for me, the call
metadata.tryPerform(\at, \shouldNotSend) ? false
is a bit like a sudoku. Could there be a more explicit interface?

+ Dictionary {
trueAt { arg key;
^this.at(key) == true
}
}

+ Object {
trueAt { arg key;
^false
}
}

Other / further suggestions?

synthDefSend.patch (6K) Download Attachment

Where to put system defs? (spun off from SynthDef cleanup)

2010-02-09T06:56:24Z

On Feb 9, 2010, at 9:28 AM, Dan Stowell wrote:

In my work I create classes which have associated synthdefs. I use
writeOnce to create them as needed. The amount of synthdefs actually
weighs down startup quite a lot if I change that to writeDefFile, it's
quite noticeable. I don't want my startup to be generating these
synthdefs every single time.

As this is a tangent to the main SynthDef discussion, I thought it best to start a new thread.

I have a real pet peeve about classes that add weight to the synthdefs directory. At the same time, I also have classes that require SynthDefs to be there when needed -- so I put my money where my mouth is and instead, now I use dependencies to send SynthDefs when a server boots.

http://quarks.svn.sourceforge.net/viewvc/quarks/dewdrop_lib/ddwChucklib/Prototypes/startup00-ddwSynths.scd

This might not be an ideal solution for everyone, sure, but there's an interesting problem lurking in there. As you scale up the number of installed extensions, if a certain percentage of them add their own set of SynthDefs, where do you put them?

In principle, I think it would be ideal to send SynthDefs only when they're going to be used and not before. In practice, that proved to be a PITA in my work. I'm not sure which is the lesser of evils. My way takes a bit more care in the initial coding, but it does have the advantage that a user who installs dewdrop_lib, and then uninstalls it later, doesn't have any persistent cruft in the filesystem (whereas writeOnce leaves litter behind). To me, it's worth the extra effort to be more polite to the user.

hjh

: H. James Harkins

: [hidden email]

: http://www.dewdrop-world.net

.::!:.:.......:.::........:..!.::.::...:..:...:.:.:.:..:

"Come said the Muse,

Sing me a song no poet has yet chanted,

Sing me the universal." -- Whitman

NumberBox scrolling fix

2010-02-09T04:38:55Z

hi, i always swore i'd never (deliberately) post to the dev list, but where i have come across a specific problem and can submit a solution that is easy to implement and does not break code, then i may as well post it here. if this is somehow unacceptable, then... what is this list for!

so, i have had problems with the scrolling behaviour of NumberBox. i am on osx so i am specifically referencing SCNumberBox. i don't understand how it can be regarded as usable behaviour if the scrolling is both horizontal and vertical at the same time. i am used to scrolling vertically, as was the case in sc1 and sc2 so i got used to it as a matter of preference, anyway so if i scroll vertically upwards but my mouse wavers even one horizontal pixel backwards, the value will start going the other way, and the resulting value jumps all over the place. i think it's better to have either horizontal or vertical scrolling, and personally i would have vertical only scrolling as the default. however, since i want to avoid the inevitable moans of "that will break code!" the following solution preserves the current behaviour, unless scrollDirection is specifically set to one thing or the other. i used /h and /v as that's what Gradient does.

so in the variable declarations, add:

var <>scrollDirection;

and then alter mouseMove as follows:

mouseMove { arg x, y, modifiers;

var direction;

if (scroll == true, {

case

{scrollDirection == \h}

{

// horizontal scrolling:

if ((x - hit.x) < 0) {direction = -1.0} {direction = 1.0};

}

{scrollDirection == \v}

{

// vertical scrolling:

if ((y - hit.y) > 0) {direction = -1.0} {direction = 1.0};

}

{

// horizontal or vertical scrolling:

direction = 1.0;

if ( (x - hit.x) < 0 or: { (y - hit.y) > 0 }) { direction = -1.0; };

};

this.valueAction = (this.value + (inc * this.scroll_step * direction));

hit = Point(x, y);

});

mouseMoveAction.value(this, x, y, modifiers);

}

then one can do this:

b = NumberBox(w, Rect(150, 10, 100, 20));

b.scrollDirection_(\v);

i would appreciate very much this receiving your consideration, thanks.

supernova v0.2

2010-02-09T04:10:24Z

hi all,

there is a new release of supernova, a multi-processor aware version of
the supercollider server scsynth. it provides most features of scsynth,
the most prominent feature, that is still missing, is non-realtime
synthesis. that will be part of v0.3, though ...

getting started:
http://tim.klingt.org/code/wiki/supernova

tarballs: http://tim.klingt.org/code/projects/list_files/supernova
git repository: git://tim.klingt.org/supercollider.git
debs: https://launchpad.net/~tim-klingt/+archive/supernova

cheers, tim

--
[hidden email]
http://tim.klingt.org

Happiness is a byproduct of function, purpose, and conflict; those who
seek happiness for itself seek victory without war.
William S. Burroughs

signature.asc (204 bytes) Download Attachment

SF.net SVN: quarks:[1372] JITMIDIKtl

2010-02-09T03:05:19Z

Revision: 1372
http://quarks.svn.sourceforge.net/quarks/?rev=1372&view=rev
Author: decampo
Date: 2010-02-09 11:05:19 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
added pocketdial class, more cleanups.

Modified Paths:
--------------
JITMIDIKtl/BCRKtl.sc
JITMIDIKtl/FFLV2Ktl.sc
JITMIDIKtl/MIDIKtl.sc
JITMIDIKtl/NanoKtl.html
JITMIDIKtl/NanoKtl.sc
JITMIDIKtl/PFKtl.sc

Added Paths:
-----------
JITMIDIKtl/PDKtl.html

Modified: JITMIDIKtl/BCRKtl.sc
===================================================================
--- JITMIDIKtl/BCRKtl.sc 2010-02-07 20:50:55 UTC (rev 1371)
+++ JITMIDIKtl/BCRKtl.sc 2010-02-09 11:05:19 UTC (rev 1372)
@@ -10,17 +10,6 @@
this.makeDefaults;
}

- init {
- super.init;
- ctlNames = defaults[this.class];
- ^this
- }
-
- mapCC { |ctl= \sl1, action|
- var ccDictKey = ctlNames[ctl]; // '0_42'
- ccDict.put(ccDictKey, action);
- }
-
mapToPxPars { |proxy ... pairs|
if (midiOut.notNil) {
this.sendFromProxy(proxy, pairs);

Modified: JITMIDIKtl/FFLV2Ktl.sc
===================================================================
--- JITMIDIKtl/FFLV2Ktl.sc 2010-02-07 20:50:55 UTC (rev 1371)
+++ JITMIDIKtl/FFLV2Ktl.sc 2010-02-09 11:05:19 UTC (rev 1372)
@@ -6,15 +6,9 @@

init {
super.init;
- ctlNames = defaults[this.class];
lastVals = ();
}

- mapCC { |ctl= \sl1, action|
- var ccDictKey = ctlNames[ctl]; // '0_42'
- ccDict.put(ccDictKey, action);
- }
-
// to do: how to map to editor?

// how to map to proxymixer?

Modified: JITMIDIKtl/MIDIKtl.sc
===================================================================
--- JITMIDIKtl/MIDIKtl.sc 2010-02-07 20:50:55 UTC (rev 1371)
+++ JITMIDIKtl/MIDIKtl.sc 2010-02-09 11:05:19 UTC (rev 1372)
@@ -14,6 +14,8 @@
// subclasses override this method.
// they put their controller keys and chan/ccnum combinations into
// defaults[class]
+ // MIDIKtl is empty by default
+ defaults.put(this.class, ());
}

*new { |srcID, ccDict, noteDict|
@@ -27,6 +29,8 @@
}

init {
+ ctlNames = defaults[this.class];
+
ccDict = ccDict ?? ();

ccresp.remove;
@@ -49,7 +53,34 @@
}

noteKeyToChanNote { |noteKey| ^noteKey.asString.split($_).asInteger }
+
+ // use when ctlNames is one flat dict
+ mapCC { |ctl= \sl1, action|
+ var ccDictKey = ctlNames[ctl]; // '0_42'
+ if (ccDictKey.isNil) {
+ warn("key % : no chan_ccnum found!\n".format(ctl));
+ ^this
+ };
+ ccDict.put(ccDictKey, action);
+ }

+ // use when ctlNames are scene-based dicts (NanoKtl, PDKtl)
+ mapCCS { |scene=2, ctl= \sl1, action|
+ var ccScene, ccDictKey;
+
+ ccScene = ctlNames[scene];
+ if (ccScene.isNil) {
+ warn("% : mapCCS: scene % : not found!\n".format(this, scene));
+ ^this
+ };
+ ccDictKey = ccScene[ctl]; // '0_42'
+ if (ccDictKey.isNil) {
+ warn("key % : no chan_ccnum found!\n".format(ctl));
+ ^nil
+ };
+ ccDict.put(ccDictKey, action);
+ }
+
}

MIDINKtl : MIDIKtl {
@@ -80,6 +111,15 @@
}, srcID);
}

+ mapNoteOn {
+
+ }
+
+ mapNoteOff {
+
+ }
+
+
free {
super.free;

Modified: JITMIDIKtl/NanoKtl.html
===================================================================
--- JITMIDIKtl/NanoKtl.html 2010-02-07 20:50:55 UTC (rev 1371)
+++ JITMIDIKtl/NanoKtl.html 2010-02-09 11:05:19 UTC (rev 1372)
@@ -91,8 +91,8 @@
 g.ccresp; // a midi CCResponder listing to that MIDI port
 
 // map transport buttons 'play' and 'rec' to simple actions: 
- g.mapCC(0, 'play', { |ch, cc, val| " 'play': %.\n".postf([ch, cc, val]) });
- g.mapCC(0, 'rec', { |ch, cc, val| " 'rec': %.\n".postf([ch, cc, val]) });
+ g.mapCCS(0, 'play', { |ch, cc, val| " 'play': %.\n".postf([ch, cc, val]) });
+ g.mapCCS(0, 'rec', { |ch, cc, val| " 'rec': %.\n".postf([ch, cc, val]) });
 // the actions are now in the dict:
 g.ccDict.postcs;
 
@@ -120,24 +120,24 @@
 g.ctlNames[1]
 
 // add some more mapped actions
- g.mapCC(1, 'sl1', { |ch, cc, val| " scene 1, slider1: %.\n".postf([ch, cc, val]) });
- g.mapCC(1, 'kn2', { |ch, cc, val| " scene 1, knob2: %.\n".postf([ch, cc, val]) });
- g.mapCC(1, 'bu3', { |ch, cc, val| " scene 1, button up 3: %.\n".postf([ch, cc, val]) });
- g.mapCC(1, 'bd3', { |ch, cc, val| " scene 1, button down 3: %.\n".postf([ch, cc, val]) });
+ g.mapCCS(1, 'sl1', { |ch, cc, val| " scene 1, slider1: %.\n".postf([ch, cc, val]) });
+ g.mapCCS(1, 'kn2', { |ch, cc, val| " scene 1, knob2: %.\n".postf([ch, cc, val]) });
+ g.mapCCS(1, 'bu3', { |ch, cc, val| " scene 1, button up 3: %.\n".postf([ch, cc, val]) });
+ g.mapCCS(1, 'bd3', { |ch, cc, val| " scene 1, button down 3: %.\n".postf([ch, cc, val]) });
 
 g.ccDict;
 
Instance Methods
 
- mapCC (editor, scene)
+ mapCCS (editor, scene)
 
 map one of the controls in a scene to a general function.
 
 g = NanoKtl.new; // listen to all midi in ports
- g.mapCC(1, 'sl1', { |ch, cc, val| " scene 1, slider1: %.\n".postf([ch, cc, val]) });
- g.mapCC(1, 'kn2', { |ch, cc, val| " scene 1, knob2: %.\n".postf([ch, cc, val]) });
- g.mapCC(1, 'bu3', { |ch, cc, val| " scene 1, button up 3: %.\n".postf([ch, cc, val]) });
- g.mapCC(1, 'bd3', { |ch, cc, val| " scene 1, button down 3: %.\n".postf([ch, cc, val]) });
+ g.mapCCS(1, 'sl1', { |ch, cc, val| " scene 1, slider1: %.\n".postf([ch, cc, val]) });
+ g.mapCCS(1, 'kn2', { |ch, cc, val| " scene 1, knob2: %.\n".postf([ch, cc, val]) });
+ g.mapCCS(1, 'bu3', { |ch, cc, val| " scene 1, button up 3: %.\n".postf([ch, cc, val]) });
+ g.mapCCS(1, 'bd3', { |ch, cc, val| " scene 1, button down 3: %.\n".postf([ch, cc, val]) });
 g.ccDict;
 
 mapToPxEdit (editor, scene)

Modified: JITMIDIKtl/NanoKtl.sc
===================================================================
--- JITMIDIKtl/NanoKtl.sc 2010-02-07 20:50:55 UTC (rev 1371)
+++ JITMIDIKtl/NanoKtl.sc 2010-02-09 11:05:19 UTC (rev 1372)
@@ -29,11 +29,6 @@

^this
}
-
- mapCC { |scene=2, ctl= \sl1, action|
- var ccDictKey = ctlNames[scene][ctl]; // '0_42'
- ccDict.put(ccDictKey, action);
- }

mapToPxEdit { |editor, scene=1, volPause = true|
pxEditors.put(scene, editor);
@@ -41,7 +36,7 @@
// map 8 knobs to params - can be shifted
[\kn1, \kn2, \kn3, \kn4, \kn5, \kn6, \kn7, \kn8].do { |key, i|

- this.mapCC(scene, key,
+ this.mapCCS(scene, key,
{ |ch, cc, val|
var proxy = pxEditors[scene].proxy;
var parKey = pxEditors[scene].editKeys[i + parOffsets[scene]];
@@ -55,7 +50,7 @@
)
};
// and use 9th knob for proxy volume
- this.mapCC(scene, \kn9, { |ch, cc, val|
+ this.mapCCS(scene, \kn9, { |ch, cc, val|
var lastVal = lastVals[\kn9];
var mappedVol = \amp.asSpec.map(val / 127);
var proxy = pxEditors[scene].proxy;
@@ -71,7 +66,7 @@
pairs.do { |pair|
var ctlName, paramName;
#ctlName, paramName = pair;
- this.mapCC(scene, ctlName,
+ this.mapCCS(scene, ctlName,
{ |ch, cc, midival|
proxy.set(paramName, paramName.asSpec.map(midival / 127))
}
@@ -92,13 +87,13 @@
mastaFunc = { |chan, cc, val| server.volume.volume_(\mastaVol.asSpec.map(val/127)) };

Spec.add(\mastaVol, [server.volume.min, server.volume.max, \db]);
- (1..4).do { |scene| this.mapCC(scene, \sl9, mastaFunc) };
+ (1..4).do { |scene| this.mapCCS(scene, \sl9, mastaFunc) };

// scene 1:

// map first 8 volumes to sliders
[\sl1, \sl2, \sl3, \sl4, \sl5, \sl6, \sl7, \sl8].do { |key, i|
- this.mapCC(scene, key,
+ this.mapCCS(scene, key,
{ |ch, cc, val|
var lastVal = lastVals[key];
var mappedVal = \amp.asSpec.map(val / 127);
@@ -116,13 +111,13 @@
};
// upper buttons: send to editor
[\bu1, \bu2, \bu3, \bu4, \bu5, \bu6, \bu7, \bu8].do { |key, i|
- this.mapCC(scene, key,
+ this.mapCCS(scene, key,
{ |ch, cc, val| defer { pxmixers[scene].editBtnsAr[i + pxOffsets[scene]].doAction }; })
};

// lower buttons: toggle play/stop
[\bd1, \bd2, \bd3, \bd4, \bd5, \bd6, \bd7, \bd8].do { |key, i|
- this.mapCC(scene, key,
+ this.mapCCS(scene, key,
{ |ch, cc, val| defer {
var px = pxmixers[scene].pxMons[i + pxOffsets[scene]].proxy;
if ( ctlNames[scene]['mode'] == 'push' ){
@@ -138,8 +133,8 @@
}; )
};

- this.mapCC(scene, \bu9, { |src, chan, val| if (val > 0) { this.pxShift(1, scene) } });
- this.mapCC(scene, \bd9, { |src, chan, val| if (val > 0) { this.paramShift(1, scene) } });
+ this.mapCCS(scene, \bu9, { |src, chan, val| if (val > 0) { this.pxShift(1, scene) } });
+ this.mapCCS(scene, \bd9, { |src, chan, val| if (val > 0) { this.paramShift(1, scene) } });

this.pxShift(0, scene);
this.mapToPxEdit(mixer.editor, scene);
Added: JITMIDIKtl/PDKtl.html
===================================================================
--- JITMIDIKtl/PDKtl.html (rev 0)
+++ JITMIDIKtl/PDKtl.html 2010-02-09 11:05:19 UTC (rev 1372)
@@ -0,0 +1,127 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<title></title>
+<meta name="Generator" content="Cocoa HTML Writer">
+<meta name="CocoaVersion" content="1038.25">
+<style type="text/css">
+p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica}
+p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px}
+p.p3 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; min-height: 12.0px}
+p.p4 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco}
+p.p5 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; color: #cd0b0b}
+p.p6 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; color: #2024c7}
+p.p7 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; color: #737373}
+p.p8 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; color: #2b30fa; min-height: 14.0px}
+p.p9 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; color: #ad140d}
+span.s1 {font: 18.0px Helvetica}
+span.s2 {font: 9.0px Monaco}
+span.s3 {font: 12.0px Helvetica; color: #2b30fa}
+span.s4 {color: #0000ee}
+span.s5 {color: #2b30fa}
+span.s6 {text-decoration: underline ; color: #2b30fa}
+span.s7 {color: #000000}
+span.s8 {color: #008417}
+span.s9 {color: #737373}
+span.s10 {color: #2024c7}
+span.s11 {color: #1d20b9}
+span.s12 {color: #606060}
+span.s13 {color: #ad140d}
+span.Apple-tab-span {white-space:pre}
+</style>
+</head>
+<body>
+PDKtl a MIDIKtl class for the Doepfer PocketDial
+ 
+The Doepfer PocketDial only has 16 endless knobs, so PDKtl is a rather simple class. 
+ 
+ 
+see also <a href="PFKtl.html">PFKtl</a>, <a href="MIDIKtl.html">MIDIKtl</a>, NanoKtl
+ 
+first example
+ 
+ // make a new PDKtl
+f = PDKtl.new;
+ 
+ // map a single slider's action
+f.mapCC(\kn01, { |chan, ccnum, val| 
+ var normstep = 0.01; 
+ var midiNudge = 64 - val; 
+ var normedNudge = midiNudge * normstep;
+ "PDKtl test: ch % cc % val % - midinudge: % normedNudge: % \n"
+ .postf(chan, ccnum, val, midiNudge, normedNudge);
+ "map here with a spec..." 
+}); 
+ 
+ // fails if no midi info for that key
+f.mapCC(\wrongKey, { |chan, ccnum, val| "PDKtl test: ch % cc % val %\n".postf(chan, ccnum, val) }); 
+ 
+ 
+Class Variables
+ *verbose // a flag whether the class posts extended info 
+ 
+ PDKtl.verbose = true;
+ PDKtl.verbose = false;
+ 
+Instance Variables
+ 
+Methods
+ 
+ *new(uid) make a new PDKtl. uid is an optional ID for the MIDI port to listen to. 
+ 
+f = PDKtl.new;
+ 
+ mapCCS(scene, ctl, action)
+ 
+ // map a single knob's action
+f.mapCCS(1, \kn01, { |chan, ccnum, val| "PDKtl test: ch % cc % val %\n".postf(chan, ccnum, val) }); 
+ 
+ // the valid names are:
+f.ctlNames[1].keys.asArray.sort;
+ 
+ 
+ mapToPxEdit(editor, indices, lastIsVol) - map to a NodeProxyEditor.
+ editor the editor
+ indices which sliders to map to. default is [1, 2 .. 8]. 
+ lastIsVol flag whether the last slider becomes a volume control for that editor.
+ 
+ 
+( // make an Ndef and its editor first
+Spec.add(\harm, [2, 200, \exp]);
+Ndef(\a, { |freq = 20, harm = 20| Blip.ar(freq, harm) });
+o = NodeProxyEditor(Ndef(\a));
+ 
+f.mapToPxEdit(o, 1);
+)
+ 
+ mapToPxMix(mixer, splitIndex, lastEdIsVol, lastIsMaster) map to a proxymixer. 
+ 
+ mixer is the mixer to map to. 
+ the left hand sliders (sliders 1 to splitIndex) are mapped to volumes;
+ the right hand sliders map to the mixer.editor parameters. 
+ lastIsMaster: if true, the rightmost control maps to server volume.
+ lastEdIsVol: if true, the last free slider on the right side is used for 
+ the edited proxy's volume.
+(
+m = NdefMixer();
+f.mapToPxMix(m, 1); 
+m.openEditZone;
+m.editor.proxy_(Ndef(\a));
+)
+ 
+ 
+( // test many proxies 
+Spec.add(\freqScale, [0.1, 10, \exp]);
+Spec.add(\rateScale, [0.1, 10, \exp]);
+10.do { |i| 
+ Ndef(("test" ++ i).asSymbol, { |rateScale = 1, freqScale = 1|
+ Pan2.ar(Ringz.ar(Impulse.ar(exprand(0.5, 4) * rateScale), exprand(300, 3000) * freqScale, 0.02), 1.0.rand2, 0.2) 
+ }).play(vol: 0.2)
+ ; 
+};
+)
+ 
+</body>
+</html>

Modified: JITMIDIKtl/PFKtl.sc
===================================================================
--- JITMIDIKtl/PFKtl.sc 2010-02-07 20:50:55 UTC (rev 1371)
+++ JITMIDIKtl/PFKtl.sc 2010-02-09 11:05:19 UTC (rev 1372)
@@ -4,7 +4,6 @@

init {
super.init;
- ctlNames = defaults[this.class];
lastVals = ();
}

@@ -32,16 +31,7 @@
)
);
}
-
- mapCC { |ctl= \sl1, action|
- var ccDictKey = ctlNames[ctl]; // '0_42'
- if (ccDictKey.isNil) {
- warn("key % : no chan_ccnum found!\n".format(ctl));
- } {
- ccDict.put(ccDictKey, action);
- }
- }
- // map to
+ // map to
mapToPxEdit { |editor, indices, lastIsVol = true|
var slKeys, lastSlKey;
indices = indices ? (1..8);
@@ -110,3 +100,158 @@
this.mapToPxEdit(mixer.editor, (splitIndex + 1 .. slKeys.size));
}
}
+
+PDKtl : MIDIKtl {
+ classvar <>verbose = false;
+
+ var <>step = 0.01;
+
+ *makeDefaults {
+
+ // implement nudge!
+ /* all midi chan 0,
+ scene 1: 0 - 15
+ scene2: 16 - 31
+ scene 3: 32 - 47
+ scene4: 48 - 63
+ */
+
+ // just one bank of sliders
+ defaults.put(this, (
+ 1: ( kn01: '0_0',
+ kn02: '0_1',
+ kn03: '0_2',
+ kn04: '0_3',
+ kn05: '0_4',
+ kn06: '0_5',
+ kn07: '0_6',
+ kn08: '0_7',
+ kn09: '0_8',
+ kn10: '0_9',
+ kn11: '0_10',
+ kn12: '0_11',
+ kn13: '0_12',
+ kn14: '0_13',
+ kn15: '0_14',
+ kn16: '0_15'
+ ),
+
+ 2: ( kn01: '0_16',
+ kn02: '0_17',
+ kn03: '0_18',
+ kn04: '0_19',
+ kn05: '0_20',
+ kn06: '0_21',
+ kn07: '0_22',
+ kn08: '0_23',
+ kn09: '0_24',
+ kn10: '0_25',
+ kn11: '0_26',
+ kn12: '0_27',
+ kn13: '0_28',
+ kn14: '0_29',
+ kn15: '0_30',
+ kn16: '0_31'
+ ),
+
+ 3: ( kn01: '0_32',
+ kn02: '0_33',
+ kn03: '0_34',
+ kn04: '0_35',
+ kn05: '0_36',
+ kn06: '0_37',
+ kn07: '0_38',
+ kn08: '0_39',
+ kn09: '0_40',
+ kn10: '0_41',
+ kn11: '0_42',
+ kn12: '0_43',
+ kn13: '0_44',
+ kn14: '0_45',
+ kn15: '0_46',
+ kn16: '0_47'
+ ),
+
+ 4: ( kn01: '0_48',
+ kn02: '0_49',
+ kn03: '0_50',
+ kn04: '0_51',
+ kn05: '0_52',
+ kn06: '0_53',
+ kn07: '0_54',
+ kn08: '0_55',
+ kn09: '0_56',
+ kn10: '0_57',
+ kn11: '0_58',
+ kn12: '0_59',
+ kn13: '0_60',
+ kn14: '0_61',
+ kn15: '0_62',
+ kn16: '0_63'
+ )
+ ));
+ }
+
+ // map to
+ mapToPxEdit { |editor, scene = 1, indices, lastIsVol = true|
+ var knobKeys, lastKnobKey;
+ indices = indices ? (1..8);
+
+ knobKeys = indices.collect { |i| ("kn" ++ (100 + i).asString.drop(1)).asSymbol}.postcs;
+
+ if (lastIsVol) {
+ lastKnobKey = knobKeys.pop;
+
+ // use last knob for proxy volume
+ this.mapCCS(scene, lastKnobKey, { |ch, cc, val|
+ var proxy = editor.proxy;
+ if (proxy.notNil) { proxy.nudgeVol(val - 64 * step) };
+ });
+ };
+
+ knobKeys.do { |key, i|
+ this.mapCCS(scene, key,
+ { |ch, cc, val|
+ var proxy = editor.proxy;
+ var parKey = editor.editKeys[i];
+ if (parKey.notNil and: proxy.notNil) {
+ proxy.nudge(parKey, val - 64 * step)
+ };
+ }
+ )
+ };
+ }
+
+ mapToPxMix { |mixer, scene = 1, splitIndex = 8, lastEdIsVol = true, lastIsMaster = true|
+
+ var server = mixer.proxyspace.server;
+ var knobKeys = (1..16).collect { |i| ("kn" ++ (100 + i).asString.drop(1)).asSymbol };
+ var lastKey;
+
+ // add master volume on knob 16
+ if (lastIsMaster) {
+ lastKey = knobKeys.pop;
+ Spec.add(\mastaVol, [server.volume.min, server.volume.max, \db]);
+ this.mapCCS(scene, lastKey, { |chan, cc, val|
+ var oldNormVal = \mastaVol.asSpec.unmap(server.volume.volume).postln;
+ var nudgedVol = (oldNormVal + (64 - val * step)).clip(0, 1);
+ server.volume.volume_(nudgedVol.ampdb)
+ });
+ };
+
+ // map first n knobs to volumes
+ knobKeys.keep(splitIndex).do { |key, i|
+
+ this.mapCCS(scene, key,
+ { |ch, cc, val|
+ var proxy = mixer.pxMons[i].proxy;
+ if (proxy.notNil) {
+ proxy.nudgeVol(64 - val * step);
+ };
+ };
+ )
+ };
+
+ this.mapToPxEdit(mixer.editor, scene, (splitIndex + 1 .. knobKeys.size));
+ }
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9819] trunk/build/SCClassLibrary/JITLib/extras/ extSoftSet.sc

2010-02-09T03:01:38Z

Revision: 9819
http://supercollider.svn.sourceforge.net/supercollider/?rev=9819&view=rev
Author: decampo
Date: 2010-02-09 11:01:38 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
added nudging for endless knob controllers.

Modified Paths:
--------------
trunk/build/SCClassLibrary/JITLib/extras/extSoftSet.sc

Modified: trunk/build/SCClassLibrary/JITLib/extras/extSoftSet.sc
===================================================================
--- trunk/build/SCClassLibrary/JITLib/extras/extSoftSet.sc 2010-02-08 18:44:01 UTC (rev 9818)
+++ trunk/build/SCClassLibrary/JITLib/extras/extSoftSet.sc 2010-02-09 11:01:38 UTC (rev 9819)
@@ -1,6 +1,21 @@
// Maybe rewrite as SoftSet(what, key, val, within, mapped, oldVal);

+ NodeProxy {
+
+ nudgeSet { |param, incr = 0.02|
+ var spec = param.asSpec;
+ var oldval = this.nodeMap.get(param).value ?? { this.getDefaultVal(param) ? 0 };
+ var oldnorm = spec.unmap(oldval);
+ var newnorm = (oldnorm + incr).clip(0, 1);
+ this.set(param, spec.map(newnorm));
+ }
+
+ nudgeVol { |incr = 0.02|
+ var spec = \amp.asSpec;
+ var oldval = spec.unmap(this.vol);
+ var newVol = spec.map((oldval + incr).clip(0, 1));
+ this.vol_(newVol)
+ }

softSet { |param, val, within = 0.025, mapped=false, lastVal|
var spec, newNormVal, oldVal, oldNormVal, maxDiff;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

nowExecutingPath in Routines bug

2010-02-08T04:01:44Z

Having a look at fixing this.

So I add a couple of vars to Thread:

Thread : Stream {

var <state=0, func, stack, method, block, frame, ip=0, sp=0;

var numpop=0, receiver, numArgsPushed=0;

var parent, terminalValue;

var <primitiveError=0, <primitiveIndex=0, randData=0;

var <beats=0.0, <seconds=0.0, <clock, <nextBeat, <>endBeat, <>endValue;

var environment;

var <>exceptionHandler;

var myExecutingPath, oldExecutingPath;

And understanding that I "must not make any change at all to the order or number of instance variables in these classes!" I presume I need to adjust the PyrThread so that the number of vars matches:

struct PyrThread : public PyrObjectHdr

{

PyrSlot state, func, stack, method, block, frame, ip, sp;

PyrSlot numpop, receiver, numArgsPushed;

PyrSlot parent, terminalValue;

PyrSlot primitiveError;

PyrSlot primitiveIndex;

PyrSlot randData;

PyrSlot beats, seconds, clock, nextBeat, endBeat, endValue;

PyrSlot environment;

PyrSlot exceptionHandler;

PyrSlot myExecutingPath;

PyrSlot oldExecutingPath;

};

But I still get • ERROR: You may not change variable definitions of intrinsic classes.

I can't see where else the number of vars is specified, What am I doing wrong?

debug voodoo

2010-02-03T20:45:09Z

All right. This has happened to me MANY times, and finally I have proof.

Something isn't working.

I add debug statements without changing any program logic.

It works.

I remove debug statements.

It still works.

I'm really starting to think I'm going crazy here.

I have a Pbind that calculates timingOffset from a couple keys in the event.

\timingOffset, Pfunc({ |ev| (ev[\timingOffset].debug("timingOffset in calc") ? 0) + (ev[\latencyAdjust] ? 0) }),

I confirmed at every stage that ev[\timingOffset] going into this is 0.5, but the result was 0. (latencyAdjust is always 0.)

input event: ( 'clock': a TempoClock, 'eventKey': singleSynthPlayer, 'timingOffset': 0.05, 'grain': true,

'collIndex': lbrk, 'propagateDownward': a Function )

result event: (instrument -> bufGrainPan), (clock -> a TempoClock), (eventKey -> singleSynthPlayer), (time -> 0.073536929057336), (amp -> 1),

(start -> 500835.6297), (rate -> 1), (decay -> 0.02), (pan -> 0), (attack -> 0.001),

(collIndex -> lbrk), (latencyAdjust -> 0), (timingOffset -> 0), (bufIndex -> 0), (grain -> true),

(delta -> 0.5), (chan -> a MixerChannel), (bufnum -> 2), (propagateDownward -> a Function)

Huh? The result event does 0.05 + 0 and comes up with 0?

So I changed the pattern to add a couple of debugs ONLY. Nothing else changed.

\timingOffset, Pfunc({ |ev| ev.debug("event processed for timingOffset"); (ev[\timingOffset].debug("timingOffset in calc") ? 0) + (ev[\latencyAdjust] ? 0) }),

And...

input event: ( 'clock': a TempoClock, 'eventKey': singleSynthPlayer, 'timingOffset': 0.05, 'grain': true,

'collIndex': lbrk, 'propagateDownward': a Function )

event processed for timingOffset: (instrument -> bufGrainPan), (clock -> a TempoClock), (eventKey -> singleSynthPlayer), (time -> 0.094536929057336), (amp -> 1),

(start -> 158603.5773), (rate -> 1), (collIndex -> lbrk), (latencyAdjust -> 0), (timingOffset -> 0.05),

(bufIndex -> 0), (grain -> true), (chan -> a MixerChannel), (bufnum -> 2), (propagateDownward -> a Function)

timingOffset in calc: 0.05

result event: (instrument -> bufGrainPan), (clock -> a TempoClock), (eventKey -> singleSynthPlayer), (time -> 0.073536929057336), (amp -> 1),

(start -> 158603.5773), (rate -> 1), (decay -> 0.02), (pan -> 0), (attack -> 0.001),

(collIndex -> lbrk), (latencyAdjust -> 0), (timingOffset -> 0.05), (bufIndex -> 0), (grain -> true),

(delta -> 0.5), (chan -> a MixerChannel), (bufnum -> 2), (propagateDownward -> a Function)

If this were the first time, I would write it off but I've seen this dozens of times -- some weird, unexplainable result that corrects itself as soon as I print something in the middle.

I'm probably misinterpreting this but why did the same logic minus printing fail? It's upsetting my sense of order and logic in the computer world. :)

hjh

: H. James Harkins

: [hidden email]

: http://www.dewdrop-world.net

.::!:.:.......:.::........:..!.::.::...:..:...:.:.:.:..:

"Come said the Muse,

Sing me a song no poet has yet chanted,

Sing me the universal." -- Whitman

SF.net SVN: supercollider:[9818] trunk/Headers/plugin_interface/SC_SndBuf.h

2010-02-08T10:44:01Z

Revision: 9818
http://supercollider.svn.sourceforge.net/supercollider/?rev=9818&view=rev
Author: timblech
Date: 2010-02-08 18:44:01 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
compile fix

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Headers/plugin_interface/SC_SndBuf.h

Modified: trunk/Headers/plugin_interface/SC_SndBuf.h
===================================================================
--- trunk/Headers/plugin_interface/SC_SndBuf.h 2010-02-08 18:07:06 UTC (rev 9817)
+++ trunk/Headers/plugin_interface/SC_SndBuf.h 2010-02-08 18:44:01 UTC (rev 9818)
@@ -84,7 +84,7 @@
inline float lookupi(const float *table, uint32 phase, uint32 mask)
{
float frac = PhaseFrac(phase);
- float *tbl = table + ((phase >> 16) & mask);
+ const float *tbl = table + ((phase >> 16) & mask);
float a = tbl[0];
float b = tbl[1];
return a + frac * (b - a);
@@ -93,7 +93,7 @@
inline float lookupi2(const float *table, uint32 phase, uint32 mask)
{
float frac = PhaseFrac1(phase);
- float *tbl = table + ((phase >> 16) & mask);
+ const float *tbl = table + ((phase >> 16) & mask);
float a = tbl[0];
float b = tbl[1];
return a + frac * b;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9811] trunk

2010-02-08T09:44:09Z

Revision: 9811
http://supercollider.svn.sourceforge.net/supercollider/?rev=9811&view=rev
Author: timblech
Date: 2010-02-08 17:43:59 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
unit generators: const safety for read-only table acces

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Headers/plugin_interface/SC_SndBuf.h
trunk/Source/plugins/DelayUGens.cpp
trunk/Source/plugins/OscUGens.cpp

Modified: trunk/Headers/plugin_interface/SC_SndBuf.h
===================================================================
--- trunk/Headers/plugin_interface/SC_SndBuf.h 2010-02-08 17:41:51 UTC (rev 9810)
+++ trunk/Headers/plugin_interface/SC_SndBuf.h 2010-02-08 17:43:59 UTC (rev 9811)
@@ -59,20 +59,20 @@

inline float PhaseFrac(uint32 inPhase)
- {
- union { uint32 itemp; float ftemp; } u;
- u.itemp = 0x3F800000 | (0x007FFF80 & ((inPhase)<<7));
- return u.ftemp - 1.f;
- }
+{
+ union { uint32 itemp; float ftemp; } u;
+ u.itemp = 0x3F800000 | (0x007FFF80 & ((inPhase)<<7));
+ return u.ftemp - 1.f;
+}

inline float PhaseFrac1(uint32 inPhase)
- {
- union { uint32 itemp; float ftemp; } u;
- u.itemp = 0x3F800000 | (0x007FFF80 & ((inPhase)<<7));
- return u.ftemp;
- }
+{
+ union { uint32 itemp; float ftemp; } u;
+ u.itemp = 0x3F800000 | (0x007FFF80 & ((inPhase)<<7));
+ return u.ftemp;
+}

-inline float lookup(float *table, int32 phase, int32 mask)
+inline float lookup(const float *table, int32 phase, int32 mask)
{
return table[(phase >> 16) & mask];
}
@@ -81,7 +81,7 @@
#define xlobits 14
#define xlobits1 13

-inline float lookupi(float *table, uint32 phase, uint32 mask)
+inline float lookupi(const float *table, uint32 phase, uint32 mask)
{
float frac = PhaseFrac(phase);
float *tbl = table + ((phase >> 16) & mask);
@@ -90,7 +90,7 @@
return a + frac * (b - a);
}

-inline float lookupi2(float *table, uint32 phase, uint32 mask)
+inline float lookupi2(const float *table, uint32 phase, uint32 mask)
{
float frac = PhaseFrac1(phase);
float *tbl = table + ((phase >> 16) & mask);
@@ -99,12 +99,12 @@
return a + frac * b;
}

-inline float lookupi1(float* table0, float* table1, uint32 pphase, int32 lomask)
+inline float lookupi1(const float* table0, const float* table1, uint32 pphase, int32 lomask)
{
float pfrac = PhaseFrac1(pphase);
uint32 index = ((pphase >> xlobits1) & lomask);
- float val1 = *(float*)((char*)table0 + index);
- float val2 = *(float*)((char*)table1 + index);
+ float val1 = *(const float*)((const char*)table0 + index);
+ float val2 = *(const float*)((const char*)table1 + index);
return val1 + val2 * pfrac;
}

Modified: trunk/Source/plugins/DelayUGens.cpp
===================================================================
--- trunk/Source/plugins/DelayUGens.cpp 2010-02-08 17:41:51 UTC (rev 9810)
+++ trunk/Source/plugins/DelayUGens.cpp 2010-02-08 17:43:59 UTC (rev 9811)
@@ -831,10 +831,10 @@
#define LOOP_BODY_4 \
phase = sc_loop((Unit*)unit, phase, loopMax, loop); \
int32 iphase = (int32)phase; \
- float* table1 = bufData + iphase * bufChannels; \
- float* table0 = table1 - bufChannels; \
- float* table2 = table1 + bufChannels; \
- float* table3 = table2 + bufChannels; \
+ const float* table1 = bufData + iphase * bufChannels; \
+ const float* table0 = table1 - bufChannels; \
+ const float* table2 = table1 + bufChannels; \
+ const float* table3 = table2 + bufChannels; \
if (iphase == 0) { \
if (loop) { \
table0 += bufSamples; \
@@ -943,8 +943,8 @@
unit->m_fbufnum = fbufnum;
unit->m_buf = world->mSndBufs + bufnum;
}
- SndBuf *buf = unit->m_buf;
- float *bufData __attribute__((__unused__)) = buf->data;
+ const SndBuf *buf = unit->m_buf;
+ const float *bufData __attribute__((__unused__)) = buf->data;
uint32 bufChannels __attribute__((__unused__)) = buf->channels;
uint32 bufSamples __attribute__((__unused__)) = buf->samples;
uint32 bufFrames = buf->frames;

Modified: trunk/Source/plugins/OscUGens.cpp
===================================================================
--- trunk/Source/plugins/OscUGens.cpp 2010-02-08 17:41:51 UTC (rev 9810)
+++ trunk/Source/plugins/OscUGens.cpp 2010-02-08 17:43:59 UTC (rev 9811)
@@ -397,7 +397,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

int32 key, oct;
@@ -429,7 +429,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

float *out = ZOUT(0);
@@ -465,7 +465,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

float *out = ZOUT(0);
@@ -657,7 +657,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

int32 index = (int32)ZIN0(1);
@@ -669,7 +669,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

float *out = ZOUT(0);
@@ -688,7 +688,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

float *out = ZOUT(0);
@@ -722,7 +722,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

int32 index = (int32)ZIN0(1);
@@ -734,7 +734,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

int32 index = (int32)ZIN0(1);
@@ -752,7 +752,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

float *out = ZOUT(0);
@@ -785,7 +785,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

int32 index = (int32)floor(ZIN0(1));
@@ -797,7 +797,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

float *out = ZOUT(0);
@@ -815,7 +815,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

float *out = ZOUT(0);
@@ -830,7 +830,7 @@

////////////////////////////////////////////////////////////////////////////////////

-static float IndexInBetween_FindIndex(float* table, float in, int32 maxindex)
+static float IndexInBetween_FindIndex(const float* table, float in, int32 maxindex)
{
for(int32 i = 0; i <= maxindex; i++) {
if(table[i] > in) {
@@ -861,7 +861,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

float in = ZIN0(1);
@@ -872,7 +872,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

float *out = ZOUT(0);
@@ -889,7 +889,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

float *out = ZOUT(0);
@@ -903,7 +903,7 @@

////////////////////////////////////////////////////////////////////////////////////

-static int32 DetectIndex_FindIndex(float* table, float in, int32 maxindex)
+static int32 DetectIndex_FindIndex(const float* table, float in, int32 maxindex)
{
int32 index;
for(index = 0; index <= maxindex; index+=1) {
@@ -932,7 +932,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

float in = ZIN0(1);
@@ -951,7 +951,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

float *out = ZOUT(0);
@@ -976,7 +976,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
int32 maxindex = tableSize - 1;

float *out = ZOUT(0);
@@ -1019,8 +1019,8 @@
{
// get table
GET_TABLE
- float *table0 = bufData;
- float *table1 = table0 + 1;
+ const float *table0 = bufData;
+ const float *table1 = table0 + 1;
float fmaxindex = (float)(tableSize>>1) - 0.001;
float offset = tableSize * 0.25;

@@ -1042,8 +1042,8 @@
{
// get table
GET_TABLE
- float *table0 = bufData;
- float *table1 = table0 + 1;
+ const float *table0 = bufData;
+ const float *table1 = table0 + 1;
float fmaxindex = (float)(tableSize>>1) - 0.001;
float offset = tableSize * 0.25;

@@ -1073,8 +1073,8 @@
{
// get table
GET_TABLE
- float *table0 = bufData;
- float *table1 = table0 + 1;
+ const float *table0 = bufData;
+ const float *table1 = table0 + 1;
float fmaxindex = (float)(tableSize>>1) - 0.001;
float offset = tableSize * 0.25;

@@ -1119,8 +1119,8 @@
{
// get table
GET_TABLE
- float *table0 = bufData;
- float *table1 = table0 + 1;
+ const float *table0 = bufData;
+ const float *table1 = table0 + 1;
int32 maxindex = tableSize - 1;
float maxphase = (float)maxindex;
if (tableSize != unit->mTableSize) {
@@ -1148,8 +1148,8 @@
{
// get table
GET_TABLE
- float *table0 = bufData;
- float *table1 = table0 + 1;
+ const float *table0 = bufData;
+ const float *table1 = table0 + 1;
int32 maxindex = tableSize - 1;
float maxphase = (float)maxindex;
if (tableSize != unit->mTableSize) {
@@ -1183,8 +1183,8 @@
{
// get table
GET_TABLE
- float *table0 = bufData;
- float *table1 = table0 + 1;
+ const float *table0 = bufData;
+ const float *table1 = table0 + 1;
int32 maxindex = tableSize - 1;
float maxphase = (float)maxindex;
if (tableSize != unit->mTableSize) {
@@ -1728,9 +1728,8 @@
{
// get table
GET_TABLE
-
- float *table0 = bufData;
- float *table1 = table0 + 1;
+ const float *table0 = bufData;
+ const float *table1 = table0 + 1;
if (tableSize != unit->mTableSize) {
unit->mTableSize = tableSize;
int tableSize2 = tableSize >> 1;
@@ -1763,8 +1762,8 @@
{
// get table
GET_TABLE
- float *table0 = bufData;
- float *table1 = table0 + 1;
+ const float *table0 = bufData;
+ const float *table1 = table0 + 1;
if (tableSize != unit->mTableSize) {
unit->mTableSize = tableSize;
int tableSize2 = tableSize >> 1;
@@ -1797,8 +1796,8 @@
{
// get table
GET_TABLE
- float *table0 = bufData;
- float *table1 = table0 + 1;
+ const float *table0 = bufData;
+ const float *table1 = table0 + 1;
if (tableSize != unit->mTableSize) {
unit->mTableSize = tableSize;
int tableSize2 = tableSize >> 1;
@@ -1833,8 +1832,8 @@
{
// get table
GET_TABLE
- float *table0 = bufData;
- float *table1 = table0 + 1;
+ const float *table0 = bufData;
+ const float *table1 = table0 + 1;
if (tableSize != unit->mTableSize) {
unit->mTableSize = tableSize;
int tableSize2 = tableSize >> 1;
@@ -1924,7 +1923,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
if (tableSize != unit->mTableSize) {
unit->mTableSize = tableSize;
unit->m_lomask = (tableSize - 1) << 2;
@@ -1956,7 +1955,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
if (tableSize != unit->mTableSize) {
unit->mTableSize = tableSize;
unit->m_lomask = (tableSize - 1) << 2;
@@ -1985,7 +1984,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
if (tableSize != unit->mTableSize) {
unit->mTableSize = tableSize;
unit->m_lomask = (tableSize - 1) << 2;
@@ -2016,7 +2015,7 @@
{
// get table
GET_TABLE
- float *table = bufData;
+ const float *table = bufData;
if (tableSize != unit->mTableSize) {
unit->mTableSize = tableSize;
unit->m_lomask = (tableSize - 1) << 2;
@@ -2063,8 +2062,8 @@
{
// get table
GET_TABLE
- float *table0 = bufData;
- float *table1 = table0 + 1;
+ const float *table0 = bufData;
+ const float *table1 = table0 + 1;
if (tableSize != unit->mTableSize) {
unit->mTableSize = tableSize;
int tableSize2 = tableSize >> 1;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9817] trunk/Source/plugins/PV_UGens.cpp

2010-02-08T10:07:07Z

Revision: 9817
http://supercollider.svn.sourceforge.net/supercollider/?rev=9817&view=rev
Author: timblech
Date: 2010-02-08 18:07:06 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
plugins: pv ugen cleanup

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/PV_UGens.cpp

Modified: trunk/Source/plugins/PV_UGens.cpp
===================================================================
--- trunk/Source/plugins/PV_UGens.cpp 2010-02-08 18:04:39 UTC (rev 9816)
+++ trunk/Source/plugins/PV_UGens.cpp 2010-02-08 18:07:06 UTC (rev 9817)
@@ -674,7 +674,6 @@

void PV_Copy_next(PV_Unit *unit, int inNumSamples)
{
-
float fbufnum1 = ZIN0(0);
float fbufnum2 = ZIN0(1);
if (fbufnum1 < 0.f || fbufnum2 < 0.f) { ZOUT0(0) = -1.f; return; }
@@ -774,8 +773,6 @@
SCComplexBuf *p = ToComplexApx(buf1);
SCComplexBuf *q = ToComplexApx(buf2);

- float hypot, preal;
-
p->dc /= q->dc;
p->nyq /= q->nyq;
for (int i=0; i<numbins; ++i) {
@@ -783,8 +780,8 @@
// Note that hypot has danger of overflow (see URL above),
// however FFT values typically stay within a small range,
// so I'm considering this OK for now.
- hypot = q->bin[i].real * q->bin[i].real + q->bin[i].imag * q->bin[i].imag;
- preal = p->bin[i].real;
+ float hypot = q->bin[i].real * q->bin[i].real + q->bin[i].imag * q->bin[i].imag;
+ float preal = p->bin[i].real;
p->bin[i].real = (preal * q->bin[i].real + p->bin[i].imag * q->bin[i].imag) / hypot;
p->bin[i].imag = (p->bin[i].imag * q->bin[i].real - preal * q->bin[i].imag) / hypot;
}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9816] trunk/Source/plugins/Convolution.cpp

2010-02-08T10:04:40Z

Revision: 9816
http://supercollider.svn.sourceforge.net/supercollider/?rev=9816&view=rev
Author: timblech
Date: 2010-02-08 18:04:39 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
convolution ugens: declare local symbol as static & small indentation fix

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/Convolution.cpp

Modified: trunk/Source/plugins/Convolution.cpp
===================================================================
--- trunk/Source/plugins/Convolution.cpp 2010-02-08 18:03:28 UTC (rev 9815)
+++ trunk/Source/plugins/Convolution.cpp 2010-02-08 18:04:39 UTC (rev 9816)
@@ -87,7 +87,6 @@

scfft *m_scfft1, *m_scfft2[2], *m_scfft3[2], *m_scfftR[2], *m_scfftR2[2];
float *m_trbuf; //shared temporary buffer for fft code
-
};

struct Convolution3 : Unit
@@ -190,7 +189,6 @@

void Convolution_next(Convolution *unit, int numSamples)
{
-
float *in1 = IN(0);
float *in2 = IN(1);

@@ -208,7 +206,6 @@
int insize= unit->m_insize;

if (unit->m_pos & insize) {
-
//have collected enough samples to transform next frame
unit->m_pos = 0; //reset collection counter

@@ -276,7 +273,7 @@

//include local buffer test in one place
-SndBuf * ConvGetBuffer(Unit * unit, uint32 bufnum)
+static SndBuf * ConvGetBuffer(Unit * unit, uint32 bufnum)
{
SndBuf *buf;
World *world = unit->mWorld;
@@ -401,7 +398,6 @@
unit->mDone = true;
//SETCALC(Convolution2_next2);
}
-
}
}

@@ -422,7 +418,6 @@
RTFree(unit->mWorld, unit->m_scfft1);
RTFree(unit->mWorld, unit->m_scfft2);
RTFree(unit->mWorld, unit->m_scfftR);
-
}

@@ -744,13 +739,11 @@
RTFree(unit->mWorld, unit->m_tempbuf);
RTFree(unit->mWorld, unit->m_outbuf);
RTFree(unit->mWorld, unit->m_overlapbuf);
-
}

void Convolution2L_next(Convolution2L *unit, int numSamples)
{
-
float *in1 = IN(0);
//float *in2 = IN(1);
float curtrig = ZIN0(2);
@@ -1021,47 +1014,44 @@
//in place transform for now
//rffts(unit->m_fftbuf2[0], log2n, 1, cosTable[log2n]);
scfft_dofft(unit->m_scfft2[0]);
+ }

- buf = ConvGetBuffer(unit,bufnumR);
+ buf = ConvGetBuffer(unit,bufnumR);
+ if (buf) {

- if (buf) {
+ //if (bufnumR >= world->mNumSndBufs) bufnumR = 0;
+ //buf = world->mSndBufs + bufnumR;

- //if (bufnumR >= world->mNumSndBufs) bufnumR = 0;
- //buf = world->mSndBufs + bufnumR;
+ //calculate fft for kernel straight away
+ memcpy(unit->m_fftbuf2[1], buf->data, insize);
+ //zero pad second part of buffer to allow for convolution
+ memset(unit->m_fftbuf2[1]+unit->m_insize, 0, insize);
+ //in place transform for now
+ //rffts(unit->m_fftbuf2[1], log2n, 1, cosTable[log2n]);
+ scfft_dofft(unit->m_scfft2[1]);

- //calculate fft for kernel straight away
- memcpy(unit->m_fftbuf2[1], buf->data, insize);
- //zero pad second part of buffer to allow for convolution
- memset(unit->m_fftbuf2[1]+unit->m_insize, 0, insize);
- //in place transform for now
- //rffts(unit->m_fftbuf2[1], log2n, 1, cosTable[log2n]);
- scfft_dofft(unit->m_scfft2[1]);
+ //test for full input buffer
+ //unit->m_mask = unit->m_insize;
+ unit->m_pos = 0;
+ //
+ // unit->m_outbuf[0] = (float*)RTAlloc(unit->mWorld, fftsize);
+ // unit->m_overlapbuf[0] = (float*)RTAlloc(unit->mWorld, insize);
+ // unit->m_outbuf[1] = (float*)RTAlloc(unit->mWorld, fftsize);
+ // unit->m_overlapbuf[1] = (float*)RTAlloc(unit->mWorld, insize);
+ //
+ // memset(unit->m_outbuf[0], 0, fftsize);
+ // memset(unit->m_overlapbuf[0], 0, insize);
+ // memset(unit->m_outbuf[1], 0, fftsize);
+ // memset(unit->m_overlapbuf[1], 0, insize);

- //test for full input buffer
- //unit->m_mask = unit->m_insize;
- unit->m_pos = 0;
- //
- // unit->m_outbuf[0] = (float*)RTAlloc(unit->mWorld, fftsize);
- // unit->m_overlapbuf[0] = (float*)RTAlloc(unit->mWorld, insize);
- // unit->m_outbuf[1] = (float*)RTAlloc(unit->mWorld, fftsize);
- // unit->m_overlapbuf[1] = (float*)RTAlloc(unit->mWorld, insize);
- //
- // memset(unit->m_outbuf[0], 0, fftsize);
- // memset(unit->m_overlapbuf[0], 0, insize);
- // memset(unit->m_outbuf[1], 0, fftsize);
- // memset(unit->m_overlapbuf[1], 0, insize);
+ unit->m_prevtrig = 0.f;

- unit->m_prevtrig = 0.f;
-
- SETCALC(StereoConvolution2L_next);
-
- }
+ SETCALC(StereoConvolution2L_next);
}
}

void StereoConvolution2L_Dtor(StereoConvolution2L *unit)
{
-
scfft_destroy(unit->m_scfft1);
scfft_destroy(unit->m_scfft2[0]);
scfft_destroy(unit->m_scfft3[0]);
@@ -1105,7 +1095,6 @@

void StereoConvolution2L_next(StereoConvolution2L *unit, int wrongNumSamples)
{
-
float *in1 = IN(0);
//float *in2 = IN(1);
float curtrig = ZIN0(3);
@@ -1366,7 +1355,6 @@
SETCALC(Convolution3_next_a);
else
SETCALC(Convolution3_next_k);
-
}
}

@@ -1379,7 +1367,6 @@

void Convolution3_next_a(Convolution3 *unit)
{
-
float *in = IN(0);
float curtrig = ZIN0(2);

@@ -1443,7 +1430,6 @@

void Convolution3_next_k(Convolution3 *unit)
{
-
float input = ZIN0(0);
// float *in2 = IN(1);
float curtrig = ZIN0(2);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9815] trunk/Source/plugins

2010-02-08T10:03:33Z

Revision: 9815
http://supercollider.svn.sourceforge.net/supercollider/?rev=9815&view=rev
Author: timblech
Date: 2010-02-08 18:03:28 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
beattrack2: fix possible crash if buffer not allocated

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/BeatTrack.cpp
trunk/Source/plugins/BeatTrack2.cpp
trunk/Source/plugins/BeatTrack2.h

Modified: trunk/Source/plugins/BeatTrack.cpp
===================================================================
--- trunk/Source/plugins/BeatTrack.cpp 2010-02-08 18:01:53 UTC (rev 9814)
+++ trunk/Source/plugins/BeatTrack.cpp 2010-02-08 18:03:28 UTC (rev 9815)
@@ -137,18 +137,15 @@
unit->m_flagstep=0;

unit->mCalcFunc = (UnitCalcFunc)&BeatTrack_next;
-
}

void BeatTrack_Dtor(BeatTrack *unit)
{
-
RTFree(unit->mWorld, unit->m_prevmag);
RTFree(unit->mWorld, unit->m_prevphase);
RTFree(unit->mWorld, unit->m_predict);
-
}

Modified: trunk/Source/plugins/BeatTrack2.cpp
===================================================================
--- trunk/Source/plugins/BeatTrack2.cpp 2010-02-08 18:01:53 UTC (rev 9814)
+++ trunk/Source/plugins/BeatTrack2.cpp 2010-02-08 18:03:28 UTC (rev 9815)
@@ -151,13 +151,15 @@
//printf("srate %f conversion factor %f frame period %f \n", unit->m_srate, unit->m_srateconversion, unit->m_frameperiod);

- int bufnum = (int)(ZIN0(5)+0.001);
- if (bufnum >= unit->mWorld->mNumSndBufs) bufnum = 0;
+ int bufnum = (int)(ZIN0(5)+0.001f);
+ if (bufnum >= unit->mWorld->mNumSndBufs)
+ bufnum = 0;

- if(bufnum<0) {unit->m_weightingscheme = bufnum<2? 0 : 1; }
+ if (bufnum<0)
+ unit->m_weightingscheme = bufnum<2 ? 0 : 1;
else {
SndBuf *buf = unit->mWorld->mSndBufs + bufnum;
- unit->m_tempoweights= buf->data;
+ unit->m_tempoweights= buf;
unit->m_weightingscheme=2;
}

@@ -170,7 +172,6 @@

unit->mCalcFunc = (UnitCalcFunc)&BeatTrack2_next;
-
}

@@ -217,20 +218,23 @@

float weight; //compensation for number of events matched; may alter equation later

- switch (unit->m_weightingscheme) {
- case 0:
- weight = 1.0; //flat
- break;
- case 1:
- weight= 1.0f/(beatsfit*4); //compensate for number of time points tested
- break;
- case 2:
- weight = unit->m_tempoweights[which]; //user defined temmpo biases (usually a mask on allowed tempi)
- //printf("sanity check %f, %d \n", unit->m_tempoweights[which], which);
- break;
+ switch (unit->m_weightingscheme)
+ {
+ case 0:
+ weight = 1.0f; //flat
+ break;
+ case 1:
+ weight= 1.0f/(beatsfit*4); //compensate for number of time points tested
+ break;
+ case 2:
+ SndBuf * buf = unit->m_tempoweights;
+ if (buf->data)
+ weight = buf->data[which]; //user defined temmpo biases (usually a mask on allowed tempi)
+ else
+ weight = 1.f;
+ break;
}

-
int numfeatures= unit->m_numfeatures;

float * scores = unit->m_scores; //[2*numfeatures];

Modified: trunk/Source/plugins/BeatTrack2.h
===================================================================
--- trunk/Source/plugins/BeatTrack2.h 2010-02-08 18:01:53 UTC (rev 9814)
+++ trunk/Source/plugins/BeatTrack2.h 2010-02-08 18:03:28 UTC (rev 9815)
@@ -26,6 +26,7 @@
//assume 4 features * 120 tempi * 2 groove * 20 phase = 19200 per calculation time; say you calculate each 0.5 sec, amortise over (44100/64*0.5 >344.5) control blocks;
//calculate over 240 blocks

+#include "SC_PlugIn.h"

struct BeatTrack2 : Unit {

@@ -93,10 +94,8 @@
int q1trig;
int q2trig;

- float * m_tempoweights;
+ SndBuf * m_tempoweights;
int m_weightingscheme;
-
-
};

@@ -108,4 +107,3 @@
void BeatTrack2_Ctor(BeatTrack2 *unit);
void BeatTrack2_Dtor(BeatTrack2 *unit);
}
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9814] trunk/Source/plugins/BeatTrack2.cpp

2010-02-08T10:01:59Z

Revision: 9814
http://supercollider.svn.sourceforge.net/supercollider/?rev=9814&view=rev
Author: timblech
Date: 2010-02-08 18:01:53 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
beat track2: fix prototype of calculatetempalte

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/BeatTrack2.cpp

Modified: trunk/Source/plugins/BeatTrack2.cpp
===================================================================
--- trunk/Source/plugins/BeatTrack2.cpp 2010-02-08 17:48:42 UTC (rev 9813)
+++ trunk/Source/plugins/BeatTrack2.cpp 2010-02-08 18:01:53 UTC (rev 9814)
@@ -39,7 +39,7 @@
static float g_weight2[9]= {0.05, 0.1, 0.3,0.7,1.0,0.7,0.3, 0.1, 0.05};

//void BeatTrack2_dofft(BeatTrack2 *unit, uint32);
-static void calculatetemplate(BeatTrack2 *unit, int which);
+static void calculatetemplate(BeatTrack2 *unit, int which, int j);
static void finaldecision(BeatTrack2 *unit);

void BeatTrack2_Ctor(BeatTrack2* unit)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9813] trunk/Source/plugins/DemandUGens.cpp

2010-02-08T09:48:56Z

Revision: 9813
http://supercollider.svn.sourceforge.net/supercollider/?rev=9813&view=rev
Author: timblech
Date: 2010-02-08 17:48:42 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
demand ugens: cleanups and const safety

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/DemandUGens.cpp

Modified: trunk/Source/plugins/DemandUGens.cpp
===================================================================
--- trunk/Source/plugins/DemandUGens.cpp 2010-02-08 17:46:14 UTC (rev 9812)
+++ trunk/Source/plugins/DemandUGens.cpp 2010-02-08 17:48:42 UTC (rev 9813)
@@ -2112,7 +2112,7 @@

phase = sc_loop((Unit*)unit, phase, loopMax, loop);
int32 iphase = (int32)phase;
- float* table1 = bufData + iphase * bufChannels;
+ const float* table1 = bufData + iphase * bufChannels;
OUT0(0) = table1[0];
}
else
@@ -2123,20 +2123,18 @@

void Dbufrd_Ctor(Dbufrd *unit)
{
+ SETCALC(Dbufrd_next);

- SETCALC(Dbufrd_next);
+ unit->m_fbufnum = -1e9f;

- unit->m_fbufnum = -1e9f;
-
- Dbufrd_next(unit, 0);
- OUT0(0) = 0.f;
+ Dbufrd_next(unit, 0);
+ OUT0(0) = 0.f;
}

////////////////////////////////////

void Dbufwr_next(Dbufwr *unit, int inNumSamples)
{
-
int32 loop = (int32)DEMANDINPUT_A(3, inNumSamples);

D_GET_BUF
@@ -2147,41 +2145,40 @@
double phase;
float val;
if (inNumSamples)
- {
- float x = DEMANDINPUT_A(1, inNumSamples);
- if (sc_isnan(x)) {
- OUT0(0) = NAN;
- return;
- }
- phase = x;
- val = DEMANDINPUT_A(2, inNumSamples);
- if (sc_isnan(val)) {
- OUT0(0) = NAN;
- return;
- }
-
- phase = sc_loop((Unit*)unit, phase, loopMax, loop);
- int32 iphase = (int32)phase;
- float* table0 = bufData + iphase * bufChannels;
- table0[0] = val;
- OUT0(0) = val;
+ {
+ float x = DEMANDINPUT_A(1, inNumSamples);
+ if (sc_isnan(x)) {
+ OUT0(0) = NAN;
+ return;
}
- else
- {
- RESETINPUT(1);
- RESETINPUT(2);
+ phase = x;
+ val = DEMANDINPUT_A(2, inNumSamples);
+ if (sc_isnan(val)) {
+ OUT0(0) = NAN;
+ return;
}
+
+ phase = sc_loop((Unit*)unit, phase, loopMax, loop);
+ int32 iphase = (int32)phase;
+ float* table0 = bufData + iphase * bufChannels;
+ table0[0] = val;
+ OUT0(0) = val;
+ }
+ else
+ {
+ RESETINPUT(1);
+ RESETINPUT(2);
+ }
}

void Dbufwr_Ctor(Dbufwr *unit)
{
+ SETCALC(Dbufwr_next);

- SETCALC(Dbufwr_next);
+ unit->m_fbufnum = -1e9f;

- unit->m_fbufnum = -1e9f;
-
- Dbufwr_next(unit, 0);
- OUT0(0) = 0.f;
+ Dbufwr_next(unit, 0);
+ OUT0(0) = 0.f;
}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9812] trunk/Source/plugins

2010-02-08T09:46:33Z

Revision: 9812
http://supercollider.svn.sourceforge.net/supercollider/?rev=9812&view=rev
Author: timblech
Date: 2010-02-08 17:46:14 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
delay/grain ugens: const safety for read-only access

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/DelayUGens.cpp
trunk/Source/plugins/GrainUGens.cpp

Modified: trunk/Source/plugins/DelayUGens.cpp
===================================================================
--- trunk/Source/plugins/DelayUGens.cpp 2010-02-08 17:43:59 UTC (rev 9811)
+++ trunk/Source/plugins/DelayUGens.cpp 2010-02-08 17:46:14 UTC (rev 9812)
@@ -872,8 +872,8 @@
#define LOOP_BODY_2 \
phase = sc_loop((Unit*)unit, phase, loopMax, loop); \
int32 iphase = (int32)phase; \
- float* table1 = bufData + iphase * bufChannels; \
- float* table2 = table1 + bufChannels; \
+ const float* table1 = bufData + iphase * bufChannels; \
+ const float* table2 = table1 + bufChannels; \
if (iphase > guardFrame) { \
if (loop) { \
table2 -= bufSamples; \
@@ -893,7 +893,7 @@
#define LOOP_BODY_1 \
phase = sc_loop((Unit*)unit, phase, loopMax, loop); \
int32 iphase = (int32)phase; \
- float* table1 = bufData + iphase * bufChannels; \
+ const float* table1 = bufData + iphase * bufChannels; \
int32 index = 0; \
for (uint32 i=0; i<numOutputs; ++i) { \
*++(out[i]) = table1[index++]; \
@@ -990,8 +990,8 @@
unit->m_fbufnum = fbufnum;
unit->m_buf = world->mSndBufs + bufnum;
}
- SndBuf *buf = unit->m_buf;
- float *bufData __attribute__((__unused__)) = buf->data;
+ const SndBuf *buf = unit->m_buf;
+ const float *bufData __attribute__((__unused__)) = buf->data;
uint32 bufChannels __attribute__((__unused__)) = buf->channels;
uint32 bufSamples __attribute__((__unused__)) = buf->samples;
uint32 bufFrames = buf->frames;
@@ -6248,8 +6248,8 @@

#define GRAIN_BUF \
- SndBuf *buf = bufs + bufnum; \
- float *bufData __attribute__((__unused__)) = buf->data; \
+ const SndBuf *buf = bufs + bufnum; \
+ const float *bufData __attribute__((__unused__)) = buf->data; \
uint32 bufChannels __attribute__((__unused__)) = buf->channels; \
uint32 bufSamples __attribute__((__unused__)) = buf->samples; \
uint32 bufFrames = buf->frames; \
@@ -6281,10 +6281,10 @@
float amp = y1 * y1; \
phase = sc_gloop(phase, loopMax); \
int32 iphase = (int32)phase; \
- float* table1 = bufData + iphase; \
- float* table0 = table1 - 1; \
- float* table2 = table1 + 1; \
- float* table3 = table1 + 2; \
+ const float* table1 = bufData + iphase; \
+ const float* table0 = table1 - 1; \
+ const float* table2 = table1 + 1; \
+ const float* table3 = table1 + 2; \
if (iphase == 0) { \
table0 += bufSamples; \
} else if (iphase >= guardFrame) { \
@@ -6312,8 +6312,8 @@
float amp = y1 * y1; \
phase = sc_gloop(phase, loopMax); \
int32 iphase = (int32)phase; \
- float* table1 = bufData + iphase; \
- float* table2 = table1 + 1; \
+ const float* table1 = bufData + iphase; \
+ const float* table2 = table1 + 1; \
if (iphase > guardFrame) { \
table2 -= bufSamples; \
} \
@@ -6536,18 +6536,18 @@
unit->m_feedbk = sc_CalcFeedback(unit->m_delaytime, unit->m_decaytime);

if (INRATE(1) == calc_FullRate) {
- if(INRATE(5) == calc_FullRate){
- SETCALC(Pluck_next_aa_z);
+ if(INRATE(5) == calc_FullRate){
+ SETCALC(Pluck_next_aa_z);
} else {
- SETCALC(Pluck_next_ak_z); //ak
+ SETCALC(Pluck_next_ak_z); //ak
}
- } else {
+ } else {
if(INRATE(5) == calc_FullRate){
- SETCALC(Pluck_next_ka_z); //ka
+ SETCALC(Pluck_next_ka_z); //ka
} else {
- SETCALC(Pluck_next_kk_z); //kk
+ SETCALC(Pluck_next_kk_z); //kk
}
- }
+ }
OUT0(0) = unit->m_lastsamp = 0.f;
unit->m_prevtrig = 0.f;
unit->m_inputsamps = 0;

Modified: trunk/Source/plugins/GrainUGens.cpp
===================================================================
--- trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:43:59 UTC (rev 9811)
+++ trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:46:14 UTC (rev 9812)
@@ -187,7 +187,7 @@
}

#define GRAIN_BUF \
- SndBuf *buf; \
+ const SndBuf *buf; \
if (bufnum >= world->mNumSndBufs) { \
int localBufNum = bufnum - world->mNumSndBufs; \
Graph *parent = unit->mParent; \
@@ -202,7 +202,7 @@
buf = world->mSndBufs + bufnum; \
} \
\
- float *bufData __attribute__((__unused__)) = buf->data; \
+ const float *bufData __attribute__((__unused__)) = buf->data; \
uint32 bufChannels __attribute__((__unused__)) = buf->channels; \
uint32 bufSamples __attribute__((__unused__)) = buf->samples; \
uint32 bufFrames = buf->frames; \
@@ -213,7 +213,7 @@
double winPos, winInc, w, b1, y1, y2, y0, amp; \
winPos = winInc = w = b1 = y1 = y2 = y0 = amp = 0.; \
SndBuf *window; \
- float *windowData __attribute__((__unused__)); \
+ const float *windowData __attribute__((__unused__)) = 0;\
uint32 windowSamples __attribute__((__unused__)) = 0; \
uint32 windowFrames __attribute__((__unused__)) = 0; \
int windowGuardFrame = 0;
@@ -422,8 +422,8 @@
winPos += winInc; \
int iWinPos = (int)winPos; \
double winFrac = winPos - (double)iWinPos; \
- float* winTable1 = windowData + iWinPos; \
- float* winTable2 = winTable1 + 1; \
+ const float* winTable1 = windowData + iWinPos; \
+ const float* winTable2 = winTable1 + 1; \
if (!windowData) \
break; \
if (winPos > windowGuardFrame) \
@@ -953,10 +953,10 @@
#define GRAIN_BUF_LOOP_BODY_4 \
phase = sc_gloop(phase, loopMax); \
int32 iphase = (int32)phase; \
- float* table1 = bufData + iphase; \
- float* table0 = table1 - 1; \
- float* table2 = table1 + 1; \
- float* table3 = table1 + 2; \
+ const float* table1 = bufData + iphase; \
+ const float* table0 = table1 - 1; \
+ const float* table2 = table1 + 1; \
+ const float* table3 = table1 + 2; \
if (iphase == 0) { \
table0 += bufSamples; \
} else if (iphase >= guardFrame) { \
@@ -979,8 +979,8 @@
#define GRAIN_BUF_LOOP_BODY_2 \
phase = sc_gloop(phase, loopMax); \
int32 iphase = (int32)phase; \
- float* table1 = bufData + iphase; \
- float* table2 = table1 + 1; \
+ const float* table1 = bufData + iphase; \
+ const float* table2 = table1 + 1; \
if (iphase > guardFrame) { \
table2 -= bufSamples; \
} \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

sc svn: furniture will be rearranged this week

2010-02-08T09:44:03Z

Hi -

Just a warning so no-one gets any shocks: later this week I'm
intending to rearrange the svn trunk of supercollider a little, as
discussed in a recent sc-dev thread.
http://permalink.gmane.org/gmane.comp.audio.supercollider.devel/23290

Nothing will be deleted but the main build scripts will move slightly
(eg the mac xcode stuff will move into a 'mac' folder). The various
build scripts will need updating to reflect the changes, but that
should happen pretty quickly.

Dan
--
http://www.mcld.co.uk

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9810] trunk/Source/plugins/OscUGens.cpp

2010-02-08T09:41:54Z

Revision: 9810
http://supercollider.svn.sourceforge.net/supercollider/?rev=9810&view=rev
Author: timblech
Date: 2010-02-08 17:41:51 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
plugins: vosc cleanups

- add SndBuf * to VOSC_GET_BUF
- declare table data as const

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/OscUGens.cpp

Modified: trunk/Source/plugins/OscUGens.cpp
===================================================================
--- trunk/Source/plugins/OscUGens.cpp 2010-02-08 17:26:40 UTC (rev 9809)
+++ trunk/Source/plugins/OscUGens.cpp 2010-02-08 17:41:51 UTC (rev 9810)
@@ -2098,6 +2098,7 @@

////////////////////////////////////////////////////////////////////////////////////////////////////////
#define VOSC_GET_BUF \
+const SndBuf *bufs;\
if (bufnum+1 >= world->mNumSndBufs) { \
int localBufNum = bufnum - world->mNumSndBufs; \
Graph *parent = unit->mParent; \
@@ -2120,7 +2121,6 @@
unit->m_bufpos = nextbufpos;
uint32 bufnum = (uint32)floor(nextbufpos);
World *world = unit->mWorld;
- SndBuf *bufs;

VOSC_GET_BUF

@@ -2163,19 +2163,18 @@
float level = cur - floor(cur);

uint32 bufnum = (int)floor(cur);
- SndBuf *bufs;

VOSC_GET_BUF

- float *table0 = bufs[0].data;
- float *table2 = bufs[1].data;
+ const float *table0 = bufs[0].data;
+ const float *table2 = bufs[1].data;
if (!table0 || !table2 || tableSize != bufs[0].samples|| tableSize != bufs[1].samples) {
ClearUnitOutputs(unit, inNumSamples);
return;
}

- float *table1 = table0 + 1;
- float *table3 = table2 + 1;
+ const float *table1 = table0 + 1;
+ const float *table3 = table2 + 1;

LOOP1(inNumSamples,
float pfrac = PhaseFrac1(phase);
@@ -2215,19 +2214,17 @@

uint32 bufnum = (int)floor(cur);

- SndBuf *bufs;
-
VOSC_GET_BUF

- float *table0 = bufs[0].data;
- float *table2 = bufs[1].data;
+ const float *table0 = bufs[0].data;
+ const float *table2 = bufs[1].data;
if (!table0 || !table2 || tableSize != bufs[0].samples|| tableSize != bufs[1].samples) {
ClearUnitOutputs(unit, inNumSamples);
return;
}

- float *table1 = table0 + 1;
- float *table3 = table2 + 1;
+ const float *table1 = table0 + 1;
+ const float *table3 = table2 + 1;

LOOP(nsmps,
float pfrac = PhaseFrac1(phase);
@@ -2261,7 +2258,6 @@
unit->m_bufpos = nextbufpos;
uint32 bufnum = (uint32)floor(nextbufpos);
World *world = unit->mWorld;
- SndBuf *bufs;

VOSC_GET_BUF
int tableSize = bufs[0].samples;
@@ -2306,19 +2302,18 @@
float level = cur - floor(cur);

uint32 bufnum = (int)floor(cur);
- SndBuf *bufs;

VOSC_GET_BUF

- float *table0 = bufs[0].data;
- float *table2 = bufs[1].data;
+ const float *table0 = bufs[0].data;
+ const float *table2 = bufs[1].data;
if (!table0 || !table2 || tableSize != bufs[0].samples|| tableSize != bufs[1].samples) {
ClearUnitOutputs(unit, inNumSamples);
return;
}

- float *table1 = table0 + 1;
- float *table3 = table2 + 1;
+ const float *table1 = table0 + 1;
+ const float *table3 = table2 + 1;

LOOP1(inNumSamples,

@@ -2382,19 +2377,18 @@
float slope = sweepdiff / (float)nsmps;

uint32 bufnum = (int)floor(cur);
- SndBuf *bufs;

VOSC_GET_BUF

- float *table0 = bufs[0].data;
- float *table2 = bufs[1].data;
+ const float *table0 = bufs[0].data;
+ const float *table2 = bufs[1].data;
if (!table0 || !table2 || tableSize != bufs[0].samples|| tableSize != bufs[1].samples) {
ClearUnitOutputs(unit, inNumSamples);
return;
}

- float *table1 = table0 + 1;
- float *table3 = table2 + 1;
+ const float *table1 = table0 + 1;
+ const float *table3 = table2 + 1;

LOOP(nsmps,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9809] trunk/Source/plugins/GrainUGens.cpp

2010-02-08T09:26:41Z

Revision: 9809
http://supercollider.svn.sourceforge.net/supercollider/?rev=9809&view=rev
Author: timblech
Date: 2010-02-08 17:26:40 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
grain ugens: fix custom envelopes

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/GrainUGens.cpp

Modified: trunk/Source/plugins/GrainUGens.cpp
===================================================================
--- trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:25:41 UTC (rev 9808)
+++ trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:26:40 UTC (rev 9809)
@@ -522,7 +522,7 @@
float winType = grain_in_at<full_rate>(unit, 4, position);
DECLARE_WINDOW
GET_GRAIN_WIN(winType)
- if (winType >= 0 || (windowData == NULL))
+ if (winType >= 0 && (windowData == NULL))
return;

GrainInG *grain = unit->mGrains + unit->mNumActive++;
@@ -671,7 +671,7 @@
float winType = grain_in_at<full_rate>(unit, 4, position);
DECLARE_WINDOW
GET_GRAIN_WIN(winType)
- if (winType >= 0 || (windowData == NULL))
+ if (winType >= 0 && (windowData == NULL))
return;

GrainSinG *grain = unit->mGrains + unit->mNumActive++;
@@ -837,10 +837,10 @@
return;
}

- float winType = grain_in_at<full_rate>(unit, 4, position);
+ float winType = grain_in_at<full_rate>(unit, 6, position);
DECLARE_WINDOW
GET_GRAIN_WIN(winType)
- if (winType >= 0 || (windowData == NULL))
+ if (winType >= 0 && (windowData == NULL))
return;

GrainFMG *grain = unit->mGrains + unit->mNumActive++;
@@ -1074,7 +1074,7 @@
float winType = grain_in_at<full_rate>(unit, 7, position);
DECLARE_WINDOW
GET_GRAIN_WIN(winType)
- if (winType >= 0 || (windowData == NULL))
+ if (winType >= 0 && (windowData == NULL))
return;

uint32 bufnum = grain_in_at<full_rate>(unit, 2, position);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9808] trunk/Source/plugins/GrainUGens.cpp

2010-02-08T09:25:41Z

Revision: 9808
http://supercollider.svn.sourceforge.net/supercollider/?rev=9808&view=rev
Author: timblech
Date: 2010-02-08 17:25:41 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
grain ugens: remove unused variables

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/GrainUGens.cpp

Modified: trunk/Source/plugins/GrainUGens.cpp
===================================================================
--- trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:24:36 UTC (rev 9807)
+++ trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:25:41 UTC (rev 9808)
@@ -727,9 +727,6 @@

SETUP_GRAIN_OUTS

- float *table0 = ft->mSineWavetable;
- float *table1 = table0 + 1;
-
float *trig = IN(0);
for (int i=0; i<inNumSamples; ++i) {
if ((unit->curtrig <= 0) && (trig[i] > 0.0))
@@ -1007,8 +1004,6 @@
{
SETUP_GRAIN_OUTS
World *world = unit->mWorld;
- SndBuf *bufs = world->mSndBufs;
- uint32 numBufs = world->mNumSndBufs;

for (int i=0; i < unit->mNumActive; ) {
GrainBufG *grain = unit->mGrains + i;
@@ -1069,8 +1064,6 @@
inline void GrainBuf_next_start_new(GrainBuf *unit, int inNumSamples, int position)
{
World *world = unit->mWorld;
- SndBuf *bufs = world->mSndBufs;
- uint32 numBufs = world->mNumSndBufs;

if (unit->mNumActive+1 >= unit->mMaxGrains) {
Print("Too many grains!\n");
@@ -1253,9 +1246,6 @@
SETUP_OUT
CHECK_BUF

- World *world = unit->mWorld;
- uint32 numBufs = world->mNumSndBufs;
-
for (uint32 n=0; n < numOutputs; n++) {
int nextGrain = unit->mNextGrain[n];
for (int i=0; i < unit->mNumActive[n]; ) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9807] trunk/Source/plugins/GrainUGens.cpp

2010-02-08T09:24:36Z

Revision: 9807
http://supercollider.svn.sourceforge.net/supercollider/?rev=9807&view=rev
Author: timblech
Date: 2010-02-08 17:24:36 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
grain ugens: fix warp for new macros

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/GrainUGens.cpp

Modified: trunk/Source/plugins/GrainUGens.cpp
===================================================================
--- trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:23:53 UTC (rev 9806)
+++ trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:24:36 UTC (rev 9807)
@@ -1327,7 +1327,13 @@
grain->interp = (int)GRAIN_IN_AT(unit, 7, i);
float winType = grain->winType = (int)GRAIN_IN_AT(unit, 4, i); // the buffer that holds the grain shape
DECLARE_WINDOW
- GET_GRAIN_WIN(winType)
+
+ if (winType >= unit->mWorld->mNumSndBufs) {
+ Print("Envelope buffer out of range!\n");
+ break;
+ }
+
+ GET_GRAIN_WIN_RELAXED(winType)
if (windowData || (winType < 0.)) {
GET_GRAIN_INIT_AMP

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9806] trunk/Source/plugins/GrainUGens.cpp

2010-02-08T09:23:53Z

Revision: 9806
http://supercollider.svn.sourceforge.net/supercollider/?rev=9806&view=rev
Author: timblech
Date: 2010-02-08 17:23:53 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
grain ugens: remove unused macros

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/GrainUGens.cpp

Modified: trunk/Source/plugins/GrainUGens.cpp
===================================================================
--- trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:23:05 UTC (rev 9805)
+++ trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:23:53 UTC (rev 9806)
@@ -473,53 +473,7 @@
out2 = out[chan2]; \
}

-#define WARP_GRAIN_LOOP_BODY_4 \
- phase = sc_gloop(phase, loopMax); \
- int32 iphase = (int32)phase; \
- float* table1 = bufData + iphase * bufChannels; \
- float* table0 = table1 - bufChannels; \
- float* table2 = table1 + bufChannels; \
- float* table3 = table2 + bufChannels; \
- if (iphase == 0) { \
- table0 += bufSamples; \
- } else if (iphase >= guardFrame) { \
- if (iphase == guardFrame) { \
- table3 -= bufSamples; \
- } else { \
- table2 -= bufSamples; \
- table3 -= bufSamples; \
- } \
- } \
- float fracphase = phase - (double)iphase; \
- float a = table0[n]; \
- float b = table1[n]; \
- float c = table2[n]; \
- float d = table3[n]; \
- float outval = amp * cubicinterp(fracphase, a, b, c, d); \
- ZXP(out1) += outval;

-#define WARP_GRAIN_LOOP_BODY_2 \
- phase = sc_gloop(phase, loopMax); \
- int32 iphase = (int32)phase; \
- float* table1 = bufData + iphase * bufChannels; \
- float* table2 = table1 + bufChannels; \
- if (iphase > guardFrame) { \
- table2 -= bufSamples; \
- } \
- float fracphase = phase - (double)iphase; \
- float b = table1[n]; \
- float c = table2[n]; \
- float outval = amp * (b + fracphase * (c - b)); \
- ZXP(out1) += outval;
-
-// amp needs to be calculated by looking up values in window
-
-#define WARP_GRAIN_LOOP_BODY_1 \
- phase = sc_gloop(phase, loopMax); \
- int32 iphase = (int32)phase; \
- float outval = amp * bufData[iphase + n]; \
- ZXP(out1) += outval;
-
//////////////////// InGrain ////////////////////

inline void GrainIn_next_play_active(GrainIn * unit, int inNumSamples)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9805] trunk/Source/plugins/GrainUGens.cpp

2010-02-08T09:23:05Z

Revision: 9805
http://supercollider.svn.sourceforge.net/supercollider/?rev=9805&view=rev
Author: timblech
Date: 2010-02-08 17:23:05 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
grain ugens: range check for envelope buffer

the current implementation doesn't contain a check, whether the envelope
buffer number is actually valid

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/GrainUGens.cpp

Modified: trunk/Source/plugins/GrainUGens.cpp
===================================================================
--- trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:21:54 UTC (rev 9804)
+++ trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:23:05 UTC (rev 9805)
@@ -226,8 +226,9 @@
return; \
}

-#define GET_GRAIN_WIN(WINTYPE) \
+#define GET_GRAIN_WIN_RELAXED(WINTYPE) \
do { \
+ assert(WINTYPE < unit->mWorld->mNumSndBufs); \
window = unit->mWorld->mSndBufs + (int)WINTYPE; \
windowData = window->data; \
windowSamples = window->samples; \
@@ -235,6 +236,15 @@
windowGuardFrame = windowFrames - 1; \
} while (0);

+#define GET_GRAIN_WIN(WINTYPE) \
+ do { \
+ if (WINTYPE >= unit->mWorld->mNumSndBufs) { \
+ Print("Envelope buffer out of range!\n"); \
+ return; \
+ } \
+ GET_GRAIN_WIN_RELAXED(WINTYPE) \
+ } while (0);
+
#define GRAIN_LOOP_BODY_4 \
float amp = y1 * y1; \
phase = sc_gloop(phase, loopMax); \
@@ -428,7 +438,7 @@
y2 = grain->y2; \
amp = grain->curamp; \
} else { \
- GET_GRAIN_WIN(grain->winType); \
+ GET_GRAIN_WIN_RELAXED(grain->winType); \
if (!windowData) break; \
winPos = grain->winPos; \
winInc = grain->winInc; \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9804] trunk/Source/plugins/GrainUGens.cpp

2010-02-08T09:21:54Z

Revision: 9804
http://supercollider.svn.sourceforge.net/supercollider/?rev=9804&view=rev
Author: timblech
Date: 2010-02-08 17:21:54 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
grain ugens: unify common code of grain starting

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/GrainUGens.cpp

Modified: trunk/Source/plugins/GrainUGens.cpp
===================================================================
--- trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:20:27 UTC (rev 9803)
+++ trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:21:54 UTC (rev 9804)
@@ -163,6 +163,15 @@
return IN0(index);
}

+template <bool full_rate>
+inline float grain_in_at(Unit* unit, int index, int offset)
+{
+ if (full_rate)
+ return GRAIN_IN_AT(unit, index, offset);
+ else
+ return IN0(index);
+}
+
inline double sc_gloop(double in, double hi)
{
// avoid the divide if possible
@@ -434,24 +443,15 @@
grain->curamp = amp; \
grain->counter -= nsmps;

-#define WRAP_CHAN \
- out1 = out[grain->chan] + i; \
+#define WRAP_CHAN(offset) \
+ out1 = out[grain->chan] + offset; \
if(numOutputs > 1) { \
if((grain->chan + 1) >= (int)numOutputs) \
- out2 = out[0] + i; \
+ out2 = out[0] + offset; \
else \
- out2 = out[grain->chan + 1] + i; \
+ out2 = out[grain->chan + 1] + offset; \
}

-#define WRAP_CHAN_K \
- out1 = out[grain->chan]; \
- if(numOutputs > 1) { \
- if((grain->chan + 1) >= (int)numOutputs) \
- out2 = out[0]; \
- else \
- out2 = out[grain->chan + 1]; \
- }
-
#define GET_PAN_PARAMS \
float pan1 = grain->pan1; \
uint32 chan1 = grain->chan; \
@@ -547,60 +547,68 @@
}
}

-void GrainIn_next_a(GrainIn *unit, int inNumSamples)
+template <bool full_rate>
+inline void GrainIn_next_start_new(GrainIn * unit, int inNumSamples, int position)
{
- ClearUnitOutputs(unit, inNumSamples);
- //begin add
- // end add
+ if (unit->mNumActive+1 >= unit->mMaxGrains) {
+ Print("Too many grains!\n");
+ return;
+ }

- GrainIn_next_play_active(unit, inNumSamples);
+ float winType = grain_in_at<full_rate>(unit, 4, position);
+ DECLARE_WINDOW
+ GET_GRAIN_WIN(winType)
+ if (winType >= 0 || (windowData == NULL))
+ return;

+ GrainInG *grain = unit->mGrains + unit->mNumActive++;
+ float winSize = grain_in_at<full_rate>(unit, 1, position);
+ double counter = winSize * SAMPLERATE;
+ counter = sc_max(4., counter);
+ grain->counter = (int)counter;
+ grain->winType = winType;
+
+ GET_GRAIN_INIT_AMP
+
SETUP_GRAIN_OUTS
float *in = IN(2);
- float *trig = IN(0);
- for (int i=0; i<inNumSamples; ++i) {
- if ((unit->curtrig <= 0) && (trig[i] > 0.0)) {
- // start a grain
- if (unit->mNumActive+1 >= unit->mMaxGrains) {Print("Too many grains!\n"); break;}
- float winType = GRAIN_IN_AT(unit, 4, i);
- DECLARE_WINDOW
- GET_GRAIN_WIN(winType)
- if (windowData || (winType < 0.)) {
- GrainInG *grain = unit->mGrains + unit->mNumActive++;
- float winSize = GRAIN_IN_AT(unit, 1, i);
- double counter = winSize * SAMPLERATE;
- counter = sc_max(4., counter);
- grain->counter = (int)counter;
- grain->winType = winType;

- GET_GRAIN_INIT_AMP
+ float *in1 = in + position;
+ // begin add //
+ float pan = grain_in_at<full_rate>(unit, 3, position);

- float *in1 = in + i;
- // begin add //
- float pan = GRAIN_IN_AT(unit, 3, i);
+ CALC_GRAIN_PAN

- CALC_GRAIN_PAN
+ WRAP_CHAN(position)

- WRAP_CHAN
+ int nsmps = sc_min(grain->counter, inNumSamples - position);
+ for (int j=0; j<nsmps; ++j) {
+ float outval = amp * in1[j];
+ // begin add / change
+ out1[j] += outval * pan1;
+ if(numOutputs > 1) out2[j] += outval * pan2;
+ // end add / change
+ CALC_NEXT_GRAIN_AMP
+ }

- // end add //
+ SAVE_GRAIN_AMP_PARAMS

- int nsmps = sc_min(grain->counter, inNumSamples - i);
- for (int j=0; j<nsmps; ++j) {
- float outval = amp * in1[j];
- // begin add / change
- out1[j] += outval * pan1;
- if(numOutputs > 1) out2[j] += outval * pan2;
- // end add / change
- CALC_NEXT_GRAIN_AMP
- }
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
+}

- SAVE_GRAIN_AMP_PARAMS
+void GrainIn_next_a(GrainIn *unit, int inNumSamples)
+{
+ ClearUnitOutputs(unit, inNumSamples);
+ //begin add
+ // end add

- if (grain->counter <= 0)
- *grain = unit->mGrains[--unit->mNumActive]; // remove grain
- }
- }
+ GrainIn_next_play_active(unit, inNumSamples);
+
+ float *trig = IN(0);
+ for (int i=0; i<inNumSamples; ++i) {
+ if ((unit->curtrig <= 0) && (trig[i] > 0.0))
+ GrainIn_next_start_new<true>(unit, inNumSamples, i);
unit->curtrig = trig[i];
}
}
@@ -617,53 +625,10 @@

GrainIn_next_play_active(unit, inNumSamples);

- SETUP_GRAIN_OUTS
-
- float *in = IN(2);
float trig = IN0(0);

- if ((unit->curtrig <= 0) && (trig > 0.0)) {
- // start a grain
- if (unit->mNumActive+1 >= unit->mMaxGrains)
- Print("Too many grains!\n");
- else {
- float winType = IN0(4);
- DECLARE_WINDOW
- GET_GRAIN_WIN(winType)
- if (windowData || (winType < 0.)) {
- GrainInG *grain = unit->mGrains + unit->mNumActive++;
- float winSize = IN0(1);
- double counter = winSize * SAMPLERATE;
- counter = sc_max(4., counter);
- grain->counter = (int)counter;
- grain->winType = winType;
-
- GET_GRAIN_INIT_AMP
- // begin add
- float pan = IN0(3);
-
- CALC_GRAIN_PAN
-
- WRAP_CHAN_K
-
- // end add
- int nsmps = sc_min(grain->counter, inNumSamples);
- for (int j=0; j<nsmps; ++j) {
- float outval = amp * in[j];
- // begin add / change
- out1[j] += outval * pan1;
- if(numOutputs > 1) out2[j] += outval * pan2;
- // end add / change
- CALC_NEXT_GRAIN_AMP
- }
-
- SAVE_GRAIN_AMP_PARAMS
-
- if (grain->counter <= 0)
- *grain = unit->mGrains[--unit->mNumActive]; // remove grain
- }
- }
- }
+ if ((unit->curtrig <= 0) && (trig > 0.0))
+ GrainIn_next_start_new<false>(unit, inNumSamples, 0);
unit->curtrig = trig;
}

@@ -731,70 +696,80 @@
}
}

-void GrainSin_next_a(GrainSin *unit, int inNumSamples)
+template <bool full_rate>
+inline void GrainSin_next_start_new(GrainSin * unit, int inNumSamples, int position)
{
- ClearUnitOutputs(unit, inNumSamples);
+ if (unit->mNumActive+1 >= unit->mMaxGrains) {
+ Print("Too many grains!\n");
+ return;
+ }

- GrainSin_next_play_active(unit, inNumSamples);
+ float winType = grain_in_at<full_rate>(unit, 4, position);
+ DECLARE_WINDOW
+ GET_GRAIN_WIN(winType)
+ if (winType >= 0 || (windowData == NULL))
+ return;

+ GrainSinG *grain = unit->mGrains + unit->mNumActive++;
+ float freq = grain_in_at<full_rate>(unit, 2, position);
+ float winSize = grain_in_at<full_rate>(unit, 1, position);
+ int32 thisfreq = grain->freq = (int32)(unit->m_cpstoinc * freq);
+ int32 oscphase = 0;
+ double counter = winSize * SAMPLERATE;
+ counter = sc_max(4., counter);
+ grain->counter = (int)counter;
+ grain->winType = winType;
+
+ GET_GRAIN_INIT_AMP
+
SETUP_GRAIN_OUTS

float *table0 = ft->mSineWavetable;
float *table1 = table0 + 1;

- float *trig = IN(0);
- for (int i=0; i<inNumSamples; ++i) {
- if ((unit->curtrig <= 0) && (trig[i] > 0.0)) {
- // start a grain
- if (unit->mNumActive+1 >= unit->mMaxGrains) {
- Print("Too many grains!\n");
- break;
- }
- float winType = GRAIN_IN_AT(unit, 4, i);
- DECLARE_WINDOW
- GET_GRAIN_WIN(winType)
- if (windowData || (winType < 0.)) {
- GrainSinG *grain = unit->mGrains + unit->mNumActive++;
- // INRATE(1) == calcFullRate
- float freq = GRAIN_IN_AT(unit, 2, i);
- float winSize = GRAIN_IN_AT(unit, 1, i);
- int32 thisfreq = grain->freq = (int32)(unit->m_cpstoinc * freq);
- int32 oscphase = 0;
- double counter = winSize * SAMPLERATE;
- counter = sc_max(4., counter);
- grain->counter = (int)counter;
- grain->winType = winType; //GRAIN_IN_AT(unit, 4, i);
+ // begin add //
+ float pan = grain_in_at<full_rate>(unit, 3, position);

- GET_GRAIN_INIT_AMP
+ CALC_GRAIN_PAN

- // begin add //
- float pan = GRAIN_IN_AT(unit, 3, i);
+ WRAP_CHAN(position)

- CALC_GRAIN_PAN
+ // end add //

- WRAP_CHAN
+ int nsmps = sc_min(grain->counter, inNumSamples - position);
+ for (int j=0; j<nsmps; ++j) {
+ float outval = amp * lookupi1(table0, table1, oscphase, unit->m_lomask);
+ // begin add / change
+ out1[j] += outval * pan1;
+ if(numOutputs > 1) out2[j] += outval * pan2;
+ // end add / change
+ CALC_NEXT_GRAIN_AMP

- // end add //
+ oscphase += thisfreq;
+ }
+ grain->oscphase = oscphase;

- int nsmps = sc_min(grain->counter, inNumSamples - i);
- for (int j=0; j<nsmps; ++j) {
- float outval = amp * lookupi1(table0, table1, oscphase, unit->m_lomask);
- // begin add / change
- out1[j] += outval * pan1;
- if(numOutputs > 1) out2[j] += outval * pan2;
- // end add / change
- CALC_NEXT_GRAIN_AMP
+ SAVE_GRAIN_AMP_PARAMS

- oscphase += thisfreq;
- }
- grain->oscphase = oscphase;
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
+}

- SAVE_GRAIN_AMP_PARAMS
+void GrainSin_next_a(GrainSin *unit, int inNumSamples)
+{
+ ClearUnitOutputs(unit, inNumSamples);

- if (grain->counter <= 0)
- *grain = unit->mGrains[--unit->mNumActive]; // remove grain
- }
- }
+ GrainSin_next_play_active(unit, inNumSamples);
+
+ SETUP_GRAIN_OUTS
+
+ float *table0 = ft->mSineWavetable;
+ float *table1 = table0 + 1;
+
+ float *trig = IN(0);
+ for (int i=0; i<inNumSamples; ++i) {
+ if ((unit->curtrig <= 0) && (trig[i] > 0.0))
+ GrainSin_next_start_new<true>(unit, inNumSamples, i);
unit->curtrig = trig[i];
}
}
@@ -811,65 +786,14 @@

GrainSin_next_play_active(unit, inNumSamples);

- SETUP_GRAIN_OUTS
- float *table0 = ft->mSineWavetable;
- float *table1 = table0 + 1;
-
float trig = IN0(0);
- if ((unit->curtrig <= 0) && (trig > 0.0)) {
- // start a grain
- if (unit->mNumActive+1 >= unit->mMaxGrains)
- {
- Print("Too many grains!\n");
- } else {
- float winType = IN0(4);
- DECLARE_WINDOW
- GET_GRAIN_WIN(winType)
- if (windowData || (winType < 0.)) {
- GrainSinG *grain = unit->mGrains + unit->mNumActive++;
- float freq = IN0(2);
- float winSize = IN0(1);
- int32 thisfreq = grain->freq = (int32)(unit->m_cpstoinc * freq);
- int32 oscphase = 0;
- double counter = winSize * SAMPLERATE;
- counter = sc_max(4., counter);
- grain->counter = (int)counter;
- grain->winType = winType;

- GET_GRAIN_INIT_AMP

- // begin add
- float pan = IN0(3);
-
- CALC_GRAIN_PAN
-
- WRAP_CHAN_K
-
- // end add
- int nsmps = sc_min(grain->counter, inNumSamples);
- for (int j=0; j<nsmps; ++j) {
- float outval = amp * lookupi1(table0, table1, oscphase, unit->m_lomask);
- // begin add / change
- out1[j] += outval * pan1;
- if(numOutputs > 1) out2[j] += outval * pan2;
- // end add / change
- CALC_NEXT_GRAIN_AMP
-
- oscphase += thisfreq;
- }
- grain->oscphase = oscphase;
-
- SAVE_GRAIN_AMP_PARAMS
-
- if (grain->counter <= 0)
- *grain = unit->mGrains[--unit->mNumActive]; // remove grain
- }
- }
- }
+ if ((unit->curtrig <= 0) && (trig > 0.0))
+ GrainSin_next_start_new<false>(unit, inNumSamples, 0);
unit->curtrig = trig;
}

-
void GrainSin_Ctor(GrainSin *unit)
{
if (INRATE(0) == calc_FullRate)
@@ -891,6 +815,7 @@
RTFree(unit->mWorld, unit->mGrains);
}

+
inline void GrainFM_next_play_active(GrainFM *unit, int inNumSamples)
{
SETUP_GRAIN_OUTS
@@ -943,78 +868,82 @@
}
}

-void GrainFM_next_a(GrainFM *unit, int inNumSamples)
+template <bool full_rate>
+inline void GrainFM_next_start_new(GrainFM * unit, int inNumSamples, int position)
{
- ClearUnitOutputs(unit, inNumSamples);
+ if (unit->mNumActive+1 >= unit->mMaxGrains) {
+ Print("Too many grains!\n");
+ return;
+ }

- GrainFM_next_play_active(unit, inNumSamples);
+ float winType = grain_in_at<full_rate>(unit, 4, position);
+ DECLARE_WINDOW
+ GET_GRAIN_WIN(winType)
+ if (winType >= 0 || (windowData == NULL))
+ return;

+ GrainFMG *grain = unit->mGrains + unit->mNumActive++;
+ float winSize = GRAIN_IN_AT(unit, 1, position);
+ float carfreq = GRAIN_IN_AT(unit, 2, position);
+ float modfreq = GRAIN_IN_AT(unit, 3, position);
+ float index = GRAIN_IN_AT(unit, 4, position);
+ float deviation = grain->deviation = index * modfreq;
+ int32 mfreq = grain->mfreq = (int32)(unit->m_cpstoinc * modfreq);
+ grain->carbase = carfreq;
+ int32 coscphase = 0;
+ int32 moscphase = 0;
+ double counter = winSize * SAMPLERATE;
+ counter = sc_max(4., counter);
+ grain->counter = (int)counter;
+ grain->winType = winType; //GRAIN_IN_AT(unit, 6, i);
+
+ GET_GRAIN_INIT_AMP
SETUP_GRAIN_OUTS

float *table0 = ft->mSineWavetable;
float *table1 = table0 + 1;

- float *trig = IN(0);
- for (int i=0; i<inNumSamples; ++i) {
- if ((unit->curtrig <= 0) && (trig[i] > 0.0)) {
- // start a grain
- if (unit->mNumActive+1 >= unit->mMaxGrains) {
- Print("Too many grains!\n");
- break;
- }
- float winType = GRAIN_IN_AT(unit, 6, i);
- DECLARE_WINDOW
- GET_GRAIN_WIN(winType)
+ // begin add //
+ float pan = GRAIN_IN_AT(unit, 5, position);

- if (windowData || (winType < 0.)) {
- GrainFMG *grain = unit->mGrains + unit->mNumActive++;
- float winSize = GRAIN_IN_AT(unit, 1, i);
- float carfreq = GRAIN_IN_AT(unit, 2, i);
- float modfreq = GRAIN_IN_AT(unit, 3, i);
- float index = GRAIN_IN_AT(unit, 4, i);
- float deviation = grain->deviation = index * modfreq;
- int32 mfreq = grain->mfreq = (int32)(unit->m_cpstoinc * modfreq);
- grain->carbase = carfreq;
- int32 coscphase = 0;
- int32 moscphase = 0;
- double counter = winSize * SAMPLERATE;
- counter = sc_max(4., counter);
- grain->counter = (int)counter;
- grain->winType = winType; //GRAIN_IN_AT(unit, 6, i);
+ CALC_GRAIN_PAN

- GET_GRAIN_INIT_AMP
+ WRAP_CHAN(position)

- // begin add //
- float pan = GRAIN_IN_AT(unit, 5, i);
+ // end add //
+ int nsmps = sc_min(grain->counter, inNumSamples - position);
+ for (int j=0; j<nsmps; ++j) {
+ float thismod = lookupi1(table0, table1, moscphase, unit->m_lomask) * deviation;
+ float outval = amp * lookupi1(table0, table1, coscphase, unit->m_lomask);
+ // begin add / change
+ out1[j] += outval * pan1;
+ if(numOutputs > 1) out2[j] += outval * pan2;
+ // end add / change
+ CALC_NEXT_GRAIN_AMP

- CALC_GRAIN_PAN
+ int32 cfreq = (int32)(unit->m_cpstoinc * (carfreq + thismod)); // needs to be calced in the loop!
+ coscphase += cfreq;
+ moscphase += mfreq;
+ } // need to save float carbase, int32 mfreq, float deviation
+ grain->coscphase = coscphase;
+ grain->moscphase = moscphase;

- WRAP_CHAN
+ SAVE_GRAIN_AMP_PARAMS

- // end add //
- int nsmps = sc_min(grain->counter, inNumSamples - i);
- for (int j=0; j<nsmps; ++j) {
- float thismod = lookupi1(table0, table1, moscphase, unit->m_lomask) * deviation;
- float outval = amp * lookupi1(table0, table1, coscphase, unit->m_lomask);
- // begin add / change
- out1[j] += outval * pan1;
- if(numOutputs > 1) out2[j] += outval * pan2;
- // end add / change
- CALC_NEXT_GRAIN_AMP
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
+}

- int32 cfreq = (int32)(unit->m_cpstoinc * (carfreq + thismod)); // needs to be calced in the loop!
- coscphase += cfreq;
- moscphase += mfreq;
- } // need to save float carbase, int32 mfreq, float deviation
- grain->coscphase = coscphase;
- grain->moscphase = moscphase;
+void GrainFM_next_a(GrainFM *unit, int inNumSamples)
+{
+ ClearUnitOutputs(unit, inNumSamples);

- SAVE_GRAIN_AMP_PARAMS
+ GrainFM_next_play_active(unit, inNumSamples);

- if (grain->counter <= 0)
- *grain = unit->mGrains[--unit->mNumActive]; // remove grain
- }
- }
+ float *trig = IN(0);
+ for (int i=0; i<inNumSamples; ++i) {
+ if ((unit->curtrig <= 0) && (trig[i] > 0.0))
+ GrainFM_next_start_new<true>(unit, inNumSamples, i);
unit->curtrig = trig[i];
}
}
@@ -1032,68 +961,10 @@

GrainFM_next_play_active(unit, inNumSamples);

- SETUP_GRAIN_OUTS
-
- float *table0 = ft->mSineWavetable;
- float *table1 = table0 + 1;
-
float trig = IN0(0);
- if ((unit->curtrig <= 0) && (trig > 0.0)) {
- // start a grain
- if (unit->mNumActive+1 >= unit->mMaxGrains)
- Print("Too many grains!\n");
- else {
- float winType = IN0(6);
- DECLARE_WINDOW
- GET_GRAIN_WIN(winType)
- if (windowData || (winType < 0.)) {
- GrainFMG *grain = unit->mGrains + unit->mNumActive++;
- float winSize = IN0(1);
- float carfreq = IN0(2);
- float modfreq = IN0(3);
- float index = IN0(4);
- float deviation = grain->deviation = index * modfreq;
- int32 mfreq = grain->mfreq = (int32)(unit->m_cpstoinc * modfreq);
- grain->carbase = carfreq;
- int32 coscphase = 0;
- int32 moscphase = 0;
- double counter = winSize * SAMPLERATE;
- counter = sc_max(4., counter);
- grain->counter = (int)counter;
- grain->winType = winType;
+ if ((unit->curtrig <= 0) && (trig > 0.0))
+ GrainFM_next_start_new<false>(unit, inNumSamples, 0);

- GET_GRAIN_INIT_AMP
- // begin add
- float pan = IN0(5);
-
- CALC_GRAIN_PAN
-
- WRAP_CHAN_K
-
- // end add
- int nsmps = sc_min(grain->counter, inNumSamples);
- for (int j=0; j<nsmps; ++j) {
- float thismod = lookupi1(table0, table1, moscphase, unit->m_lomask) * deviation;
- float outval = amp * lookupi1(table0, table1, coscphase, unit->m_lomask);
- // begin add / change
- out1[j] += outval * pan1;
- if(numOutputs > 1) out2[j] += outval * pan2;
- // end add / change
- CALC_NEXT_GRAIN_AMP
-
- int32 cfreq = (int32)(unit->m_cpstoinc * (carfreq + thismod)); // needs to be calced in the loop!
- coscphase += cfreq;
- moscphase += mfreq;
- } // need to save float carbase, int32 mfreq, float deviation
- grain->coscphase = coscphase;
- grain->moscphase = moscphase;
- SAVE_GRAIN_AMP_PARAMS
-
- if (grain->counter <= 0)
- *grain = unit->mGrains[--unit->mNumActive]; // remove grain
- }
- }
- }
unit->curtrig = trig;
}

@@ -1230,98 +1101,98 @@
}
}

-void GrainBuf_next_a(GrainBuf *unit, int inNumSamples)
+template <bool full_rate>
+inline void GrainBuf_next_start_new(GrainBuf *unit, int inNumSamples, int position)
{
- ClearUnitOutputs(unit, inNumSamples);
-
- GrainBuf_next_play_active(unit, inNumSamples);
-
- SETUP_GRAIN_OUTS
World *world = unit->mWorld;
SndBuf *bufs = world->mSndBufs;
uint32 numBufs = world->mNumSndBufs;

+ if (unit->mNumActive+1 >= unit->mMaxGrains) {
+ Print("Too many grains!\n");
+ return;
+ }

- float *trig = IN(0);
- for (int i=0; i<inNumSamples; i++) {
- if ((trig[i] > 0) && (unit->curtrig <=0)) {
- // start a grain
- if (unit->mNumActive+1 >= unit->mMaxGrains) {
- Print("Too many grains!\n");
- } else {
+ GrainBufG *grain = unit->mGrains + unit->mNumActive++;
+ float winType = grain_in_at<full_rate>(unit, 7, position);
+ DECLARE_WINDOW
+ GET_GRAIN_WIN(winType)
+ if (winType >= 0 || (windowData == NULL))
+ return;

- GrainBufG *grain = unit->mGrains + unit->mNumActive++;
+ uint32 bufnum = grain_in_at<full_rate>(unit, 2, position);
+ grain->bufnum = bufnum;

- float winType = GRAIN_IN_AT(unit, 7, i);
+ GRAIN_BUF
+ CHECK_BUF

- DECLARE_WINDOW
- if(winType >= 0.)
- GET_GRAIN_WIN(winType)
+ if (bufChannels != 1)
+ return;

- if (windowData || (winType < 0.)) {
- uint32 bufnum = (uint32)GRAIN_IN_AT(unit, 2, i);
- grain->bufnum = bufnum;
-// if (bufnum >= numBufs) continue;
+ float bufSampleRate = buf->samplerate;
+ float bufRateScale = bufSampleRate * SAMPLEDUR;
+ double loopMax = (double)bufFrames;

- GRAIN_BUF
- CHECK_BUF
+ double counter = grain_in_at<full_rate>(unit, 1, position) * SAMPLERATE;
+ counter = sc_max(4., counter);
+ grain->counter = (int)counter;

- if (bufChannels != 1) continue;
+ double rate = grain->rate = grain_in_at<full_rate>(unit, 3, position) * bufRateScale;
+ double phase = grain_in_at<full_rate>(unit, 4, position) * bufFrames;
+ grain->interp = (int)grain_in_at<full_rate>(unit, 5, position);
+ grain->winType = winType;

- float bufSampleRate = buf->samplerate;
- float bufRateScale = bufSampleRate * SAMPLEDUR;
- double loopMax = (double)bufFrames;
+ GET_GRAIN_INIT_AMP

+ SETUP_GRAIN_OUTS
+ // begin add //
+ float pan = grain_in_at<full_rate>(unit, 6, position);

- double counter = GRAIN_IN_AT(unit, 1, i) * SAMPLERATE;
- counter = sc_max(4., counter);
- grain->counter = (int)counter;
- grain->winType = winType;
+ CALC_GRAIN_PAN

- GET_GRAIN_INIT_AMP
+ WRAP_CHAN(position)

- double rate = grain->rate = GRAIN_IN_AT(unit, 3, i) * bufRateScale;
- double phase = GRAIN_IN_AT(unit, 4, i) * bufFrames;
- grain->interp = (int)GRAIN_IN_AT(unit, 5, i);
- // begin add //
- float pan = GRAIN_IN_AT(unit, 6, i);
+ // end add //
+ int nsmps = sc_min(grain->counter, inNumSamples - position);
+ if (grain->interp >= 4) {
+ for (int j=0; j<nsmps; ++j) {
+ GRAIN_BUF_LOOP_BODY_4
+ CALC_NEXT_GRAIN_AMP
+ phase += rate;
+ }
+ } else if (grain->interp >= 2) {
+ for (int j=0; j<nsmps; ++j) {
+ GRAIN_BUF_LOOP_BODY_2
+ CALC_NEXT_GRAIN_AMP
+ phase += rate;
+ }
+ } else {
+ for (int j=0; j<nsmps; ++j) {
+ GRAIN_BUF_LOOP_BODY_1
+ CALC_NEXT_GRAIN_AMP
+ phase += rate;
+ }
+ }

- CALC_GRAIN_PAN
+ grain->phase = phase;

- WRAP_CHAN
+ SAVE_GRAIN_AMP_PARAMS

- // end add //
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
+}

- int nsmps = sc_min(grain->counter, inNumSamples-i);
- if (grain->interp >= 4) {
- for (int j=0; j<nsmps; j++) {
- GRAIN_BUF_LOOP_BODY_4
- CALC_NEXT_GRAIN_AMP
- phase += rate;
- }
- } else if (grain->interp >= 2) {
- for (int j=0; j<nsmps; j++) {
- GRAIN_BUF_LOOP_BODY_2
- CALC_NEXT_GRAIN_AMP
- phase += rate;
- }
- } else {
- for (int j=0; j<nsmps; j++) {
- GRAIN_BUF_LOOP_BODY_1
- CALC_NEXT_GRAIN_AMP
- phase += rate;
- }
- }

- grain->phase = phase;
+void GrainBuf_next_a(GrainBuf *unit, int inNumSamples)
+{
+ ClearUnitOutputs(unit, inNumSamples);

- SAVE_GRAIN_AMP_PARAMS
+ GrainBuf_next_play_active(unit, inNumSamples);

- if (grain->counter <= 0)
- *grain = unit->mGrains[--unit->mNumActive]; // remove grain
- }
- }
- }
+ float *trig = IN(0);
+ for (int i=0; i<inNumSamples; i++) {
+ if ((trig[i] > 0) && (unit->curtrig <=0))
+ GrainBuf_next_start_new<true>(unit, inNumSamples, i);
unit->curtrig = trig[i];
}
}
@@ -1338,85 +1209,9 @@

GrainBuf_next_play_active(unit, inNumSamples);

- SETUP_GRAIN_OUTS
-
- World *world = unit->mWorld;
- SndBuf *bufs = world->mSndBufs;
- //uint32 numBufs = world->mNumSndBufs;
-
float trig = IN0(0);
- if ((trig > 0) && (unit->curtrig <=0)) {
- // start a grain
- if (unit->mNumActive+1 >= unit->mMaxGrains) {Print("Too many grains!\n");
- } else {
- GrainBufG *grain = unit->mGrains + unit->mNumActive++;
- float winType = IN0(7);
- DECLARE_WINDOW
-
- if(winType >= 0.) {
- GET_GRAIN_WIN(winType)
- }
-
- if (windowData || (winType < 0.)) {
- uint32 bufnum = (uint32)IN0( 2 );
- grain->bufnum = bufnum;
-
- GRAIN_BUF
- CHECK_BUF
-
- float bufSampleRate = buf->samplerate;
- float bufRateScale = bufSampleRate * SAMPLEDUR;
- double loopMax = (double)bufFrames;
-
- double counter = IN0(1) * SAMPLERATE;
- counter = sc_max(4., counter);
- grain->counter = (int)counter;
-
- double rate = grain->rate = IN0(3) * bufRateScale;
- double phase = IN0(4) * bufFrames;
- grain->interp = (int)IN0(5);
- grain->winType = winType;
-
- GET_GRAIN_INIT_AMP
-
- // begin add //
- float pan = IN0(6);
-
- CALC_GRAIN_PAN
-
- WRAP_CHAN_K
-
- // end add //
- int nsmps = sc_min(grain->counter, inNumSamples);
- if (grain->interp >= 4) {
- for (int j=0; j<nsmps; ++j) {
- GRAIN_BUF_LOOP_BODY_4
- CALC_NEXT_GRAIN_AMP
- phase += rate;
- }
- } else if (grain->interp >= 2) {
- for (int j=0; j<nsmps; ++j) {
- GRAIN_BUF_LOOP_BODY_2
- CALC_NEXT_GRAIN_AMP
- phase += rate;
- }
- } else {
- for (int j=0; j<nsmps; ++j) {
- GRAIN_BUF_LOOP_BODY_1
- CALC_NEXT_GRAIN_AMP
- phase += rate;
- }
- }
-
- grain->phase = phase;
-
- SAVE_GRAIN_AMP_PARAMS
-
- if (grain->counter <= 0)
- *grain = unit->mGrains[--unit->mNumActive]; // remove grain
- }
- }
- }
+ if ((trig > 0) && (unit->curtrig <=0))
+ GrainBuf_next_start_new<false>(unit, inNumSamples, 0);
unit->curtrig = trig;
}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9803] trunk/Source/plugins/GrainUGens.cpp

2010-02-08T09:20:27Z

Revision: 9803
http://supercollider.svn.sourceforge.net/supercollider/?rev=9803&view=rev
Author: timblech
Date: 2010-02-08 17:20:27 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
grain ugens: unify common code of grain ugens

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/GrainUGens.cpp

Modified: trunk/Source/plugins/GrainUGens.cpp
===================================================================
--- trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:19:10 UTC (rev 9802)
+++ trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:20:27 UTC (rev 9803)
@@ -512,13 +512,9 @@

//////////////////// InGrain ////////////////////

-void GrainIn_next_a(GrainIn *unit, int inNumSamples)
+inline void GrainIn_next_play_active(GrainIn * unit, int inNumSamples)
{
- ClearUnitOutputs(unit, inNumSamples);
- //begin add
SETUP_GRAIN_OUTS
- // end add
-
float *in = IN(2);
for (int i=0; i < unit->mNumActive; ) {
GrainInG *grain = unit->mGrains + i;
@@ -544,12 +540,23 @@

SAVE_GRAIN_AMP_PARAMS

- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- } else ++i;
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
+ else
+ ++i;
}
+}

+void GrainIn_next_a(GrainIn *unit, int inNumSamples)
+{
+ ClearUnitOutputs(unit, inNumSamples);
+ //begin add
+ // end add
+
+ GrainIn_next_play_active(unit, inNumSamples);
+
+ SETUP_GRAIN_OUTS
+ float *in = IN(2);
float *trig = IN(0);
for (int i=0; i<inNumSamples; ++i) {
if ((unit->curtrig <= 0) && (trig[i] > 0.0)) {
@@ -607,42 +614,14 @@
unit->mMaxGrains = (int)maxGrains;
unit->mGrains = (GrainInG*)RTAlloc(unit->mWorld, unit->mMaxGrains * sizeof(GrainInG));
}
- // begin add //
- SETUP_GRAIN_OUTS
- // end add

- float *in = IN(2);
- for (int i=0; i < unit->mNumActive; ) {
- GrainInG *grain = unit->mGrains + i;
- DECLARE_WINDOW
- GET_GRAIN_AMP_PARAMS
+ GrainIn_next_play_active(unit, inNumSamples);

- // begin add //
- float pan2 = 0.;
- float *out2;
+ SETUP_GRAIN_OUTS

- GET_PAN_PARAMS
- // end add //
-
- int nsmps = sc_min(grain->counter, inNumSamples);
- for (int j=0; j<nsmps; ++j) {
- float outval = amp * in[j];
- // begin change / add //
- out1[j] += outval * pan1;
- if(numOutputs > 1) out2[j] += outval * pan2;
- // end change //
- CALC_NEXT_GRAIN_AMP
- }
-
- SAVE_GRAIN_AMP_PARAMS
-
- if (grain->counter <= 0)
- *grain = unit->mGrains[--unit->mNumActive]; // remove grain
- else
- ++i;
- }
-
+ float *in = IN(2);
float trig = IN0(0);
+
if ((unit->curtrig <= 0) && (trig > 0.0)) {
// start a grain
if (unit->mNumActive+1 >= unit->mMaxGrains)
@@ -706,10 +685,8 @@
RTFree(unit->mWorld, unit->mGrains);
}

-void GrainSin_next_a(GrainSin *unit, int inNumSamples)
+inline void GrainSin_next_play_active(GrainSin * unit, int inNumSamples)
{
- ClearUnitOutputs(unit, inNumSamples);
-
SETUP_GRAIN_OUTS

float *table0 = ft->mSineWavetable;
@@ -752,7 +729,19 @@
else
++i;
}
+}

+void GrainSin_next_a(GrainSin *unit, int inNumSamples)
+{
+ ClearUnitOutputs(unit, inNumSamples);
+
+ GrainSin_next_play_active(unit, inNumSamples);
+
+ SETUP_GRAIN_OUTS
+
+ float *table0 = ft->mSineWavetable;
+ float *table1 = table0 + 1;
+
float *trig = IN(0);
for (int i=0; i<inNumSamples; ++i) {
if ((unit->curtrig <= 0) && (trig[i] > 0.0)) {
@@ -819,49 +808,13 @@
unit->mMaxGrains = (int)maxGrains;
unit->mGrains = (GrainSinG*)RTAlloc(unit->mWorld, unit->mMaxGrains * sizeof(GrainSinG));
}
- // begin add //
+
+ GrainSin_next_play_active(unit, inNumSamples);
+
SETUP_GRAIN_OUTS
- // end add
float *table0 = ft->mSineWavetable;
float *table1 = table0 + 1;

- for (int i=0; i < unit->mNumActive; ) {
- GrainSinG *grain = unit->mGrains + i;
- DECLARE_WINDOW
- GET_GRAIN_AMP_PARAMS
-
- // begin add //
- float pan2 = 0.;
- float *out2;
-
- GET_PAN_PARAMS
-
- // end add //
- int32 thisfreq = grain->freq;
- int32 oscphase = grain->oscphase;
-
- int nsmps = sc_min(grain->counter, inNumSamples);
- for (int j=0; j<nsmps; ++j) {
- float outval = amp * lookupi1(table0, table1, oscphase, unit->m_lomask);
- // begin change / add //
- out1[j] += outval * pan1;
- if(numOutputs > 1) out2[j] += outval * pan2;
- // end change //
-
- CALC_NEXT_GRAIN_AMP
-
- oscphase += thisfreq;
- }
-
- SAVE_GRAIN_AMP_PARAMS
-
- grain->oscphase = oscphase;
- if (grain->counter <= 0)
- *grain = unit->mGrains[--unit->mNumActive]; // remove grain
- else
- ++i;
- }
-
float trig = IN0(0);
if ((unit->curtrig <= 0) && (trig > 0.0)) {
// start a grain
@@ -938,10 +891,8 @@
RTFree(unit->mWorld, unit->mGrains);
}

-void GrainFM_next_a(GrainFM *unit, int inNumSamples)
+inline void GrainFM_next_play_active(GrainFM *unit, int inNumSamples)
{
- ClearUnitOutputs(unit, inNumSamples);
- //begin add
SETUP_GRAIN_OUTS
// end add

@@ -990,7 +941,19 @@
else
++i;
}
+}

+void GrainFM_next_a(GrainFM *unit, int inNumSamples)
+{
+ ClearUnitOutputs(unit, inNumSamples);
+
+ GrainFM_next_play_active(unit, inNumSamples);
+
+ SETUP_GRAIN_OUTS
+
+ float *table0 = ft->mSineWavetable;
+ float *table1 = table0 + 1;
+
float *trig = IN(0);
for (int i=0; i<inNumSamples; ++i) {
if ((unit->curtrig <= 0) && (trig[i] > 0.0)) {
@@ -1067,56 +1030,13 @@
unit->mGrains = (GrainFMG*)RTAlloc(unit->mWorld, unit->mMaxGrains * sizeof(GrainFMG));
}

- // begin add //
+ GrainFM_next_play_active(unit, inNumSamples);
+
SETUP_GRAIN_OUTS
- // end add

float *table0 = ft->mSineWavetable;
float *table1 = table0 + 1;

- for (int i=0; i < unit->mNumActive; ) {
- GrainFMG *grain = unit->mGrains + i;
- DECLARE_WINDOW
- GET_GRAIN_AMP_PARAMS
-
- int32 mfreq = grain->mfreq;
- int32 moscphase = grain->moscphase;
- int32 coscphase = grain->coscphase;
- float deviation = grain->deviation;
- float carbase = grain->carbase;
-
- // begin add //
- float pan2;
- float *out2;
-
- GET_PAN_PARAMS
-
- // end add //
-
- int nsmps = sc_min(grain->counter, inNumSamples);
- for (int j=0; j<nsmps; ++j) {
- float thismod = lookupi1(table0, table1, moscphase, unit->m_lomask) * deviation;
- float outval = amp * lookupi1(table0, table1, coscphase, unit->m_lomask);
- // begin change / add //
- out1[j] += outval * pan1;
- if(numOutputs > 1) out2[j] += outval * pan2;
- // end change //
- CALC_NEXT_GRAIN_AMP
-
- int32 cfreq = (int32)(unit->m_cpstoinc * (carbase + thismod)); // needs to be calced in the loop!
- coscphase += cfreq;
- moscphase += mfreq;
- } // need to save float carbase, int32 mfreq, float deviation
- grain->coscphase = coscphase;
- grain->moscphase = moscphase;
- SAVE_GRAIN_AMP_PARAMS
-
- if (grain->counter <= 0)
- *grain = unit->mGrains[--unit->mNumActive]; // remove grain
- else
- ++i;
- }
-
float trig = IN0(0);
if ((unit->curtrig <= 0) && (trig > 0.0)) {
// start a grain
@@ -1248,13 +1168,9 @@
if(numOutputs > 1) out2[j] += outval * pan2; \

-
-void GrainBuf_next_a(GrainBuf *unit, int inNumSamples)
+inline void GrainBuf_next_play_active(GrainBuf *unit, int inNumSamples)
{
- ClearUnitOutputs(unit, inNumSamples);
- //begin add
SETUP_GRAIN_OUTS
- // end add
World *world = unit->mWorld;
SndBuf *bufs = world->mSndBufs;
uint32 numBufs = world->mNumSndBufs;
@@ -1307,12 +1223,25 @@

SAVE_GRAIN_AMP_PARAMS

- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- } else ++i;
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
+ else
+ ++i;
}
+}

+void GrainBuf_next_a(GrainBuf *unit, int inNumSamples)
+{
+ ClearUnitOutputs(unit, inNumSamples);
+
+ GrainBuf_next_play_active(unit, inNumSamples);
+
+ SETUP_GRAIN_OUTS
+ World *world = unit->mWorld;
+ SndBuf *bufs = world->mSndBufs;
+ uint32 numBufs = world->mNumSndBufs;
+
+
float *trig = IN(0);
for (int i=0; i<inNumSamples; i++) {
if ((trig[i] > 0) && (unit->curtrig <=0)) {
@@ -1406,70 +1335,15 @@
unit->mMaxGrains = (int)maxGrains;
unit->mGrains = (GrainBufG*)RTAlloc(unit->mWorld, unit->mMaxGrains * sizeof(GrainBufG));
}
- //begin add
+
+ GrainBuf_next_play_active(unit, inNumSamples);
+
SETUP_GRAIN_OUTS

World *world = unit->mWorld;
SndBuf *bufs = world->mSndBufs;
//uint32 numBufs = world->mNumSndBufs;

- for (int i=0; i < unit->mNumActive; ) {
- GrainBufG *grain = unit->mGrains + i;
- uint32 bufnum = grain->bufnum;
-
- GRAIN_BUF
- CHECK_BUF
-
- if (bufChannels != 1) {
- ++i;
- continue;
- }
-
- double loopMax = (double)bufFrames;
-
- double rate = grain->rate;
- double phase = grain->phase;
-
- DECLARE_WINDOW
- GET_GRAIN_AMP_PARAMS
-
- // begin add //
- float pan2 = 0.f;
- float *out2;
- GET_PAN_PARAMS
- // end add //
-
- int nsmps = sc_min(grain->counter, inNumSamples);
- if (grain->interp >= 4) {
- for (int j=0; j<nsmps; ++j) {
- GRAIN_BUF_LOOP_BODY_4
- CALC_NEXT_GRAIN_AMP
- phase += rate;
- }
- } else if (grain->interp >= 2) {
- for (int j=0; j<nsmps; ++j) {
- GRAIN_BUF_LOOP_BODY_2
- CALC_NEXT_GRAIN_AMP
- phase += rate;
- }
- } else {
- for (int j=0; j<nsmps; ++j) {
- GRAIN_BUF_LOOP_BODY_1
- CALC_NEXT_GRAIN_AMP
- phase += rate;
- }
- }
-
- grain->phase = phase;
-
- SAVE_GRAIN_AMP_PARAMS
-
- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- } else ++i;
- }
-
float trig = IN0(0);
if ((trig > 0) && (unit->curtrig <=0)) {
// start a grain
@@ -1611,6 +1485,7 @@
float outval = amp * bufData[iphase + n]; \
ZXP(out1) += outval; \

+
void Warp1_next(Warp1 *unit, int inNumSamples)
{
ClearUnitOutputs(unit, inNumSamples);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9802] trunk/Source/plugins/GrainUGens.cpp

2010-02-08T09:19:10Z

Revision: 9802
http://supercollider.svn.sourceforge.net/supercollider/?rev=9802&view=rev
Author: timblech
Date: 2010-02-08 17:19:10 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
grain ugens: some more style cleanups

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/GrainUGens.cpp

Modified: trunk/Source/plugins/GrainUGens.cpp
===================================================================
--- trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:17:52 UTC (rev 9801)
+++ trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:19:10 UTC (rev 9802)
@@ -590,10 +590,8 @@

SAVE_GRAIN_AMP_PARAMS

- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- }
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
}
}
unit->curtrig = trig[i];
@@ -638,10 +636,10 @@

SAVE_GRAIN_AMP_PARAMS

- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- } else ++i;
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
+ else
+ ++i;
}

float trig = IN0(0);
@@ -682,10 +680,8 @@

SAVE_GRAIN_AMP_PARAMS

- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- }
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
}
}
}
@@ -751,10 +747,10 @@
SAVE_GRAIN_AMP_PARAMS

grain->oscphase = oscphase;
- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- } else ++i;
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
+ else
+ ++i;
}

float *trig = IN(0);
@@ -806,10 +802,8 @@

SAVE_GRAIN_AMP_PARAMS

- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- }
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
}
}
unit->curtrig = trig[i];
@@ -862,10 +856,10 @@
SAVE_GRAIN_AMP_PARAMS

grain->oscphase = oscphase;
- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- } else ++i;
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
+ else
+ ++i;
}

float trig = IN0(0);
@@ -914,10 +908,8 @@

SAVE_GRAIN_AMP_PARAMS

- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- }
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
}
}
}
@@ -993,10 +985,10 @@

SAVE_GRAIN_AMP_PARAMS

- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- } else ++i;
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
+ else
+ ++i;
}

float *trig = IN(0);
@@ -1056,13 +1048,11 @@

SAVE_GRAIN_AMP_PARAMS

- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- }
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
}
}
- unit->curtrig = trig[i];
+ unit->curtrig = trig[i];
}
}

@@ -1121,10 +1111,10 @@
grain->moscphase = moscphase;
SAVE_GRAIN_AMP_PARAMS

- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- } else ++i;
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
+ else
+ ++i;
}

float trig = IN0(0);
@@ -1179,10 +1169,8 @@
grain->moscphase = moscphase;
SAVE_GRAIN_AMP_PARAMS

- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- }
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
}
}
}
@@ -1400,10 +1388,8 @@

SAVE_GRAIN_AMP_PARAMS

- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- }
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
}
}
}
@@ -1552,10 +1538,8 @@

SAVE_GRAIN_AMP_PARAMS

- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[--unit->mNumActive];
- }
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[--unit->mNumActive]; // remove grain
}
}
}
@@ -1673,10 +1657,10 @@

grain->phase = phase;
SAVE_GRAIN_AMP_PARAMS
- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[n][--unit->mNumActive[n]];
- } else ++i;
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[n][--unit->mNumActive[n]]; // remove grain
+ else
+ ++i;
}

for (int i=0; i<inNumSamples; ++i) {
@@ -1739,15 +1723,13 @@
grain->phase = phase;
SAVE_GRAIN_AMP_PARAMS
// end change
- if (grain->counter <= 0) {
- // remove grain
- *grain = unit->mGrains[n][--unit->mNumActive[n]];
- }
+ if (grain->counter <= 0)
+ *grain = unit->mGrains[n][--unit->mNumActive[n]]; // remove grain
}
}
}

- unit->mNextGrain[n] = nextGrain;
+ unit->mNextGrain[n] = nextGrain;
}
}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9801] trunk/Source/plugins/GrainUGens.cpp

2010-02-08T09:17:52Z

Revision: 9801
http://supercollider.svn.sourceforge.net/supercollider/?rev=9801&view=rev
Author: timblech
Date: 2010-02-08 17:17:52 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
grain ugens: don't copy rng data to local variables

the local variables wouldn't be located in registers anyway (checked
for x86-64), since there is quite a number of local variables.

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/GrainUGens.cpp

Modified: trunk/Source/plugins/GrainUGens.cpp
===================================================================
--- trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:16:40 UTC (rev 9800)
+++ trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:17:52 UTC (rev 9801)
@@ -29,18 +29,6 @@

#include "SC_PlugIn.h"

-// macros to put rgen state in registers
-#define RGET \
- RGen& rgen = *unit->mParent->mRGen; \
- uint32 s1 = rgen.s1; \
- uint32 s2 = rgen.s2; \
- uint32 s3 = rgen.s3;
-
-#define RPUT \
- rgen.s1 = s1; \
- rgen.s2 = s2; \
- rgen.s3 = s3;
-
static InterfaceTable *ft;

const int kMaxGrains = 64;
@@ -1706,11 +1694,9 @@
WarpWinGrain *grain = unit->mGrains[n] + unit->mNumActive[n]++;
// grain->bufnum = bufnum;

- RGET
-
float overlaps = GRAIN_IN_AT(unit, 5, i);
float counter = GRAIN_IN_AT(unit, 3, i) * SAMPLERATE;
- double winrandamt = frand2(s1, s2, s3) * (double)GRAIN_IN_AT(unit, 6, i);
+ double winrandamt = unit->mParent->mRGen->frand2() * (double)GRAIN_IN_AT(unit, 6, i);
counter = sc_max(4., floor(counter + (counter * winrandamt)));
grain->counter = (int)counter;

@@ -1752,8 +1738,6 @@

grain->phase = phase;
SAVE_GRAIN_AMP_PARAMS
- // store random values
- RPUT
// end change
if (grain->counter <= 0) {
// remove grain

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/

SF.net SVN: supercollider:[9800] trunk/Source/plugins/GrainUGens.cpp

2010-02-08T09:16:43Z

Revision: 9800
http://supercollider.svn.sourceforge.net/supercollider/?rev=9800&view=rev
Author: timblech
Date: 2010-02-08 17:16:40 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
grain ugens: remove unused macros

Signed-off-by: Tim Blechmann <[hidden email]>

Modified Paths:
--------------
trunk/Source/plugins/GrainUGens.cpp

Modified: trunk/Source/plugins/GrainUGens.cpp
===================================================================
--- trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:15:25 UTC (rev 9799)
+++ trunk/Source/plugins/GrainUGens.cpp 2010-02-08 17:16:40 UTC (rev 9800)
@@ -307,39 +307,6 @@
} \
amp = lininterp(winFrac, winTable1[0], winTable2[0]);

-#define GET_INTERP_GRAIN_WIN \
- SndBuf *windowA = unit->mWorld->mSndBufs + (int)grain->mWindowA; \
- float *windowDataA __attribute__((__unused__)) = windowA->data; \
- uint32 windowSamplesA __attribute__((__unused__)) = windowA->samples; \
- uint32 windowFramesA = windowA->frames; \
- int windowGuardFrameA __attribute__((__unused__)) = windowFramesA - 1; \
- SndBuf *windowB = unit->mWorld->mSndBufs + (int)grain->mWindowB; \
- float *windowDataB __attribute__((__unused__)) = windowB->data; \
- uint32 windowSamplesB __attribute__((__unused__)) = windowB->samples; \
- uint32 windowFramesB = windowB->frames; \
- int windowGuardFrameB __attribute__((__unused__)) = windowFramesB - 1;
-
-#define BUF_INTERP_GRAIN_AMP \
- winPosA += winIncA; \
- int iWinPosA = (int)winPosA; \
- double winFracA = winPosA - (double)iWinPosA; \
- float* winTableA1 = windowDataA + iWinPosA; \
- float* winTableA2 = winTableA1 + 1; \
- if (winPosA > windowGuardFrameA) { \
- winTableA2 -= windowSamplesA; \
- } \
- float ampA = lininterp(winFracA, winTableA1[0], winTableA2[0]); \
- winPosB += winIncB; \
- int iWinPosB = (int)winPosB; \
- double winFracB = winPosB - (double)iWinPosB; \
- float* winTableB1 = windowDataB + iWinPosB; \
- float* winTableB2 = winTableB1 + 1; \
- if (winPosB > windowGuardFrameB) { \
- winTableB2 -= windowSamplesB; \
- } \
- float ampB = lininterp(winFracB, winTableB1[0], winTableB2[0]); \
- amp = lininterp(grain->ifac, ampA, ampB);
-
#define BUF_GRAIN_LOOP_BODY_4 \
phase = sc_gloop(phase, loopMax); \
int32 iphase = (int32)phase; \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/