From d6bec0bb287e25b2c3c59beb864a04f49f285b04 Mon Sep 17 00:00:00 2001 From: Ted Moore Date: Thu, 16 Dec 2021 05:11:51 +0000 Subject: [PATCH] don't show rms color and allow passing waveformcolor none of this is breaking (i think) --- release-packaging/Classes/FluidWaveform.sc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/release-packaging/Classes/FluidWaveform.sc b/release-packaging/Classes/FluidWaveform.sc index 2c9aa84..3b174d7 100644 --- a/release-packaging/Classes/FluidWaveform.sc +++ b/release-packaging/Classes/FluidWaveform.sc @@ -15,16 +15,18 @@ FluidViewer { FluidWaveform : FluidViewer { *new { - arg audio_buf, slices_buf, feature_buf, bounds, lineWidth = 1; - ^super.new.init(audio_buf,slices_buf, feature_buf, bounds, lineWidth); + arg audio_buf, slices_buf, feature_buf, bounds, lineWidth = 1, waveformColor; + ^super.new.init(audio_buf,slices_buf, feature_buf, bounds, lineWidth, waveformColor); } init { - arg audio_buf, slices_buf, feature_buf, bounds, lineWidth; + arg audio_buf, slices_buf, feature_buf, bounds, lineWidth, waveformColor; Task{ var path = "%%_%_FluidWaveform.wav".format(PathName.tmp,Date.localtime.stamp,UniqueID.next); var sfv, win, categoryCounter = 0; + waveformColor = waveformColor ? Color(*0.5.dup(3)); + this.createCatColors; bounds = bounds ? Rect(0,0,800,200); @@ -34,8 +36,9 @@ FluidWaveform : FluidViewer { audio_buf.server.sync; sfv = SoundFileView(win,Rect(0,0,bounds.width,bounds.height)); - sfv.peakColor_(Color(*0.75.dup(3))); - sfv.rmsColor_(Color.black); + sfv.peakColor_(waveformColor); + // sfv.rmsColor_(Color.black); + sfv.rmsColor_(Color.clear); sfv.background_(Color.white); sfv.readFile(SoundFile(path)); sfv.gridOn_(false);