Nabble - Supercollider - Dev

SF.net SVN: supercollider:[7819] trunk/build/SCClassLibrary/Common/GUI/osx/ SCImage.sc

2008-10-08T03:21:32Z

Revision: 7819
http://supercollider.svn.sourceforge.net/supercollider/?rev=7819&view=rev
Author: thelych
Date: 2008-10-08 10:21:32 +0000 (Wed, 08 Oct 2008)

Log Message:
-----------
corrections on SCImage, SCImageFilter

Modified Paths:
--------------
trunk/build/SCClassLibrary/Common/GUI/osx/SCImage.sc

Modified: trunk/build/SCClassLibrary/Common/GUI/osx/SCImage.sc
===================================================================
--- trunk/build/SCClassLibrary/Common/GUI/osx/SCImage.sc 2008-10-08 08:41:49 UTC (rev 7818)
+++ trunk/build/SCClassLibrary/Common/GUI/osx/SCImage.sc 2008-10-08 10:21:32 UTC (rev 7819)
@@ -196,6 +196,11 @@
this.applyFilters(filter);
^this;
}
+ invert {
+ if(autoMode, {this.accelerated_(true)});
+ this.applyFilters(SCImageFilter(\CIColorInvert));
+ ^this;
+ }
interpolation {
var index;
index = this.prGetInterpolation;
@@ -239,6 +244,15 @@
pixelArray = Int32Array.newClear(width*height);
this.prLoadPixels(pixelArray);
^pixelArray;
+ }
+ loadPixels {arg array;
+ if(autoMode, {this.accelerated_(false)});
+ if(array.isKindOf(Int32Array).not, {
+ "SCImage: array should be an Int32Array".warn;
+ ^nil;
+ });
+ this.prLoadPixels(array);
+ ^this;
}
pixels_ {|array|
this.setPixels(array);
@@ -283,6 +297,9 @@
});
};
}
+ removeAllFilters {
+ filters = [];
+ }
createCache { // only for Filters
prCache = this.filteredWith(filters);
}
@@ -291,9 +308,10 @@
*/
flatten {
this.clearCache;
- this.accelerated_(true); // we have to force acceleration in case of a previous mod
+ this.accelerated_(true); // force acceleration just in case
this.applyFilters(filters);
filters = []; // clear all filters
+ if(autoMode, {this.accelerated_(false)}); // ensure bitmap representation
}

applyFilters {|filters, crop=0, region|
@@ -387,7 +405,7 @@
}
draw {|aFunction|
this.lockFocus;
- aFunction.value(this.bounds);
+ aFunction.value(this);
this.unlockFocus;
}

@@ -659,17 +677,18 @@
"SCImage filter categories done !".postln;
}

- *new {|filterName|
- ^super.newCopyArgs(filterName.asSymbol).initSCImageFilter;
+ *new {|filterName, args|
+ ^super.newCopyArgs(filterName.asSymbol).initSCImageFilter(args);
}

defaults {
values = Array.new;
}

- initSCImageFilter {
+ initSCImageFilter {|arguments|
attributes = this.class.getFilterAttributes(name);
values = Array.new;
+ this.attributes_(arguments);
}

*translateObject {|object|
@@ -742,6 +761,22 @@
^result;
}

+ // new
+ attributes_ {|array|
+ var method, value, max;
+ if(array.isNil, {^this});
+ max = array.size.asInteger >> 1;
+ max.do {|i|
+ method = array[i << 1];
+ value = array[(i << 1) + 1];
+ this.perform(method.asSymbol.asSetter, value);
+ };
+ }
+
+ set {arg ... values;
+ this.attributes_(values);
+ }
+
prAttributeRange { |attr|
_SCImageFilter_GetAttributeMinMax
^this.primitiveFailed

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

_______________________________________________
sc-dev mailing list

info (subscribe and unsubscribe): 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/

Re: LocalBuf

2008-10-08T02:09:24Z

2008/10/8, Julian Rohrhuber <rohrhuber@...>:
> I've almost completely implemented a LocalBuf UGen that creates a
> Graph-local buffer which can be used by all other buffer ugens. Thus, e.g.
> FFT can be made synth-wise. This simplifies some buffer based things.

Sounds good indeed. Looking forward to the details.

> It
> implies some changes to the GET_BUF macros, and to Graph.
>
> I'll post a diff soon (and discuss whether it makes sense) (but maybe hold
> back Cruft Police updates to DelayUGens.cpp and FFT ugens?)

OK, I'll tell them to put the investigation on hold.

I have one more cruft-trim to propose which I think will be orthogonal
to this, but feel free to complain if it isn't.

Dan

_______________________________________________
sc-dev mailing list

info (subscribe and unsubscribe): 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/

LocalBuf

2008-10-08T02:02:26Z

I've almost completely implemented a LocalBuf UGen that creates a
Graph-local buffer which can be used by all other buffer ugens. Thus,
e.g. FFT can be made synth-wise. This simplifies some buffer based
things. It implies some changes to the GET_BUF macros, and to Graph.

I'll post a diff soon (and discuss whether it makes sense) (but maybe
hold back Cruft Police updates to DelayUGens.cpp and FFT ugens?)
--

.

_______________________________________________
sc-dev mailing list

info (subscribe and unsubscribe): 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/

Re: SCImage [announcement]

2008-10-08T01:49:35Z

Looks good here. Announce to sc-users?

Dan

2008/10/8, blackrain <blackrain.sc@...>:

> Thanks everyone for your feedback =)
>
> SCImage has been checked in on rev 7815.
> Just tested on a clean checkout and everything builds fine.
>
> cheers,
>
> x
>
>
>
> On Tue, Oct 7, 2008 at 12:36 PM, thor <th.list@...> wrote:
> >
> > Yes please!
> >
> > I've made Photoshop in SC now. But you all have the crack anyway
> > so I won't post the code.
> >
> > SCImage is really great.
> >
> > thor
> >
> >
> > On 7 Oct 2008, at 13:15, LFSaw wrote:
> >
> >> yeees!
> >>
> >> :-)
> >>
> >> (finally, an sc-only stft viewer is in sight)
> >>
> >> lg
> >> Till
> >>
> >> On 07.10.2008, at 13:40, Josh Parmenter wrote:
> >>
> >>> I say commit... others?
> >>> Josh
> >>>
> >>> On Oct 7, 2008, at 2:19 AM, blackrain wrote:
> >>>
> >>>> Hello All,
> >>>>
> >>>> Are there any objections to commit SCimage?
> >>>>
> >>>> thor, thanks!
> >>>> Glad you liked SCImage thor, Charles and I appreciate your feedback.
> >>>>
> >>>> cheers,
> >>>>
> >>>> x
> >>>>
> >>>> On Thu, Sep 25, 2008 at 6:13 AM, thor <th.list@...> wrote:
> >>>>>
> >>>>> Ok. it compiled now.
> >>>>>
> >>>>> This is truly mind blowing!!! Thank you very much Charles and
> >>>>> Blackrain.
> >>>>> What a great piece of work. I could spend the whole day exploring this
> >>>>> but
> >>>>> unfortunately I've got other things to do. I will report back when I've
> >>>>> had
> >>>>> a chance to work with this properly.
> >>>>>
> >>>>> It's great that get and set pixel is working. The next step for me is
> >>>>> to do
> >>>>> some
> >>>>> speed tests. Have you got some code that you've used while working on
> >>>>> this?
> >>>>>
> >>>>> Thanks
> >>>>> thor
> >>>>>
> >>>>>
> >>>>> On 24 Sep 2008, at 22:32, thelych@... wrote:
> >>>>>
> >>>>>> oh thor,
> >>>>>>
> >>>>>> and you will have probably to re-apply the patch otherwise the
> >>>>>> primitives
> >>>>>> since there is some mods on GUIPrimitives (actually a single line) :
> >>>>>>
> >>>>>> patch -p0 -N < SCImage-rev7786.diff
> >>>>>>
> >>>>>> say (y) yes if it asks you anything.
> >>>>>>
> >>>>>> best,
> >>>>>> charles
> >>>>>>
> >>>>>>
> >>>>>> _______________________________________________
> >>>>>> sc-dev mailing list
> >>>>>>
> >>>>>> info (subscribe and unsubscribe):
> >>>>>> 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-dev mailing list
> >>>>>
> >>>>> info (subscribe and unsubscribe):
> >>>>> 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-dev mailing list
> >>>>
> >>>> info (subscribe and unsubscribe):
> >>>> 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/
> >>>
> >>> ******************************************
> >>> /* Joshua D. Parmenter
> >>> http://www.realizedsound.net/josh/
> >>>
> >>> "Every composer – at all times and in all cases – gives his own
> >>> interpretation of how modern society is structured: whether actively or
> >>> passively, consciously or unconsciously, he makes choices in this regard. He
> >>> may be conservative or he may subject himself to continual renewal; or he
> >>> may strive for a revolutionary, historical or social palingenesis." - Luigi
> >>> Nono
> >>> */
> >>>
> >>>
> >>> _______________________________________________
> >>> sc-dev mailing list
> >>>
> >>> info (subscribe and unsubscribe):
> >>> 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-dev mailing list
> >>
> >> info (subscribe and unsubscribe):
> >> 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-dev mailing list
> >
> > info (subscribe and unsubscribe):
> > 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-dev mailing list
>
> info (subscribe and unsubscribe): 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/
>

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

_______________________________________________
sc-dev mailing list

info (subscribe and unsubscribe): 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/

Re: Re: Cruft police part 2: OscUGens.cpp

2008-10-08T01:45:04Z

OK, thanks, I've now committed the other changes but I've left the
BufEnvGen stuff in place for now.

"BufEnvGen is useful" is definitely not true while it's not actually
implemented though! I'd like to suggest that either someone finishes
the job off within the next (say) two years, so that BufEnvGen
actually comes into existence, or it should be removed at a later
date.

Dan

2008/10/2, ronald kuivila <rkuivila@...>:

> Hi all,
>
> I think BufEnvGen is useful - at least for historical continuity with
> csound instruments found in various
> computer music books (Dodge, etc).
>
> RJK
>
>
> On Oct 2, 2008, at 7:10 AM, Dan Stowell wrote:
>
>
> >
> > PS at the same time maybe I can suggest the same for:
> >
> > FilterUGens.cpp -> "LowShelf"
> > LFUGens.cpp -> "BufEnvGen"
> >
> > Both were deactivated ever since first cvs checkin, never used.
> >
> > There are a couple of on-list messages about BufEnvGen, saying "hey
> > what about this, maybe would be useful" - if you think so please
> > comment. But I don't think it should remain in the codebase if it's
> > only ever going to be a theoretical entity...!
> >
> > Dan
> >
> >
> > 2008/10/2 Dan Stowell <danstowell@...>:
> >
> > > Hi -
> > >
> > > OscUGens.cpp has contained (since the very first CVS checkin of SC3!)
> > > a lump of code which is deactivated and therefore vestigial. It
> > > defines oscillators COsc2/PMOsc/OscX4/OscX2, but since the code is
> > > deactivated they're unavailable, and I assume that either there was
> > > some problem with their implementation or that they were deemed
> > > unnecessary. PMOsc now exists in SC3 as a pseudo-ugen.
> > >
> > > There's also a deactivated vKlank_next() method: a vectorised version
> > > of Klank_next, added in 2003 (rev 1341), deactivated in 2004 (rev
> > > 4031). Not sure why deactivated: JMc's commit message was "Fix
> > > compiler warnings".
> > >
> > > Any support/opposition for removing this vestigial code? Vestigial
> > > code impedes maintenance, porting etc, so I'm in favour of removing.
> > > Of course, the code will stay in the archives for future reference.
> > >
> > > Dan
> > >
> > >
> >
> >
> >
> > --
> > http://www.mcld.co.uk
> >
> > _______________________________________________
> > sc-dev mailing list
> >
> > info (subscribe and unsubscribe):
> 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-dev mailing list
>
> info (subscribe and unsubscribe):
> 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:[7817] trunk/Source/plugins/OscUGens.cpp

2008-10-08T01:35:43Z

Revision: 7817
http://supercollider.svn.sourceforge.net/supercollider/?rev=7817&view=rev
Author: danstowell
Date: 2008-10-08 08:35:43 +0000 (Wed, 08 Oct 2008)

Log Message:
-----------
Cruft removal: removing some code that was added many years ago but never completed, never activated, and it seems we can live without (COsc2/PMOsc/OscX4/OscX2). (Note that PMOsc does exist in SC3, but as a pseudo-ugen.)

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

Modified: trunk/Source/plugins/OscUGens.cpp
===================================================================
--- trunk/Source/plugins/OscUGens.cpp 2008-10-08 05:34:43 UTC (rev 7816)
+++ trunk/Source/plugins/OscUGens.cpp 2008-10-08 08:35:43 UTC (rev 7817)
@@ -133,36 +133,6 @@
int32 m_phase1, m_phase2;
};

-#if 0
-struct COsc2 : public TableLookup
-{
- float *mTable2, *mTable3;
- int32 m_phase1, m_phase2;
-};
-
-struct OscX4 : public TableLookup
-{
- float* mTables[8];
- int32 m_phase;
- float m_xpos, m_ypos;
-};
-
-struct OscX2 : public TableLookup
-{
- float* mTables[4];
- int32 m_phase, m_counter;
- double m_xfadeslope, m_xfade;
-};
-
-struct PMOsc : public Unit
-{
- int32 m_phase1, m_phase2, m_iphasemod;
- float m_pmindex;
- double m_cpstoinc, m_radtoinc;
-};
-#endif
-
-
struct VOsc : public Unit
{
double m_cpstoinc, m_radtoinc;
@@ -328,23 +298,6 @@
void COsc_Ctor(COsc *unit);
void COsc_next(COsc *unit, int inNumSamples);

-#if 0
-void COsc2_Ctor(COsc2 *unit);
-void COsc2_next(COsc2 *unit, int inNumSamples);
-
-void PMOsc_Ctor(PMOsc *unit);
-void PMOsc_next_kkkk(PMOsc *unit, int inNumSamples);
-
-void OscX4_Ctor(OscX4 *unit);
-void OscX4_SetTables(OscX4 *unit, int32 inSize, float* inTableA, float* inTableB,
- float* inTableC, float* inTableD);
-void OscX4_next(OscX4 *unit, int inNumSamples);
-
-void OscX2_Ctor(OscX2 *unit);
-void OscX2_SetTables(OscX2 *unit, int32 inSize, float* inTableA, float* inTableB);
-void OscX2_next(OscX2 *unit, int inNumSamples);
-#endif
-
void VOsc_Ctor(VOsc *unit);
void VOsc_next_ik(VOsc *unit, int inNumSamples);

@@ -2060,76 +2013,6 @@

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

-#if 0
-
-void PMOsc_Ctor(PMOsc *unit)
-{
- SETCALC(PMOsc_next_kkkk);
- float phasemod = ZIN0(3);
- unit->m_cpstoinc = ft->mSineSize * SAMPLEDUR * 65536.;
- unit->m_radtoinc = ft->mSineSize * 65536. * rtwopi;
- unit->m_phase1 = 0;
- unit->m_phase2 = 0;
- unit->m_iphasemod = (int32)(unit->m_radtoinc * phasemod);
- PMOsc_next_kkkk(1);
-}
-
-void PMOsc_next_kkkk(PMOsc *unit, int inNumSamples)
-{
- float *out = ZOUT(0);
- float carfreqin = ZIN0(0);
- float modfreqin = ZIN0(1);
- float next_pmindex = ZIN0(2);
- float phasemod = ZIN0(3);
-
- float* sine = ft->mSine;
- float* pmsine = gPMSine;
- int32 phase1 = unit->m_phase1;
- int32 phase2 = unit->m_phase2;
- float cpstoinc = unit->m_cpstoinc;
- float radtoinc = unit->m_radtoinc;
- int32 iphasemod = unit->m_iphasemod;
-
- float next_iphasemod = radtoinc * phasemod;
- int32 iphasemod_slope = (next_iphasemod - iphasemod) * unit->mRate->mSlopeFactor;
- int32 end_iphasemod = iphasemod + iphasemod_slope * inNumSamples;
- float pmindex = unit->m_pmindex;
- float pmindex_slope = (next_pmindex - pmindex) * unit->mRate->mSlopeFactor;
-
- int32 carfreq = (int32)(cpstoinc * carfreqin);
- int32 modfreq = (int32)(cpstoinc * modfreqin) + iphasemod_slope;
-
- if (pmindex_slope != 0.) {
- LOOP(inNumSamples,
- /* calculate modulator */
- float pmout = *(float*)((char*)pmsine + ((phase1 >> xlobits) & xlomask13)) * pmindex;
- phase1 += modfreq;
- /* calculate carrier */
- *++out = *(float*)((char*)sine + (((phase2 + (int32)pmout) >> xlobits) & xlomask13));
- phase2 += carfreq;
- pmindex += pmindex_slope;
- );
- } else {
- LOOP(inNumSamples,
- /* calculate modulator */
- float pmout = *(float*)((char*)pmsine + ((phase1 >> xlobits) & xlomask13)) * pmindex;
- phase1 += modfreq;
- /* calculate carrier */
- *++out = *(float*)((char*)sine + (((phase2 + (int32)pmout) >> xlobits) & xlomask13));
- phase2 += carfreq;
- );
- }
- unit->m_phase1 = phase1;
- unit->m_phase2 = phase2;
- unit->m_iphasemod = end_iphasemod;
- unit->m_pmindex = pmindex;
-
-}
-#endif
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
void COsc_Ctor(COsc *unit)
{
unit->m_fbufnum = -1e9f;
@@ -2180,330 +2063,6 @@

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

-
-#if 0
-void COsc2_Ctor(COsc2 *unit)
-{
- SETCALC(COsc2_next);
- unit->m_cpstoinc = unit->mTableSize * SAMPLEDUR * 65536.;
- unit->m_phase1 = 0;
- unit->m_phase2 = 0;
- COsc2_next(unit, 1);
-}
-
-
-void COsc2_SetTables(COsc2 *unit, int32 inSize, float* inTableA, float* inTableB)
-{
- unit->mTable0 = inTableA;
- unit->mTable1 = inTableA + 1;
- unit->mTable2 = inTableB;
- unit->mTable3 = inTableB + 1;
- unit->mTableSize = inSize;
- unit->m_cpstoinc = inSize * SAMPLEDUR * 65536.;
- unit->m_lomask = (inSize - 1) << 3;
-}
-
-
-void COsc2_next(COsc2 *unit, int inNumSamples)
-{
- // get table
- GET_TABLE
- int size = buf->samples;
- int tableSize2 = size >> 1;
- float *table0 = bufData;
- float *table1 = table0 + 1;
- float *table2 = table0 + size2;
- float *table3 = table2 + 1;
- if (tableSize != unit->mTableSize) {
- unit->mTableSize = tableSize;
- unit->m_lomask = (tableSize2 - 1) << 3; // Osc, OscN, COsc, COsc, COsc2, OscX4, OscX2
- // SigOsc, Osc, OscN, PMOsc, COsc, COsc2, OscX4, OscX2
- unit->m_cpstoinc = tableSize2 * SAMPLEDUR * 65536.;
- }
-
- float *out = ZOUT(0);
- float freqin = ZIN0(0);
- float beats = ZIN0(1);
-
- float *table0 = unit->mTable0;
- float *table1 = unit->mTable1;
- float *table2 = unit->mTable2;
- float *table3 = unit->mTable3;
- int32 phase1 = unit->m_phase1;
- int32 phase2 = unit->m_phase2;
- int32 lomask = unit->m_lomask;
-
- int32 cfreq = (int32)(unit->m_cpstoinc * freqin);
- int32 beatf = (int32)(unit->m_cpstoinc * beats);
- int32 freq1 = cfreq + beatf;
- int32 freq2 = cfreq - beatf;
- LOOP(inNumSamples,
- float a = lookupi1(table0, table1, phase1, lomask);
- float b = lookupi1(table2, table3, phase2, lomask);
- ZXP(out) = a + b;
- phase1 += freq1;
- phase2 += freq2;
- );
- unit->m_phase1 = phase1;
- unit->m_phase2 = phase2;
-
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-void OscX4_Ctor(OscX4 *unit)
-{
- SETCALC(OscX4_next);
- unit->m_cpstoinc = unit->mTableSize * SAMPLEDUR * 65536.;
- unit->m_xpos = ZIN0(1) * 0.5 + 0.5;
- unit->m_ypos = ZIN0(2) * 0.5 + 0.5;
- unit->m_phase = 0;
- OscX4_next(unit, 1);
-}
-
-void OscX4_SetTables(OscX4 *unit, int32 inSize, float* inTableA, float* inTableB,
- float* inTableC, float* inTableD)
-{
- unit->mTableSize = inSize;
- unit->mTables[0] = inTableA;
- unit->mTables[1] = inTableA + 1;
- unit->mTables[2] = inTableB;
- unit->mTables[3] = inTableB + 1;
- unit->mTables[4] = inTableC;
- unit->mTables[5] = inTableC + 1;
- unit->mTables[6] = inTableD;
- unit->mTables[7] = inTableD + 1;
- unit->m_cpstoinc = inSize * SAMPLEDUR * 65536.;
- unit->m_lomask = (inSize - 1) << 3;
-}
-
-void OscX4_next(OscX4 *unit, int inNumSamples)
-{
- float *out = ZOUT(0);
- float freqin = ZIN0(0);
- float next_xpos = ZIN0(1) * 0.5 + 0.5;
- float next_ypos = ZIN0(2) * 0.5 + 0.5;
-
- float xpos = unit->m_xpos;
- float ypos = unit->m_ypos;
- float val1, val2;
-
- float **tables = unit->mTables;
- int32 phase = unit->m_phase;
- int32 lomask = unit->m_lomask;
-
- int32 freq = (int32)(unit->m_cpstoinc * freqin);
- float xpos_slope = CALCSLOPE(next_xpos, xpos);
- float ypos_slope = CALCSLOPE(next_ypos, ypos);
- LOOP(inNumSamples,
- float pfrac = PhaseFrac1(phase);
- int32 index = (phase >> xlobits1) & lomask;
- val1 = *(float*)((char*)tables[0] + index);
- val2 = *(float*)((char*)tables[1] + index);
- float out0 = val1 + val2 * pfrac;
- val1 = *(float*)((char*)tables[2] + index);
- val2 = *(float*)((char*)tables[3] + index);
- float out1 = val1 + val2 * pfrac;
- val1 = *(float*)((char*)tables[4] + index);
- val2 = *(float*)((char*)tables[5] + index);
- float out2 = val1 + val2 * pfrac;
- val1 = *(float*)((char*)tables[6] + index);
- val2 = *(float*)((char*)tables[7] + index);
- float out3 = val1 + val2 * pfrac;
-
- float out8 = lininterp(xpos, out0, out1);
- float out9 = lininterp(xpos, out2, out3);
- ZXP(out) = lininterp(ypos, out9, out8);
-
- phase += freq;
- xpos += xpos_slope;
- ypos += ypos_slope;
- );
- unit->m_xpos = xpos;
- unit->m_ypos = ypos;
- unit->m_phase = phase;
-
-}
-
-void OscX4_nextB(OscX4 *unit, int inNumSamples);
-void OscX4_nextB(OscX4 *unit, int inNumSamples)
-{
- float *out = ZOUT(0);
- float freqin = ZIN0(0);
- float next_xpos = ZIN0(1) * 0.5 + 0.5;
- float next_ypos = ZIN0(2) * 0.5 + 0.5;
-
- float xpos = unit->m_xpos;
- float ypos = unit->m_ypos;
- float val1, val2;
-
- float **tables = unit->mTables;
- int32 phase = unit->m_phase;
- int32 lomask = unit->m_lomask;
-
- int32 freq = (int32)(unit->m_cpstoinc * freqin);
- float xpos_slope = CALCSLOPE(next_xpos, xpos);
- float ypos_slope = CALCSLOPE(next_ypos, ypos);
- LOOP(inNumSamples,
- float pfrac = PhaseFrac1(phase);
- int32 index = (phase >> xlobits) & lomask;
- val1 = tables[0][index];
- val2 = tables[1][index];
- float out0 = val1 + val2 * pfrac;
- val1 = tables[2][index];
- val2 = tables[3][index];
- float out1 = val1 + val2 * pfrac;
- val1 = tables[4][index];
- val2 = tables[5][index];
- float out2 = val1 + val2 * pfrac;
- val1 = tables[6][index];
- val2 = tables[7][index];
- float out3 = val1 + val2 * pfrac;
-
- float out8 = lininterp(xpos, out0, out1);
- float out9 = lininterp(xpos, out2, out3);
- ZXP(out) = lininterp(ypos, out9, out8);
-
- phase += freq;
- xpos += xpos_slope;
- ypos += ypos_slope;
- );
- unit->m_xpos = xpos;
- unit->m_ypos = ypos;
- unit->m_phase = phase;
-
-}
-
-void OscX4_nextC(OscX4 *unit, int inNumSamples);
-void OscX4_nextC(OscX4 *unit, int inNumSamples)
-{
- float *out = ZOUT(0);
- float freqin = ZIN0(0);
- float next_xpos = ZIN0(1) * 0.5 + 0.5;
- float next_ypos = ZIN0(2) * 0.5 + 0.5;
-
- float xpos = unit->m_xpos;
- float ypos = unit->m_ypos;
- float val1, val2;
-
- float **tables = unit->mTables;
- int32 phase = unit->m_phase;
- int32 lomask = unit->m_lomask;
-
- int32 freq = (int32)(unit->m_cpstoinc * freqin);
- float xpos_slope = CALCSLOPE(next_xpos, xpos);
- float ypos_slope = CALCSLOPE(next_ypos, ypos);
- LOOP(inNumSamples,
- float pfrac = PhaseFrac(phase);
- int32 index = (phase >> xlobits) & lomask;
- val1 = tables[0][index];
- val2 = tables[1][index];
- float out0 = val1 + val2 * pfrac;
- val1 = tables[2][index];
- val2 = tables[3][index];
- float out1 = val1 + val2 * pfrac;
- val1 = tables[4][index];
- val2 = tables[5][index];
- float out2 = val1 + val2 * pfrac;
- val1 = tables[6][index];
- val2 = tables[7][index];
- float out3 = val1 + val2 * pfrac;
-
- float out8 = lininterp(xpos, out0, out1);
- float out9 = lininterp(xpos, out2, out3);
- ZXP(out) = lininterp(ypos, out9, out8);
-
- phase += freq;
- xpos += xpos_slope;
- ypos += ypos_slope;
- );
- unit->m_xpos = xpos;
- unit->m_ypos = ypos;
- unit->m_phase = phase;
-
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-void OscX2_Ctor(OscX2 *unit)
-{
- SETCALC(OscX2_next);
- unit->m_cpstoinc = unit->mTableSize * SAMPLEDUR * 65536.;
- unit->m_phase = 0;
- unit->m_counter = 0;
- OscX2_next(unit, 1);
-}
-
-void OscX2_SetTables(OscX2 *unit, int32 inSize, float* inTableA, float* inTableB)
-{
- unit->mTableSize = inSize;
- unit->mTables[0] = inTableA;
- unit->mTables[1] = inTableA + 1;
- unit->mTables[2] = inTableB;
- unit->mTables[3] = inTableB + 1;
- unit->m_cpstoinc = inSize * SAMPLEDUR * 65536.;
-}
-
-
-void OscX2_next(OscX2 *unit, int inNumSamples)
-{
- float *out = ZOUT(0);
- float freqin = ZIN0(0);
- float val1, val2;
-
- float **tables = unit->mTables;
- int32 phase = unit->m_phase;
- int32 lomask = unit->m_lomask;
-
- int32 freq = (int32)(unit->m_cpstoinc * freqin);
- int32 counter = unit->m_counter;
- float xfade = unit->m_xfade;
-
- int remain = inNumSamples;
- while (remain) {
- if (counter <= 0) {
- /*if (unit->m_newTableFunc) {
- (*unit->m_newTableFunc)(this);
- counter = unit->m_counter;
- } else {
- counter = remain;
- }*/
- xfade = 0.;
- }
- float xfadeslope = unit->m_xfadeslope;
- int nsmps = sc_min(remain, counter);
- LOOP(nsmps,
- float pfrac = PhaseFrac1(phase);
- int32 index = (phase >> xlobits1) & lomask;
- val1 = *(float*)((char*)tables[0] + index);
- val2 = *(float*)((char*)tables[1] + index);
- float out0 = val1 + val2 * pfrac;
- val1 = *(float*)((char*)tables[2] + index);
- val2 = *(float*)((char*)tables[3] + index);
- float out1 = val1 + val2 * pfrac;
-
- ZXP(out) = lininterp(xfade, out0, out1);
-
- phase += freq;
- xfade += xfadeslope;
- );
- counter -= nsmps;
- remain -= nsmps;
- }
- unit->m_counter = counter;
- unit->m_phase = phase;
- unit->m_xfade = xfade;
-
-}
-#endif
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-
void VOsc_Ctor(VOsc *unit)
{
SETCALC(VOsc_next_ik);
@@ -3879,216 +3438,6 @@
unit->m_x2 = x2;
}

-
-#if __VEC__
-
-#if 0
-void vKlank_next(Klank *unit, int inNumSamples)
-{
- float *out0 = ZOUT(0);
- float *in0 = ZIN(0);
-
- float *in, *out;
- float inf;
- vector float vy0, vy1, vy2, va0, vb1, vb2;
- float y0_0, y1_0, y2_0, a0_0, b1_0, b2_0;
- float y0_1, y1_1, y2_1, a0_1, b1_1, b2_1;
- float y0_2, y1_2, y2_2, a0_2, b1_2, b2_2;
- float y0_3, y1_3, y2_3, a0_3, b1_3, b2_3;
-
- int32 numpartials = unit->m_numpartials;
- float* coefs = unit->m_coefs - 1;
-
- switch (numpartials & 3) {
- case 3 :
- y1_0 = *++coefs; y2_0 = *++coefs; b1_0 = *++coefs; b2_0 = *++coefs; a0_0 = *++coefs;
- y1_1 = *++coefs; y2_1 = *++coefs; b1_1 = *++coefs; b2_1 = *++coefs; a0_1 = *++coefs;
- y1_2 = *++coefs; y2_2 = *++coefs; b1_2 = *++coefs; b2_2 = *++coefs; a0_2 = *++coefs;
-
- in = in0;
- out = unit->m_buf - 1;
- LOOP(unit->mRate->mFilterLoops,
- inf = *++in;
- y0_0 = inf + b1_0 * y1_0 + b2_0 * y2_0;
- y0_1 = inf + b1_1 * y1_1 + b2_1 * y2_1;
- y0_2 = inf + b1_2 * y1_2 + b2_2 * y2_2;
- *++out = a0_0 * y0_0 + a0_1 * y0_1 + a0_2 * y0_2;
-
- inf = *++in;
- y2_0 = inf + b1_0 * y0_0 + b2_0 * y1_0;
- y2_1 = inf + b1_1 * y0_1 + b2_1 * y1_1;
- y2_2 = inf + b1_2 * y0_2 + b2_2 * y1_2;
- *++out = a0_0 * y2_0 + a0_1 * y2_1 + a0_2 * y2_2;
-
- inf = *++in;
- y1_0 = inf + b1_0 * y2_0 + b2_0 * y0_0;
- y1_1 = inf + b1_1 * y2_1 + b2_1 * y0_1;
- y1_2 = inf + b1_2 * y2_2 + b2_2 * y0_2;
- *++out = a0_0 * y1_0 + a0_1 * y1_1 + a0_2 * y1_2;
- );
- LOOP(unit->mRate->mFilterRemain,
- inf = *++in;
- y0_0 = inf + b1_0 * y1_0 + b2_0 * y2_0;
- y0_1 = inf + b1_1 * y1_1 + b2_1 * y2_1;
- y0_2 = inf + b1_2 * y1_2 + b2_2 * y2_2;
- *++out = a0_0 * y0_0 + a0_1 * y0_1 + a0_2 * y0_2;
- y2_0 = y1_0; y1_0 = y0_0;
- y2_1 = y1_1; y1_1 = y0_1;
- y2_2 = y1_2; y1_2 = y0_2;
- );
- coefs -= 15;
- *++coefs = y1_0; *++coefs = y2_0; coefs += 3;
- *++coefs = y1_1; *++coefs = y2_1; coefs += 3;
- *++coefs = y1_2; *++coefs = y2_2; coefs += 3;
- break;
- case 2 :
- y1_0 = *++coefs; y2_0 = *++coefs; b1_0 = *++coefs; b2_0 = *++coefs; a0_0 = *++coefs;
- y1_1 = *++coefs; y2_1 = *++coefs; b1_1 = *++coefs; b2_1 = *++coefs; a0_1 = *++coefs;
-
- in = in0;
- out = unit->m_buf - 1;
- LOOP(unit->mRate->mFilterLoops,
- inf = *++in;
- y0_0 = inf + b1_0 * y1_0 + b2_0 * y2_0;
- y0_1 = inf + b1_1 * y1_1 + b2_1 * y2_1;
- *++out = a0_0 * y0_0 + a0_1 * y0_1;
-
- inf = *++in;
- y2_0 = inf + b1_0 * y0_0 + b2_0 * y1_0;
- y2_1 = inf + b1_1 * y0_1 + b2_1 * y1_1;
- *++out = a0_0 * y2_0 + a0_1 * y2_1;
-
- inf = *++in;
- y1_0 = inf + b1_0 * y2_0 + b2_0 * y0_0;
- y1_1 = inf + b1_1 * y2_1 + b2_1 * y0_1;
- *++out = a0_0 * y1_0 + a0_1 * y1_1;
- );
- LOOP(unit->mRate->mFilterRemain,
- inf = *++in;
- y0_0 = inf + b1_0 * y1_0 + b2_0 * y2_0;
- y0_1 = inf + b1_1 * y1_1 + b2_1 * y2_1;
- *++out = a0_0 * y0_0 + a0_1 * y0_1;
- y2_0 = y1_0; y1_0 = y0_0;
- y2_1 = y1_1; y1_1 = y0_1;
- );
- coefs -= 10;
- *++coefs = y1_0; *++coefs = y2_0; coefs += 3;
- *++coefs = y1_1; *++coefs = y2_1; coefs += 3;
- break;
- case 1 :
- y1_0 = *++coefs; y2_0 = *++coefs; b1_0 = *++coefs; b2_0 = *++coefs; a0_0 = *++coefs;
-
- //Print("rcoefs %g %g %g %g %g\n", y1_0, y2_0, b1_0, b2_0, a0_0);
- in = in0;
- out = unit->m_buf - 1;
- LOOP(unit->mRate->mFilterLoops,
- inf = *++in;
- y0_0 = inf + b1_0 * y1_0 + b2_0 * y2_0;
- *++out = a0_0 * y0_0;
-
- inf = *++in;
- y2_0 = inf + b1_0 * y0_0 + b2_0 * y1_0;
- *++out = a0_0 * y2_0;
-
- inf = *++in;
- y1_0 = inf + b1_0 * y2_0 + b2_0 * y0_0;
- *++out = a0_0 * y1_0;
- //Print("out %g %g %g\n", y0_0, y2_0, y1_0);
- );
- LOOP(unit->mRate->mFilterRemain,
- inf = *++in;
- y0_0 = inf + b1_0 * y1_0 + b2_0 * y2_0;
- *++out = a0_0 * y0_0;
- y2_0 = y1_0; y1_0 = y0_0;
- //Print("out %g\n", y0_0);
- );
- coefs -= 5;
- *++coefs = y1_0; *++coefs = y2_0; coefs += 3;
- break;
- case 0 :
- out = unit->m_buf - 1;
- LOOP(inNumSamples, *++out = 0.f;);
- break;
- }
-
- int32 imax = numpartials >> 2;
- for (int i=0; i<imax; ++i) {
- y1_0 = *++coefs; y2_0 = *++coefs; b1_0 = *++coefs; b2_0 = *++coefs; a0_0 = *++coefs;
- y1_1 = *++coefs; y2_1 = *++coefs; b1_1 = *++coefs; b2_1 = *++coefs; a0_1 = *++coefs;
- y1_2 = *++coefs; y2_2 = *++coefs; b1_2 = *++coefs; b2_2 = *++coefs; a0_2 = *++coefs;
- y1_3 = *++coefs; y2_3 = *++coefs; b1_3 = *++coefs; b2_3 = *++coefs; a0_3 = *++coefs;
-
- in = in0;
- out = unit->m_buf - 1;
- LOOP(unit->mRate->mFilterLoops,
- inf = *++in;
- y0_0 = inf + b1_0 * y1_0 + b2_0 * y2_0;
- y0_1 = inf + b1_1 * y1_1 + b2_1 * y2_1;
- y0_2 = inf + b1_2 * y1_2 + b2_2 * y2_2;
- y0_3 = inf + b1_3 * y1_3 + b2_3 * y2_3;
- *++out += a0_0 * y0_0 + a0_1 * y0_1 + a0_2 * y0_2 + a0_3 * y0_3;
-
- inf = *++in;
- y2_0 = inf + b1_0 * y0_0 + b2_0 * y1_0;
- y2_1 = inf + b1_1 * y0_1 + b2_1 * y1_1;
- y2_2 = inf + b1_2 * y0_2 + b2_2 * y1_2;
- y2_3 = inf + b1_3 * y0_3 + b2_3 * y1_3;
- *++out += a0_0 * y2_0 + a0_1 * y2_1 + a0_2 * y2_2 + a0_3 * y2_3;
-
- inf = *++in;
- y1_0 = inf + b1_0 * y2_0 + b2_0 * y0_0;
- y1_1 = inf + b1_1 * y2_1 + b2_1 * y0_1;
- y1_2 = inf + b1_2 * y2_2 + b2_2 * y0_2;
- y1_3 = inf + b1_3 * y2_3 + b2_3 * y0_3;
- *++out += a0_0 * y1_0 + a0_1 * y1_1 + a0_2 * y1_2 + a0_3 * y1_3;
- );
- LOOP(unit->mRate->mFilterRemain,
- inf = *++in;
- y0_0 = inf + b1_0 * y1_0 + b2_0 * y2_0;
- y0_1 = inf + b1_1 * y1_1 + b2_1 * y2_1;
- y0_2 = inf + b1_2 * y1_2 + b2_2 * y2_2;
- y0_3 = inf + b1_3 * y1_3 + b2_3 * y2_3;
- *++out += a0_0 * y0_0 + a0_1 * y0_1 + a0_2 * y0_2 + a0_3 * y0_3;
- y2_0 = y1_0; y1_0 = y0_0;
- y2_1 = y1_1; y1_1 = y0_1;
- y2_2 = y1_2; y1_2 = y0_2;
- y2_3 = y1_3; y1_3 = y0_3;
- );
- coefs -= 20;
- *++coefs = y1_0; *++coefs = y2_0; coefs += 3;
- *++coefs = y1_1; *++coefs = y2_1; coefs += 3;
- *++coefs = y1_2; *++coefs = y2_2; coefs += 3;
- *++coefs = y1_3; *++coefs = y2_3; coefs += 3;
- }
-
- float x0;
- float x1 = unit->m_x1;
- float x2 = unit->m_x2;
-
- in = unit->m_buf - 1;
- out = out0;
- LOOP(unit->mRate->mFilterLoops,
- x0 = *++in;
- *++out = x0 - x2;
- x2 = *++in;
- *++out = x2 - x1;
- x1 = *++in;
- *++out = x1 - x0;
- );
- LOOP(unit->mRate->mFilterRemain,
- x0 = *++in;
- *++out = x0 - x2;
- x2 = x1;
- x1 = x0;
- );
-
- unit->m_x1 = x1;
- unit->m_x2 = x2;
-}
-#endif
-
-#endif
-
////////////////////////////////////////////////////////////////////////////////////////////////////////

void normalize_samples(int size, float* data, float peak)
@@ -4414,9 +3763,6 @@
DefineSimpleUnit(Osc);
DefineSimpleUnit(OscN);
DefineSimpleUnit(COsc);
- //DefineSimpleUnit(COsc2);
- //DefineSimpleUnit(OscX4);
- //DefineSimpleUnit(OscX2);
DefineSimpleUnit(Formant);
DefineSimpleUnit(Blip);
DefineSimpleUnit(Saw);

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

_______________________________________________
sc-dev mailing list

info (subscribe and unsubscribe): 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/

Re: [sc-users] EnvGen.ar Trigger

2008-10-08T01:02:07Z

Hi devs -

I get the same strange behaviour as reported below.

In the SinOsc example, the server doesn't actually crash, instead it
locks up and goes into CPU overdrive. Using Shark I see that this
overdrive seems to be happening inside EnvGen_next_aa(), and more
specifically, inside a call to its CHECK_GATE macro (line 2592 in the
source-code).

Anyone any insight into this? I've not worked with the EnvGen code so
I can't be sure.

Dan

2008/10/7, J. van Dijk <jorn@...>:

>
> Hello list,
>
> I was playing around with triggers for an EnvGen:
>
> {
> var env, trig;
> trig = LFSaw.kr(1);
> env = EnvGen.kr(Env.perc(0.01,0.1), trig);
> Out.ar(0, env*PinkNoise.ar(0.1))
> }.play
>
> Doing this with .ar methods gives me different results:
>
> {
> var env, trig;
> trig = LFSaw.ar(1);
> env = EnvGen.ar(Env.perc(0.01,0.1), trig);
> Out.ar(0, env*PinkNoise.ar(0.1))
> }.play
>
> The next example stops after 4 triggers. It quits the server, it won't
> reboot and I have to force quit SuperCollider to get any sound playing back
> from other apps.
> {
> var env, trig;
> trig = SinOsc.ar(1);
> env = EnvGen.ar(Env.perc(0.01,0.1), trig);
> Out.ar(0, env*PinkNoise.ar(0.1))
> }.play
>
> Does EnvGen.ar only allow impulse like triggers?
>
> I'm on a g4 powerbook
> osx 10.4.11
>
> Jorn
>
> --
> View this message in context: http://www.nabble.com/EnvGen.ar-Trigger-tp19868606p19868606.html
> Sent from the Supercollider - User mailing list archive at Nabble.com.
>
>
> _______________________________________________
> sc-users mailing list
>
> info (subscribe and unsubscribe): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
> archive: http://www.listarc.bham.ac.uk/marchives/sc-users/
> search: http://www.listarc.bham.ac.uk/lists/sc-users/search/
>