SF.net SVN: supercollider:[7692] trunk

View: New views

1 Messages — Rating Filter: Alert me

SF.net SVN: supercollider:[7692] trunk

by danstowell :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Revision: 7692
http://supercollider.svn.sourceforge.net/supercollider/?rev=7692&view=rev
Author: danstowell
Date: 2008-07-19 11:04:21 +0000 (Sat, 19 Jul 2008)

Log Message:
-----------
* Added Buffer:normalize method. This enables the previously unnoticed "normalize" and "wnormalize" b_gen commands on the server.
* Updated the aforementioned commands - added user choice of new maximum, and avoided unnecessary no-op
* Slight rewrite of Buffer helpfile intro, also added normalize method to the help and added lots of HTML crosslinks

Modified Paths:
--------------
trunk/Source/plugins/OscUGens.cpp
trunk/build/ChangeLog
trunk/build/Help/ServerArchitecture/Buffer.html
trunk/build/SCClassLibrary/Common/Control/Buffer.sc

Modified: trunk/Source/plugins/OscUGens.cpp
===================================================================
--- trunk/Source/plugins/OscUGens.cpp 2008-07-17 21:51:43 UTC (rev 7691)
+++ trunk/Source/plugins/OscUGens.cpp 2008-07-19 11:04:21 UTC (rev 7692)
@@ -4090,12 +4090,12 @@

void normalize_samples(int size, float* data, float peak)
{
- float maxamp = 0.0;
+ float maxamp = 0.f;
for (int i=0; i<size; ++i) {
float absamp = fabs(data[i]);
if (absamp > maxamp) maxamp = absamp;
}
- if (maxamp > 0.0) {
+ if (maxamp != 0.f && maxamp != peak) {
float ampfac = peak / maxamp;
for (int i=0; i<size; ++i) {
data[i] *= ampfac;
@@ -4105,12 +4105,12 @@

void normalize_wsamples(int size, float* data, float peak)
{
- float maxamp = 0.0;
+ float maxamp = 0.f;
for (int i=0; i<size; i+=2) {
float absamp = fabs(data[i] + data[i+1]);
if (absamp > maxamp) maxamp = absamp;
}
- if (maxamp > 0.0) {
+ if (maxamp != 0.f && maxamp != peak) {
float ampfac = peak / maxamp;
for (int i=0; i<size; ++i) {
data[i] *= ampfac;
@@ -4310,17 +4310,29 @@
}

void NormalizeBuf(World *world, struct SndBuf *buf, struct sc_msg_iter *msg)
-{
+{
+ float newmax;
+ if(msg->remain() != 0){
+ newmax = msg->getf();
+ }else{
+ newmax = 1.f;
+ }
float *data = buf->data;
int size = buf->samples;
- normalize_samples(size, data, 1.);
+ normalize_samples(size, data, newmax);
}

void NormalizeWaveBuf(World *world, struct SndBuf *buf, struct sc_msg_iter *msg)
{
+ float newmax;
+ if(msg->remain() != 0){
+ newmax = msg->getf();
+ }else{
+ newmax = 1.f;
+ }
float *data = buf->data;
int size = buf->samples;
- normalize_wsamples(size, data, 1.);
+ normalize_wsamples(size, data, newmax);
}

void CopyBuf(World *world, struct SndBuf *buf, struct sc_msg_iter *msg)

Modified: trunk/build/ChangeLog
===================================================================
--- trunk/build/ChangeLog 2008-07-17 21:51:43 UTC (rev 7691)
+++ trunk/build/ChangeLog 2008-07-19 11:04:21 UTC (rev 7692)
@@ -6,6 +6,7 @@
* 2008-04-20 improvements to MIDI sysex handling - added sysex parsing directly in source - thanks to charles picasso
* 2008-07-12 scsynth on Mac can now use separate devices for audio input vs audio output. Thanks to Axel Balley for much of the work on this, also a bit by ds.
* 2008-07-12 PlayBuf, RecordBuf, BufWr, BufRd, ScopeOut - used to be limited to 16-channel audio maximum. Now can handle massively multichannel audio - ds
+* 2008-07-19 Buffer:normalize method added - ds

// BUGFIXES:
* 2008-05-20 fix for the special case when 0.2.asFraction beachballs the lang (bug id 1856972) - jr

Modified: trunk/build/Help/ServerArchitecture/Buffer.html
===================================================================
--- trunk/build/Help/ServerArchitecture/Buffer.html 2008-07-17 21:51:43 UTC (rev 7691)
+++ trunk/build/Help/ServerArchitecture/Buffer.html 2008-07-19 11:04:21 UTC (rev 7692)
@@ -5,7 +5,7 @@
<meta http-equiv="Content-Style-Type" content="text/css">
<title></title>
<meta name="Generator" content="Cocoa HTML Writer">
-<meta name="CocoaVersion" content="824.47">
+<meta name="CocoaVersion" content="824.48">
<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}
@@ -19,32 +19,30 @@
p.p10 {margin: 0.0px 0.0px 0.0px 56.0px; text-indent: -56.0px; font: 12.0px Helvetica}
p.p11 {margin: 0.0px 0.0px 0.0px 85.0px; text-indent: -85.0px; font: 12.0px Helvetica}
p.p12 {margin: 0.0px 0.0px 0.0px 85.0px; text-indent: -85.0px; font: 12.0px Helvetica; min-height: 14.0px}
-p.p13 {margin: 0.0px 0.0px 0.0px 57.0px; text-indent: -57.0px; font: 9.0px Monaco; color: #b61d07}
+p.p13 {margin: 0.0px 0.0px 0.0px 57.0px; text-indent: -57.0px; font: 9.0px Monaco; color: #b22200}
p.p14 {margin: 0.0px 0.0px 0.0px 57.0px; text-indent: -57.0px; font: 9.0px Monaco}
p.p15 {margin: 0.0px 0.0px 0.0px 56.0px; text-indent: -56.0px; font: 12.0px Helvetica; min-height: 14.0px}
-p.p16 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; color: #b61d07}
+p.p16 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; color: #b22200}
p.p17 {margin: 0.0px 0.0px 0.0px 56.0px; text-indent: -56.0px; font: 9.0px Monaco}
p.p18 {margin: 0.0px 0.0px 0.0px 85.0px; text-indent: -85.0px; font: 9.0px Monaco; min-height: 12.0px}
-p.p19 {margin: 0.0px 0.0px 0.0px 85.0px; text-indent: -85.0px; font: 9.0px Monaco; color: #b61d07}
+p.p19 {margin: 0.0px 0.0px 0.0px 85.0px; text-indent: -85.0px; font: 9.0px Monaco; color: #b22200}
p.p20 {margin: 0.0px 0.0px 0.0px 85.0px; text-indent: -85.0px; font: 9.0px Monaco}
p.p21 {margin: 0.0px 0.0px 0.0px 85.0px; text-indent: -85.0px; font: 9.0px Monaco; color: #606060}
p.p22 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; color: #606060}
-p.p23 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; color: #000000}
-p.p24 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; color: #000000; min-height: 14.0px}
-p.p25 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; color: #000000}
-p.p26 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; color: #bf0000}
+p.p23 {margin: 0.0px 0.0px 0.0px 0.0px; font: 9.0px Monaco; color: #ba1100}
span.s1 {font: 18.0px Helvetica}
-span.s2 {color: #0036fc}
+span.s2 {color: #0000ff}
span.s3 {font: 12.0px Helvetica}
-span.s4 {color: #0024c4}
+span.s4 {color: #0031c4}
span.s5 {color: #000000}
-span.s6 {color: #b61d07}
-span.s7 {font: 9.0px Monaco}
-span.s8 {color: #606060}
-span.s9 {color: #2a6d06}
-span.s10 {font: 12.0px Helvetica; color: #000000}
-span.s11 {color: #0000bf}
-span.s12 {color: #bf0000}
+span.s6 {color: #0045fc}
+span.s7 {color: #b22200}
+span.s8 {font: 9.0px Monaco}
+span.s9 {color: #606060}
+span.s10 {color: #336a0a}
+span.s11 {font: 12.0px Helvetica; color: #000000}
+span.s12 {color: #001fbf}
+span.s13 {color: #ba1100}
span.Apple-tab-span {white-space:pre}
</style>
</head>
@@ -53,18 +51,18 @@
 
superclass: Object
 
-Buffer encapsulates a number of common tasks, OSC messages, and capabilities related to server-side buffers, which are globally available arrays of floats. These are commonly used to hold sampled audio, such as a soundfile loaded into memory, but can be used to hold other types of data as well. They can be freed or altered even while being accessed. Buffers are commonly used with PlayBuf, RecordBuf, DiskIn, DiskOut, BufWr, BufRd, and other UGens. (See their individual help files for more examples.) See Server-Architecture for more details.
+A buffer is most often used to hold sampled audio, such as a soundfile loaded into memory, but can be used to hold other types of data as well. It is a globally available array of floating-point numbers on the server. The Buffer class encapsulates a number of common tasks, OSC messages, and capabilities related to server-side buffers – see the examples lower down this document for many examples of using Buffers for sound playback and recording.
 
+Buffers are commonly used with <a href="../UGens/Playback and Recording/PlayBuf.html">PlayBuf</a>, <a href="../UGens/Playback and Recording/RecordBuf.html">RecordBuf</a>, <a href="../UGens/Playback and Recording/DiskIn.html">DiskIn</a>, <a href="../UGens/Playback and Recording/DiskOut.html">DiskOut</a>, <a href="../UGens/Oscillators/BufWr.html">BufWr</a>, <a href="../UGens/Oscillators/BufRd.html">BufRd</a>, and other <a href="../UGens/UGen.html">UGens</a>. (See their individual help files for more examples.) Buffers can be freed or altered even while being accessed. See <a href="Server-Architecture.html">Server-Architecture</a> for some technical details.
+ 
Buffer Numbers and Allocation
 
Although the number of buffers on a server is set at the time it is booted, memory must still be allocated within the server app before they can hold values. (At boot time all buffers have a size of 0.) 
 
-Server-side buffers are identified by number, starting from 0. When using Buffer objects, buffer numbers are automatically allocated from the Server's bufferAllocator, unless you explicitly supply one. When you call .free on a Buffer object it will release the buffer's memory on the server, and free the buffer number for future reallocation. See ServerOptions for details on setting the number of available buffers.
+Server-side buffers are identified by number, starting from 0. When using Buffer objects, buffer numbers are automatically allocated from the Server's bufferAllocator, unless you explicitly supply one. When you call .free on a Buffer object it will release the buffer's memory on the server, and free the buffer number for future reallocation. See <a href="ServerOptions.html">ServerOptions</a> for details on setting the number of available buffers.
 
Normally you should not need to supply a buffer number. You should only do so if you are sure you know what you are doing. Similarly, in normal use you should not need to access the buffer number, since instances of Buffer can be used directly as UGen inputs or Synth args.
 
-You can control which allocator determines the buffer numbers by setting the server options blockAllocClass variable prior to booting the server. Two allocators are available to support different kinds of applications. See the <a href="ServerOptions.html">ServerOptions</a> help file for details.
- 
Multichannel Buffers
 
Multichannel buffers interleave their data. Thus the actual number of available values when requesting or setting values by index using methods such as set, setn, get, getn, etc., is equal to numFrames * numChannels. Indices start at 0 and go up to (numFrames * numChannels) - 1. In a two channel buffer for instance, index 0 will be the first value of the first channel, index 1 will be the first value of the second channel, index 2 will be the second value of the first channel, and so on.
@@ -75,19 +73,19 @@
 
Many buffer operations (such as reading and writing files) are asynchronous, meaning that they will take an arbitrary amount of time to complete. Asynchronous commands are passed to a background thread on the server so as not to steal CPU time from the audio synthesis thread. Since they can last an aribitrary amount of time it is convenient to be able to specify something else that can be done immediately on completion. The ability to do this is implemented in two ways in Buffer's various methods: completion messages and action functions. 
 
-A completion message is a second OSC command which is included in the message which is sent to the server. (See NodeMessaging for a discussion of OSC messages.) The server will execute this immediately upon completing the first command. An action function is a Function which will be evaluated when the client receives the appropriate reply from the server, indicating that the previous command is done. Action functions are therefore inherently more flexible than completion messages, but slightly less efficient due to the small amount of added latency involved in message traffic. Action functions are passed the Buffer object as an argument when they are evaluated.
+A completion message is a second OSC command which is included in the message which is sent to the server. (See <a href="NodeMessaging.html">NodeMessaging</a> for a discussion of OSC messages.) The server will execute this immediately upon completing the first command. An action function is a <a href="../Core/Kernel/Function.html">Function</a> which will be evaluated when the client receives the appropriate reply from the server, indicating that the previous command is done. Action functions are therefore inherently more flexible than completion messages, but slightly less efficient due to the small amount of added latency involved in message traffic. Action functions are passed the Buffer object as an argument when they are evaluated.
 
With Buffer methods that take a completion message, it is also possible to pass in a function that returns an OSC message. As in action functions this will be passed the Buffer as an argument. It is important to understand however that this function will be evaluated after the Buffer object has been created (so that its bufnum and other details are accessible), but before the corresponding message is sent to the server.
 
Bundling
 
-Many of the methods below have two versions: a regular one which sends its corresponding message to the server immediately, and one which returns the message in an Array so that it can be added to a bundle. It is also possible to capture the messages generated by the regular methods using Server's automated bundling capabilities. See Server and bundledCommands for more details.
+Many of the methods below have two versions: a regular one which sends its corresponding message to the server immediately, and one which returns the message in an <a href="../Collections/Array.html">Array</a> so that it can be added to a bundle. It is also possible to capture the messages generated by the regular methods using Server's automated bundling capabilities. See <a href="Server.html">Server</a> and <a href="bundledCommands.html">bundledCommands</a> for more details.
 
Accessing Instance Variables
 
The following variables have getter methods.
 
- server - Returns the Buffer's Server object.
+ server - Returns the Buffer's <a href="Server.html">Server</a> object.
 
 bufnum - Returns the buffer number of the corresponding server-side buffer. In normal use you should not need to access this value, since instances of Buffer can be used directly as UGen inputs or Synth args.
 
@@ -111,10 +109,10 @@
 
 Create and return a Buffer and immediately allocate the required memory on the server. The buffer's values will be initialised to 0.0.
 
- server - The server on which to allocate the buffer. The default is the default Server.
+ server - The server on which to allocate the buffer. The default is the default <a href="Server.html">Server</a>.
 numFrames - The number of frames to allocate. Actual memory use will correspond to numFrames * numChannels.
 numChannels - The number of channels for the Buffer. The default is 1.
- completionMessage - A valid OSC message or a Function which will return one. A Function will be passed this Buffer as an argument when evaluated.
+ completionMessage - A valid OSC message or a <a href="../Core/Kernel/Function.html">Function</a> which will return one. A Function will be passed this Buffer as an argument when evaluated.
 bufnum - An explicitly specified buffer number. Generally this is not needed.
 
 // Allocate 8 second stereo buffer
@@ -124,13 +122,13 @@
 
 *allocConsecutive(numBufs, server, numFrames, numChannels, completionMessage, bufnum) 
 
- Allocates a range of consecutively-numbered buffers, for use with UGens like <a href="../UGens/Oscillators/VOsc.html">VOsc</a> and <a href="../UGens/Oscillators/VOsc3.html">VOsc3</a> that require a contiguous block of buffers, and returns an array of corresponding Buffer objects.
+ Allocates a range of consecutively-numbered buffers, for use with UGens like <a href="../UGens/Oscillators/VOsc.html">VOsc</a> and <a href="../UGens/Oscillators/VOsc3.html">VOsc3</a> that require a contiguous block of buffers, and returns an array of corresponding Buffer objects.
 
 numBufs - The number of consecutively indexed buffers to allocate.
- server - The server on which to allocate the buffers. The default is the default Server.
+ server - The server on which to allocate the buffers. The default is the default <a href="Server.html">Server</a>.
 numFrames - The number of frames to allocate in each buffer. Actual memory use will correspond to numFrames * numChannels.
 numChannels - The number of channels for each buffer. The default is 1.
- completionMessage - A valid OSC message or a Function which will return one. A Function will be passed each Buffer and its index in the array as arguments when evaluated.
+ completionMessage - A valid OSC message or a <a href="../Core/Kernel/Function.html">Function</a> which will return one. A Function will be passed each Buffer and its index in the array as arguments when evaluated.
 bufnum - An explicitly specified buffer number for the initial buffer. Generally this is not needed.
 
 N.B. You must treat the array of Buffers as a group. Freeing them individually or resuing them can result in allocation errors. You should free all Buffers in the array at the same time by iterating over it with do.
@@ -139,7 +137,7 @@
 // allocate an array of Buffers and fill them with different harmonics
 (
 b = Buffer.allocConsecutive(8, s, 4096, 1, { |buf, i|
- buf.sine1Msg((1..((i+1)*6)).reciprocal) // completion Messages
+ buf.sine1Msg((1..((i+1)*6)).reciprocal) // completion Messages
 });
 
 a = { VOsc.ar(SinOsc.kr(0.5, 0).range(b.first.bufnum + 0.1, b.last.bufnum - 0.1),
@@ -150,7 +148,7 @@
 // iterate over the array and free it
 b.do(_.free);
 
- *read(server, path, startFrame, numFrames, action, bufnum)
+ *read(server, path, startFrame, numFrames, action, bufnum)
 
 Allocate a buffer and immediately read a soundfile into it. This method sends a query message as a completion message so that the Buffer's instance variables will be updated automatically. N.B. You cannot rely on the buffer's instance variables being instantly updated, as there is a small amount of latency involved. action will be evaluated upon receipt of the reply to the query, so use this in cases where access to instance variables is needed.
 
@@ -167,26 +165,26 @@
 
 // now play it
 (
- x = SynthDef("help-Buffer",{ arg out = 0, bufnum;
+ x = SynthDef("help-Buffer",{ arg out = 0, bufnum;
 Out.ar( out,
 PlayBuf.ar(1, bufnum, BufRateScale.kr(bufnum))
 )
- }).play(s,[\bufnum, b]);
+ }).play(s,[\bufnum, b]);
 )
 x.free; b.free;
 
 // with an action function
 // note that the vars are not immediately up-to-date
 (
- b = Buffer.read(s, "sounds/a11wlk01.wav", action: { arg buffer; 
- ("After update:" + buffer.numFrames).postln;
+ b = Buffer.read(s, "sounds/a11wlk01.wav", action: { arg buffer; 
+ ("After update:" + buffer.numFrames).postln;
 x = { PlayBuf.ar(1, buffer, BufRateScale.kr(buffer)) }.play;
 });
- ("Before update:" + b.numFrames).postln;
+ ("Before update:" + b.numFrames).postln;
 )
 x.free; b.free;
 
- *readChannel(server, path, startFrame, numFrames, channels, action, bufnum)
+ *readChannel(server, path, startFrame, numFrames, channels, action, bufnum)
 
 As *read above, but takes an Array of channel indices to read in, allowing one to read only the selected channels.
 
@@ -206,21 +204,21 @@
 b.free;
 
 // Now just the sine
- b = Buffer.readChannel(s, "sounds/SinedPink.aiff", channels: [0]);
+ b = Buffer.readChannel(s, "sounds/SinedPink.aiff", channels: [0]);
 b.plot;
 b.free;
 
 // Now just the pink noise
- b = Buffer.readChannel(s, "sounds/SinedPink.aiff", channels: [1]);
+ b = Buffer.readChannel(s, "sounds/SinedPink.aiff", channels: [1]);
 b.plot;
 b.free;
 
 // Now reverse channel order
- b = Buffer.readChannel(s, "sounds/SinedPink.aiff", channels: [1, 0]);
+ b = Buffer.readChannel(s, "sounds/SinedPink.aiff", channels: [1, 0]);
 b.plot;
 b.free;
 
- *readNoUpdate(server, path, startFrame, numFrames, completionMessage, bufnum)
+ *readNoUpdate(server, path, startFrame, numFrames, completionMessage, bufnum)
 
 As *read above, but without the automatic update of instance variables. Call updateInfo (see below) to update the vars.
 
@@ -228,48 +226,48 @@
 path - A String representing the path of the soundfile to be read.
 startFrame - The first frame of the soundfile to read. The default is 0, which is the beginning of the file.
 numFrames - The number of frames to read. The default is -1, which will read the whole file.
- completionMessage - A valid OSC message or a Function which will return one. A Function will be passed this Buffer as an argument when evaluated.
+ completionMessage - A valid OSC message or a <a href="../Core/Kernel/Function.html">Function</a> which will return one. A Function will be passed this Buffer as an argument when evaluated.
 bufnum - An explicitly specified buffer number. Generally this is not needed.
 
- // with a completion message 
+ // with a completion message 
 s.boot;
 (
- SynthDef("help-Buffer",{ arg out=0, bufnum;
+ SynthDef("help-Buffer",{ arg out=0, bufnum;
 Out.ar( out,
 PlayBuf.ar(1,bufnum,BufRateScale.kr(bufnum))
 )
 }).send(s);
 
- y = Synth.basicNew("help-Buffer"); // not sent yet
- b = Buffer.readNoUpdate(s,"sounds/a11wlk01.wav", 
+ y = Synth.basicNew("help-Buffer"); // not sent yet
+ b = Buffer.readNoUpdate(s,"sounds/a11wlk01.wav", 
 completionMessage: { arg buffer;
 // synth add its s_new msg to follow 
 // after the buffer read completes
- y.newMsg(s,[\bufnum, buffer],\addToTail)
+ y.newMsg(s,[\bufnum, buffer],\addToTail)
 });
 )
 // note vars not accurate
- b.numFrames; // nil
+ b.numFrames; // nil
 b.updateInfo;
- b.numFrames; // 188893
+ b.numFrames; // 188893
 // when done...
 y.free;
 b.free; 
 
 *cueSoundFile(server, path, startFrame, numChannels, bufferSize, completionMessage)
 
- Allocate a buffer and preload a soundfile for streaming in using DiskIn.
+ Allocate a buffer and preload a soundfile for streaming in using <a href="../UGens/Playback and Recording/DiskIn.html">DiskIn</a>.
 
 server - The server on which to allocate the buffer.
 path - A String representing the path of the soundfile to be read.
- startFrame - The frame of the soundfile that DiskIn will start playing at.
+ startFrame - The frame of the soundfile that <a href="../UGens/Playback and Recording/DiskIn.html">DiskIn</a> will start playing at.
 numChannels - The number of channels in the soundfile.
 bufferSize - This must be a multiple of (2 * the server's block size). 32768 is the default and is suitable for most cases.
- completionMessage - A valid OSC message or a Function which will return one. A Function will be passed this Buffer as an argument when evaluated.
+ completionMessage - A valid OSC message or a <a href="../Core/Kernel/Function.html">Function</a> which will return one. A Function will be passed this Buffer as an argument when evaluated.
 
 s.boot;
 (
- SynthDef("help-Buffer-cue",{ arg out=0,bufnum;
+ SynthDef("help-Buffer-cue",{ arg out=0,bufnum;
 Out.ar(out,
 DiskIn.ar( 1, bufnum )
 )
@@ -278,24 +276,24 @@
 
 (
 s.makeBundle(nil, {
- b = Buffer.cueSoundFile(s,"sounds/a11wlk01-44_1.aiff", 0, 1);
- y = Synth.new("help-Buffer-cue", [\bufnum, b], s);
+ b = Buffer.cueSoundFile(s,"sounds/a11wlk01-44_1.aiff", 0, 1);
+ y = Synth.new("help-Buffer-cue", [\bufnum, b], s);
 });
 )
 b.free; y.free;
 
- *loadCollection(server, collection, numChannels, action)
+ *loadCollection(server, collection, numChannels, action)
 
- Load a large collection into a buffer on the server. Returns a Buffer object. This is accomplished through writing the collection to a SoundFile and loading it from there. For this reason this method will only work with a server on your local machine. For a remote server use *sendCollection, below. The file is automatically deleted after loading. This allows for larger collections than setn, below, and is in general the safest way to get a large collection into a buffer. The sample rate of the buffer will be the sample rate of the server on which it is created.
+ Load a large collection into a buffer on the server. Returns a Buffer object. This is accomplished through writing the collection to a <a href="../Files/SoundFile.html">SoundFile</a> and loading it from there. For this reason this method will only work with a server on your local machine. For a remote server use *sendCollection, below. The file is automatically deleted after loading. This allows for larger collections than setn, below, and is in general the safest way to get a large collection into a buffer. The sample rate of the buffer will be the sample rate of the server on which it is created.
 
 server - The server on which to create the buffer.
- collection - A subclass of Collection (i.e. an Array) containing only floats and integers. Multi-dimensional arrays will not work.
+ collection - A subclass of <a href="../Collections/Collection.html">Collection</a> (i.e. an <a href="../Collections/Array.html">Array</a>) containing only floats and integers. Multi-dimensional arrays will not work.
 numChannels - The number of channels that the buffer should have. Note that buffers interleave multichannel data. You are responsible for providing an interleaved collection if needed. Multi-dimensional arrays will not work.
 action - A Function to be evaluated once the file has been read and this Buffer's instance variables have been updated. The function will be passed this Buffer as an argument.
 
 s.boot;
 (
- a = FloatArray.fill(44100 * 5.0, {1.0.rand2}); // 5 seconds of noise
+ a = FloatArray.fill(44100 * 5.0, {1.0.rand2}); // 5 seconds of noise
 b = Buffer.loadCollection(s, a);
 )
 
@@ -318,25 +316,25 @@
 b.plot;
 x.free; b.free;
 
- *sendCollection(server, collection, numChannels, wait, action)
+ *sendCollection(server, collection, numChannels, wait, action)
 
 Stream a large collection into a buffer on the server using multiple setn messages. Returns a Buffer object. This allows for larger collections than setn, below. This is not as safe as *loadCollection, above, but will work with servers on remote machines. The sample rate of the buffer will be the sample rate of the server on which it is created.
 
 server - The server on which to create the buffer.
- collection - A subclass of Collection (i.e. an Array) containing only floats and integers. Multi-dimensional arrays will not work.
+ collection - A subclass of <a href="../Collections/Collection.html">Collection</a> (i.e. an <a href="../Collections/Array.html">Array</a>) containing only floats and integers. Multi-dimensional arrays will not work.
 numChannels - The number of channels that the buffer should have. Note that buffers interleave multichannel data. You are responsible for providing an interleaved collection if needed. Multi-dimensional arrays will not work. See the example in *loadCollection, above, to see how to do this.
 wait - An optional wait time between sending setn messages. In a high traffic situation it may be safer to set this to something above zero, which is the default.
- action - A Function to be evaluated once the file has been read and this Buffer's instance variables have been updated. The function will be passed this Buffer as an argument.
+ action - A <a href="../Core/Kernel/Function.html">Function</a> to be evaluated once the file has been read and this Buffer's instance variables have been updated. The function will be passed this Buffer as an argument.
 
 s.boot;
 (
- a = Array.fill(2000000,{ rrand(0.0,1.0) }); // a LARGE collection
- b = Buffer.sendCollection(s, a, 1, 0, {arg buf; "finished".postln;});
+ a = Array.fill(2000000,{ rrand(0.0,1.0) }); // a LARGE collection
+ b = Buffer.sendCollection(s, a, 1, 0, {arg buf; "finished".postln;});
 )
 b.get(1999999, {|msg| (msg == a[1999999]).postln});
 b.free;
 
- *loadDialog(server, startFrame, numFrames, action, bufnum)
+ *loadDialog(server, startFrame, numFrames, action, bufnum)
 
 As *read above, but gives you a load dialog window to browse for a file. Cocoa and SwingOSC compatible.
 
@@ -360,7 +358,7 @@
 
 Create and return a new Buffer object, without immediately allocating the corresponding memory on the server. This combined with 'message' methods can be flexible with bundles.
 
- server - The server on which to allocate the buffer. The default is the default Server.
+ server - The server on which to allocate the buffer. The default is the default <a href="Server.html">Server</a>.
 numFrames - The number of frames to allocate. Actual memory use will correspond to numFrames * numChannels.
 numChannels - The number of channels for the Buffer. The default is 1.
 bufnum - An explicitly specified buffer number. Generally this is not needed.
@@ -369,7 +367,7 @@
 b = Buffer.new(s, 44100 * 8.0, 2);
 c = Buffer.new(s, 44100 * 4.0, 2);
 b.query; // numFrames = 0
- s.sendBundle(nil, b.allocMsg, c.allocMsg); // sent both at the same time
+ s.sendBundle(nil, b.allocMsg, c.allocMsg); // sent both at the same time
 b.query; // now it's right
 c.query;
 b.free; c.free;
@@ -379,7 +377,7 @@
 
 Allocate the necessary memory on the server for a Buffer previously created with *new, above.
 
- completionMessage - A valid OSC message or a Function which will return one. A Function will be passed this Buffer as an argument when evaluated.
+ completionMessage - A valid OSC message or a <a href="../Core/Kernel/Function.html">Function</a> which will return one. A Function will be passed this Buffer as an argument when evaluated.
 
 s.boot;
 b = Buffer.new(s, 44100 * 8.0, 2);
@@ -393,10 +391,10 @@
 
 Read a soundfile into a buffer on the server for a Buffer previously created with *new, above. Note that this will not autoupdate instance variables. Call updateInfo in order to do this.
 
- argpath - A String representing the path of the soundfile to be read.
+ argpath - A <a href="../Collections/String.html">String</a> representing the path of the soundfile to be read.
 startFrame - The first frame of the soundfile to read. The default is 0, which is the beginning of the file.
 numFrames - The number of frames to read. The default is -1, which will read the whole file.
- completionMessage - A valid OSC message or a Function which will return one. A Function will be passed this Buffer as an argument when evaluated.
+ completionMessage - A valid OSC message or a <a href="../Core/Kernel/Function.html">Function</a> which will return one. A Function will be passed this Buffer as an argument when evaluated.
 
 s.boot;
 b = Buffer.new(s);
@@ -409,16 +407,16 @@
 
 As allocRead above, but allows you to specify which channels to read.
 
- argpath - A String representing the path of the soundfile to be read.
+ argpath - A <a href="../Collections/String.html">String</a> representing the path of the soundfile to be read.
 startFrame - The first frame of the soundfile to read. The default is 0, which is the beginning of the file.
 numFrames - The number of frames to read. The default is -1, which will read the whole file.
- channels - An Array of channels to be read from the soundfile. Indices start from zero. These will be read in the order provided.
- completionMessage - A valid OSC message or a Function which will return one. A Function will be passed this Buffer as an argument when evaluated.
+ channels - An <a href="../Collections/Array.html">Array</a> of channels to be read from the soundfile. Indices start from zero. These will be read in the order provided.
+ completionMessage - A valid OSC message or a <a href="../Core/Kernel/Function.html">Function</a> which will return one. A Function will be passed this Buffer as an argument when evaluated.
 
 s.boot;
 b = Buffer.new(s);
 // read only the first channel (a Sine wave) of a stereo file
- b.allocReadChannel("sounds/SinedPink.aiff", channels: [0]);
+ b.allocReadChannel("sounds/SinedPink.aiff", channels: [0]);
 x = { PlayBuf.ar(1, b, BufRateScale.kr(b), loop: 1) * 0.5 }.play;
 x.free; b.free; 
 
@@ -429,41 +427,41 @@
 
 Read a soundfile into an already allocated buffer. Note that if the number of frames in the file is greater than the number of frames in the buffer, it will be truncated. Note that readMsg will not auto-update instance variables. Call updateInfo in order to do this.
 
- path - A String representing the path of the soundfile to be read.
+ path - A <a href="../Collections/String.html">String</a> representing the path of the soundfile to be read.
 fileStartFrame - The first frame of the soundfile to read. The default is 0, which is the beginning of the file.
 numFrames - The number of frames to read. The default is -1, which will read the whole file.
 bufStartFrame - The index of the frame in the buffer at which to start reading. The default is 0, which is the beginning of the buffer.
- leaveOpen - A boolean indicating whether or not the Buffer should be left 'open'. For use with DiskIn you will want this to be true, as the buffer will be used for streaming the soundfile in from disk. (For this the buffer must have been allocated with a multiple of (2 * synth block size). A common number is 32768 frames. cueSoundFile below, provides a simpler way of doing this.) The default is false which is the correct value for all other cases.
+ leaveOpen - A boolean indicating whether or not the Buffer should be left 'open'. For use with <a href="../UGens/Playback and Recording/DiskIn.html">DiskIn</a> you will want this to be true, as the buffer will be used for streaming the soundfile in from disk. (For this the buffer must have been allocated with a multiple of (2 * synth block size). A common number is 32768 frames. cueSoundFile below, provides a simpler way of doing this.) The default is false which is the correct value for all other cases.
 action - A Function to be evaluated once the file has been read and this Buffer's instance variables have been updated. The function will be passed this Buffer as an argument.
- completionMessage - A valid OSC message or a Function which will return one. A Function will be passed this Buffer as an argument when evaluated.
+ completionMessage - A valid OSC message or a <a href="../Core/Kernel/Function.html">Function</a> which will return one. A Function will be passed this Buffer as an argument when evaluated.
 
 readChannel(path, fileStartFrame, numFrames, bufStartFrame, leaveOpen, channels, action);
 readChannelMsg(path, fileStartFrame, numFrames, bufStartFrame, leaveOpen, channels, completionMessage);
 
 As read above, but allows you to specify which channels to read.
 
- path - A String representing the path of the soundfile to be read.
+ path - A <a href="../Collections/String.html">String</a> representing the path of the soundfile to be read.
 fileStartFrame - The first frame of the soundfile to read. The default is 0, which is the beginning of the file.
 numFrames - The number of frames to read. The default is -1, which will read the whole file.
 bufStartFrame - The index of the frame in the buffer at which to start reading. The default is 0, which is the beginning of the buffer.
- leaveOpen - A boolean indicating whether or not the Buffer should be left 'open'. For use with DiskIn you will want this to be true, as the buffer will be used for streaming the soundfile in from disk. (For this the buffer must have been allocated with a multiple of (2 * synth block size). A common number is 32768 frames. cueSoundFile below, provides a simpler way of doing this.) The default is false which is the correct value for all other cases.
- channels - An Array of channels to be read from the soundfile. Indices start from zero. These will be read in the order provided. The number of channels requested must match this Buffer's numChannels.
- action - A Function to be evaluated once the file has been read and this Buffer's instance variables have been updated. The function will be passed this Buffer as an argument.
- completionMessage - A valid OSC message or a Function which will return one. A Function will be passed this Buffer as an argument when evaluated.
+ leaveOpen - A boolean indicating whether or not the Buffer should be left 'open'. For use with <a href="../UGens/Playback and Recording/DiskIn.html">DiskIn</a> you will want this to be true, as the buffer will be used for streaming the soundfile in from disk. (For this the buffer must have been allocated with a multiple of (2 * synth block size). A common number is 32768 frames. cueSoundFile below, provides a simpler way of doing this.) The default is false which is the correct value for all other cases.
+ channels - An <a href="../Collections/Array.html">Array</a> of channels to be read from the soundfile. Indices start from zero. These will be read in the order provided. The number of channels requested must match this Buffer's numChannels.
+ action - A <a href="../Core/Kernel/Function.html">Function</a> to be evaluated once the file has been read and this Buffer's instance variables have been updated. The function will be passed this Buffer as an argument.
+ completionMessage - A valid OSC message or a <a href="../Core/Kernel/Function.html">Function</a> which will return one. A Function will be passed this Buffer as an argument when evaluated.
 
 
 cueSoundFile(path, startFrame, completionMessage)
 cueSoundFileMsg(path, startFrame, completionMessage)
 
- A convenience method to cue a soundfile into the buffer for use with a DiskIn. The buffer must have been allocated with a multiple of (2 * the server's block size) frames. A common size is 32768 frames.
+ A convenience method to cue a soundfile into the buffer for use with a <a href="../UGens/Playback and Recording/DiskIn.html">DiskIn</a>. The buffer must have been allocated with a multiple of (2 * the server's block size) frames. A common size is 32768 frames.
 
- path - A String representing the path of the soundfile to be read.
+ path - A <a href="../Collections/String.html">String</a> representing the path of the soundfile to be read.
 startFrame - The first frame of the soundfile to read. The default is 0, which is the beginning of the file.
- completionMessage - A valid OSC message or a Function which will return one. A Function will be passed this Buffer as an argument when evaluated.
+ completionMessage - A valid OSC message or a <a href="../Core/Kernel/Function.html">Function</a> which will return one. A Function will be passed this Buffer as an argument when evaluated.
 
 s.boot;
- //create with cueSoundFile class method
- b = Buffer.cueSoundFile(s, "sounds/a11wlk01-44_1.aiff", 0, 1);
+ //create with cueSoundFile class method
+ b = Buffer.cueSoundFile(s, "sounds/a11wlk01-44_1.aiff", 0, 1);
 x = { DiskIn.ar(1, b) }.play; 
 b.close; // must call close in between cueing
 // now use like named instance method, but different arguments
@@ -474,27 +472,27 @@
 write(path, headerFormat, sampleFormat, numFrames, startFrame, leaveOpen, completionMessage)
 writeMsg(path, headerFormat, sampleFormat, numFrames, startFrame, leaveOpen, completionMessage)
 
- Write the contents of the buffer to a file. See SoundFile for information on valid values for headerFormat and sampleFormat.
+ Write the contents of the buffer to a file. See <a href="../Files/SoundFile.html">SoundFile</a> for information on valid values for headerFormat and sampleFormat.
 
 path - A String representing the path of the soundfile to be written.
 numFrames - The number of frames to write. The default is -1, which will write the whole buffer.
 startFrame - The index of the frame in the buffer from which to start writing. The default is 0, whic