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

[sciss-2]

Revision: 9095
          http://supercollider.svn.sourceforge.net/supercollider/?rev=9095&view=rev
Author:   sciss
Date:     2009-04-21 20:15:13 +0000 (Tue, 21 Apr 2009)

Log Message:
-----------
zapping gremlins with alberto's cool gremlin extensions...

Modified Paths:
--------------
    trunk/build/SCClassLibrary/Common/Files/PathName.sc
    trunk/build/SCClassLibrary/Common/Streams/Stream.sc

Modified: trunk/build/SCClassLibrary/Common/Files/PathName.sc
===================================================================
--- trunk/build/SCClassLibrary/Common/Files/PathName.sc 2009-04-21 19:47:33 UTC (rev 9094)
+++ trunk/build/SCClassLibrary/Common/Files/PathName.sc 2009-04-21 20:15:13 UTC (rev 9095)
@@ -104,7 +104,7 @@
 
  i=0;
  while{a[i]==b[i] and:{i<a.size}}{
- \xCA \xCA \xCA \xCAi = i + 1;
+        i = i + 1;
  };
  ^(".."++r).dup(b.size-i).join ++ a[i..].join(r)
  }

Modified: trunk/build/SCClassLibrary/Common/Streams/Stream.sc
===================================================================
--- trunk/build/SCClassLibrary/Common/Streams/Stream.sc 2009-04-21 19:47:33 UTC (rev 9094)
+++ trunk/build/SCClassLibrary/Common/Streams/Stream.sc 2009-04-21 20:15:13 UTC (rev 9095)
@@ -495,11 +495,11 @@
 //
 //}
 
-EventStreamPlayer\xCA:\xCAPauseStream\xCA{
- var\xCA<>event, <>muteCount = 0, <>cleanup, <>routine;
+EventStreamPlayer : PauseStream {
+ var <>event, <>muteCount = 0, <>cleanup, <>routine;
 
- *new {\xCAarg\xCAstream, event;
- ^super.new(stream).event_(event ?\xCAEvent.default).init;
+ *new { arg stream, event;
+ ^super.new(stream).event_(event ? Event.default).init;
  }
 
  init {
@@ -509,16 +509,16 @@
 
  // freeNodes is passed as false from
  //TempoClock:cmdPeriod
- removedFromScheduler {\xCA| freeNodes = true |
- nextBeat =\xCAnil;
+ removedFromScheduler { | freeNodes = true |
+ nextBeat = nil;
  cleanup.terminate(freeNodes);
  this.prStop;
  this.changed(\stopped);
  }
  prStop {
- stream = nextBeat =\xCAnil;
- isWaiting =\xCAfalse;
- \xCA}
+ stream = nextBeat = nil;
+ isWaiting = false;
+ }
 
  stop {
  cleanup.terminate;
@@ -532,9 +532,9 @@
 
  next { | inTime | ^routine.next(inTime) }
 
- prNext {\xCAarg\xCAinTime;
- var\xCAnextTime;
- var\xCAoutEvent = stream.next(event.copy);
+ prNext { arg inTime;
+ var nextTime;
+ var outEvent = stream.next(event.copy);
  if (outEvent.isNil) {
  streamHasEnded = stream.notNil;
  cleanup.clear;
@@ -542,30 +542,30 @@
  ^nil
  }{
  nextTime = outEvent.playAndDelta(cleanup, muteCount > 0);
- if (nextTime.isNil) {\xCAthis.removedFromScheduler; ^nil\xCA};
+ if (nextTime.isNil) { this.removedFromScheduler; ^nil };
  nextBeat = inTime + nextTime; // inval is current logical beat
  ^nextTime
  };
  }
 
- asEventStreamPlayer { ^this\xCA}
+ asEventStreamPlayer { ^this }
 
- play {\xCAarg\xCAargClock, doReset = (false), quant;
- if (stream.notNil, {\xCA"already playing".postln; ^this\xCA});
- if (doReset, {\xCAthis.reset });
- clock = argClock ? clock ?\xCATempoClock.default;
- streamHasEnded =\xCAfalse;
+ play { arg argClock, doReset = (false), quant;
+ if (stream.notNil, { "already playing".postln; ^this });
+ if (doReset, { this.reset });
+ clock = argClock ? clock ? TempoClock.default;
+ streamHasEnded = false;
  stream = originalStream;
- isWaiting =\xCAtrue; // make sure that accidental play/stop/play sequences
+ isWaiting = true; // make sure that accidental play/stop/play sequences
  // don't cause memory leaks
- era =\xCACmdPeriod.era;
+ era = CmdPeriod.era;
  quant = quant.asQuant;
  event = event.synchWithQuant(quant);
 
  clock.play({
  if(isWaiting and: { nextBeat.isNil }) {
- clock.sched(0,\xCAthis );
- isWaiting =\xCAfalse;
+ clock.sched(0, this );
+ isWaiting = false;
  this.changed(\playing)
  };
  nil


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/