diff --git a/lib/wellen.jar b/lib/wellen.jar index 3fd9e9b..cf13717 100644 Binary files a/lib/wellen.jar and b/lib/wellen.jar differ diff --git a/processing-library/wellen/examples/DSP/ExampleDSP07Sampler/ExampleDSP07Sampler.pde b/processing-library/wellen/examples/DSP/ExampleDSP07Sampler/ExampleDSP07Sampler.pde index bb7fa7c..6f5792a 100644 --- a/processing-library/wellen/examples/DSP/ExampleDSP07Sampler/ExampleDSP07Sampler.pde +++ b/processing-library/wellen/examples/DSP/ExampleDSP07Sampler/ExampleDSP07Sampler.pde @@ -11,6 +11,15 @@ import wellen.dsp.*; * * note that samples can either be played once or looped. if a sample is played once it must be rewound before it * can be played again. also note that a sample buffer can be cropped with `set_in()` + `set_out()`. + * + * samples can be loaded from external sources as *raw* bytes with `loadBytes(byte[])`. the raw format needs to be in + * the 32bit IEEE float format and only contain a single channel ( i.e mono ). tools like + * [Audacity](https://www.audacityteam.org) or [FFmpeg](https://ffmpeg.org) can be used to generate it. e.g the latter + * can be used to convert sound file to *raw* bytes with the following command where `INPUT_FILE`, `OUTPUT_FILE` and + * `$OUTPUT_SAMPLE_RATE` need to be adjusted: + * + * `ffmpeg -i $INPUT_FILE -f f32le -acodec pcm_f32le -ac 1 -ar $OUTPUT_SAMPLE_RATE "$OUTPUT_FILE.raw"` + * */ Sampler fSampler; void settings() { diff --git a/processing-library/wellen/examples/technique/TechniqueBasics09ModTracker/TechniqueBasics09ModTracker.pde b/processing-library/wellen/examples/technique/TechniqueBasics09ModTracker/TechniqueBasics09ModTracker.pde index 4ad247b..c1118e8 100644 --- a/processing-library/wellen/examples/technique/TechniqueBasics09ModTracker/TechniqueBasics09ModTracker.pde +++ b/processing-library/wellen/examples/technique/TechniqueBasics09ModTracker/TechniqueBasics09ModTracker.pde @@ -41,8 +41,8 @@ void addMasterEffects() { if (mToneEngine == null) { return; } - RRStompBox mDistortion = new RRStompBox(); - mDistortion.setpreset(RRStompBox.PRESET_ODIE); + wellen.extra.rakarrack.RRStompBox mDistortion = new wellen.extra.rakarrack.RRStompBox(); + mDistortion.setpreset(wellen.extra.rakarrack.RRStompBox.PRESET_ODIE); mToneEngine.add_effect(mDistortion); Reverb mReverb = new Reverb(); mToneEngine.add_effect(mReverb); diff --git a/processing-library/wellen/library/wellen.jar b/processing-library/wellen/library/wellen.jar index 3fd9e9b..cf13717 100644 Binary files a/processing-library/wellen/library/wellen.jar and b/processing-library/wellen/library/wellen.jar differ diff --git a/processing-library/wellen/resources/teilchen.raw b/processing-library/wellen/resources/teilchen.raw index b0aabcc..4ccb022 100644 Binary files a/processing-library/wellen/resources/teilchen.raw and b/processing-library/wellen/resources/teilchen.raw differ diff --git a/processing-library/wellen/src/wellen/examples/DSP/ExampleDSP07Sampler.java b/processing-library/wellen/src/wellen/examples/DSP/ExampleDSP07Sampler.java index 9a3deb1..be7ed06 100644 --- a/processing-library/wellen/src/wellen/examples/DSP/ExampleDSP07Sampler.java +++ b/processing-library/wellen/src/wellen/examples/DSP/ExampleDSP07Sampler.java @@ -19,12 +19,13 @@ public class ExampleDSP07Sampler extends PApplet { * can be played again. also note that a sample buffer can be cropped with `set_in()` + `set_out()`. * * samples can be loaded from external sources as *raw* bytes with `loadBytes(byte[])`. the raw format needs to be in - * the 32bit IEEE float format and only contain a single channel ( i.e mono ). tools like + * the 32bit IEEE float format and only contain a single channel ( i.e mono ). tools like * [Audacity](https://www.audacityteam.org) or [FFmpeg](https://ffmpeg.org) can be used to generate it. e.g the latter * can be used to convert sound file to *raw* bytes with the following command where `INPUT_FILE`, `OUTPUT_FILE` and - * `OUTPUT_SAMPLLE_RATE` need to be adjusted: - * - * `ffmpeg -i $INPUT_FILE -f f32le -acodec pcm_f32le -ac 1 -ar $OUTPUT_SAMPLLE_RATE "$OUTPUT_FILE.raw"` + * `$OUTPUT_SAMPLE_RATE` need to be adjusted: + * + * `ffmpeg -i $INPUT_FILE -f f32le -acodec pcm_f32le -ac 1 -ar $OUTPUT_SAMPLE_RATE "$OUTPUT_FILE.raw"` + * */ private Sampler fSampler; diff --git a/processing-library/wellen/src/wellen/examples/technique/TechniqueBasics09ModTracker.java b/processing-library/wellen/src/wellen/examples/technique/TechniqueBasics09ModTracker.java index 69ee5e3..b017fb7 100644 --- a/processing-library/wellen/src/wellen/examples/technique/TechniqueBasics09ModTracker.java +++ b/processing-library/wellen/src/wellen/examples/technique/TechniqueBasics09ModTracker.java @@ -7,7 +7,6 @@ import wellen.ToneEngineDSP; import wellen.dsp.Gain; import wellen.dsp.Reverb; -import wellen.extra.rakarrack.RRStompBox; public class TechniqueBasics09ModTracker extends PApplet { @@ -62,8 +61,8 @@ private void addMasterEffects() { return; } - RRStompBox mDistortion = new RRStompBox(); - mDistortion.setpreset(RRStompBox.PRESET_ODIE); + wellen.extra.rakarrack.RRStompBox mDistortion = new wellen.extra.rakarrack.RRStompBox(); + mDistortion.setpreset(wellen.extra.rakarrack.RRStompBox.PRESET_ODIE); mToneEngine.add_effect(mDistortion); Reverb mReverb = new Reverb(); diff --git a/src/wellen/examples/DSP/ExampleDSP07Sampler.java b/src/wellen/examples/DSP/ExampleDSP07Sampler.java index f24ef35..be7ed06 100644 --- a/src/wellen/examples/DSP/ExampleDSP07Sampler.java +++ b/src/wellen/examples/DSP/ExampleDSP07Sampler.java @@ -17,6 +17,15 @@ public class ExampleDSP07Sampler extends PApplet { * * note that samples can either be played once or looped. if a sample is played once it must be rewound before it * can be played again. also note that a sample buffer can be cropped with `set_in()` + `set_out()`. + * + * samples can be loaded from external sources as *raw* bytes with `loadBytes(byte[])`. the raw format needs to be in + * the 32bit IEEE float format and only contain a single channel ( i.e mono ). tools like + * [Audacity](https://www.audacityteam.org) or [FFmpeg](https://ffmpeg.org) can be used to generate it. e.g the latter + * can be used to convert sound file to *raw* bytes with the following command where `INPUT_FILE`, `OUTPUT_FILE` and + * `$OUTPUT_SAMPLE_RATE` need to be adjusted: + * + * `ffmpeg -i $INPUT_FILE -f f32le -acodec pcm_f32le -ac 1 -ar $OUTPUT_SAMPLE_RATE "$OUTPUT_FILE.raw"` + * */ private Sampler fSampler; diff --git a/src/wellen/examples/technique/TechniqueBasics09ModTracker.java b/src/wellen/examples/technique/TechniqueBasics09ModTracker.java index 69ee5e3..b017fb7 100644 --- a/src/wellen/examples/technique/TechniqueBasics09ModTracker.java +++ b/src/wellen/examples/technique/TechniqueBasics09ModTracker.java @@ -7,7 +7,6 @@ import wellen.ToneEngineDSP; import wellen.dsp.Gain; import wellen.dsp.Reverb; -import wellen.extra.rakarrack.RRStompBox; public class TechniqueBasics09ModTracker extends PApplet { @@ -62,8 +61,8 @@ private void addMasterEffects() { return; } - RRStompBox mDistortion = new RRStompBox(); - mDistortion.setpreset(RRStompBox.PRESET_ODIE); + wellen.extra.rakarrack.RRStompBox mDistortion = new wellen.extra.rakarrack.RRStompBox(); + mDistortion.setpreset(wellen.extra.rakarrack.RRStompBox.PRESET_ODIE); mToneEngine.add_effect(mDistortion); Reverb mReverb = new Reverb(); diff --git a/wellen.zip b/wellen.zip index 57d06b8..07d2bfa 100644 Binary files a/wellen.zip and b/wellen.zip differ