SF.net SVN: supercollider:[9104] trunk/build/SCClassLibrary/Common

Revision: 9104
          http://supercollider.svn.sourceforge.net/supercollider/?rev=9104&view=rev
Author:   jamshark70
Date:     2009-04-22 20:26:55 +0000 (Wed, 22 Apr 2009)

Log Message:
-----------
Last (I hope!) update for Event.silent. Event.silent is used throughout the lib for rest-generating patterns (Ptpar, Pspawner, Psync). Patterns downstream from these can count on identifying rests by event[\type] == \rest.

Modified Paths:
--------------
    trunk/build/SCClassLibrary/Common/Collections/Event.sc
    trunk/build/SCClassLibrary/Common/Streams/FilterPatterns.sc
    trunk/build/SCClassLibrary/Common/Streams/Ppar.sc
    trunk/build/SCClassLibrary/Common/Streams/Pspawner.sc

Modified: trunk/build/SCClassLibrary/Common/Collections/Event.sc
===================================================================
--- trunk/build/SCClassLibrary/Common/Collections/Event.sc 2009-04-22 18:51:15 UTC (rev 9103)
+++ trunk/build/SCClassLibrary/Common/Collections/Event.sc 2009-04-22 20:26:55 UTC (rev 9104)
@@ -12,8 +12,12 @@
  *default {
  ^Event.new(8, nil, defaultParentEvent, true);
  }
- *silent { arg dur = 1.0;
- ^Event.new(8, nil, defaultParentEvent, true).put(\type, \rest).put(\dur, dur)
+ *silent { arg dur = 1.0, inEvent;
+ if(inEvent.isNil) { inEvent = Event.new }
+ { inEvent = inEvent.copy };
+ inEvent.put(\type, \rest).put(\dur, dur).put(\parent, defaultParentEvent)
+ .put(\delta, inEvent.delta);
+ ^inEvent
  }
  *addEventType { arg type, func;
  var types = partialEvents.playerEvent.eventTypes;

Modified: trunk/build/SCClassLibrary/Common/Streams/FilterPatterns.sc
===================================================================
--- trunk/build/SCClassLibrary/Common/Streams/FilterPatterns.sc 2009-04-22 18:51:15 UTC (rev 9103)
+++ trunk/build/SCClassLibrary/Common/Streams/FilterPatterns.sc 2009-04-22 20:26:55 UTC (rev 9104)
@@ -430,7 +430,7 @@
  inevent = stream.next(event);
  if(inevent.isNil) {
  if(quant.notNil) {
- event = Event.silent(elapsed.roundUp(quant) - elapsed);
+ event = Event.silent(elapsed.roundUp(quant) - elapsed, event);
  ^cleanup.exit(event).yield;
  };
  };

Modified: trunk/build/SCClassLibrary/Common/Streams/Ppar.sc
===================================================================
--- trunk/build/SCClassLibrary/Common/Streams/Ppar.sc 2009-04-22 18:51:15 UTC (rev 9103)
+++ trunk/build/SCClassLibrary/Common/Streams/Ppar.sc 2009-04-22 20:26:55 UTC (rev 9104)
@@ -22,7 +22,7 @@
 // outval.put(\freq, \rest);
 // outval.put(\delta, nexttime);
 
- outval = Event.silent(nexttime);
+ outval = Event.silent(nexttime, inval);
  inval = outval.yield;
  now = nexttime;
  });

Modified: trunk/build/SCClassLibrary/Common/Streams/Pspawner.sc
===================================================================
--- trunk/build/SCClassLibrary/Common/Streams/Pspawner.sc 2009-04-22 18:51:15 UTC (rev 9103)
+++ trunk/build/SCClassLibrary/Common/Streams/Pspawner.sc 2009-04-22 20:26:55 UTC (rev 9104)
@@ -40,7 +40,7 @@
  }
 
  wait { | dur |
- Event.silent(dur).yield
+ Event.silent(dur, event).yield
  }
 
  embedInStream { | inevent, cleanup|
@@ -63,7 +63,7 @@
 // outevent = event.copy;
 // outevent.put(\freq, \rest);
 // outevent.put(\delta, nexttime - now);
- outevent = Event.silent(nexttime - now);
+ outevent = Event.silent(nexttime - now, event);
  event = outevent.yield;
  now = nexttime;
  },{
@@ -181,4 +181,4 @@
  }).play
 
 )
-*/
\ No newline at end of file
+*/


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/