Add histogram to visualizers example.

exa04 · May 31, 2024 · 0f24eea · 0f24eea
1 parent 83568f0
commit 0f24eea
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/examples/visualizers/src/editor.rs b/examples/visualizers/src/editor.rs
@@ -1,6 +1,6 @@
 use cyma::prelude::*;
 use cyma::{
-    utils::{PeakBuffer, RingBuffer, SpectrumOutput, WaveformBuffer},
+    utils::{HistogramBuffer, PeakBuffer, RingBuffer, SpectrumOutput, WaveformBuffer},
     visualizers::{
         Graph, Grid, Lissajous, LissajousGrid, Meter, Oscilloscope, SpectrumAnalyzer,
         SpectrumAnalyzerModifiers, SpectrumAnalyzerVariant, UnitRuler, Waveform,
@@ -14,6 +14,7 @@ use std::sync::{Arc, Mutex};
 pub(crate) struct Data {
     pub(crate) oscilloscope_buffer: Arc<Mutex<WaveformBuffer>>,
     pub(crate) peak_buffer: Arc<Mutex<PeakBuffer>>,
+    pub(crate) histogram_buffer: Arc<Mutex<HistogramBuffer>>,
     pub(crate) lissajous_buffer: Arc<Mutex<RingBuffer<(f32, f32)>>>,
     pub(crate) spectrum: Arc<Mutex<SpectrumOutput>>,
 
@@ -24,13 +25,15 @@ impl Data {
     pub(crate) fn new(
         oscilloscope_buffer: Arc<Mutex<WaveformBuffer>>,
         peak_buffer: Arc<Mutex<PeakBuffer>>,
+        histogram_buffer: Arc<Mutex<HistogramBuffer>>,
         lissajous_buffer: Arc<Mutex<RingBuffer<(f32, f32)>>>,
         spectrum: Arc<Mutex<SpectrumOutput>>,
         waveform: Arc<Mutex<Vec<f32>>>,
     ) -> Self {
         Self {
             oscilloscope_buffer,
             peak_buffer,
+            histogram_buffer,
             lissajous_buffer,
             spectrum,
             waveform,
@@ -190,6 +193,11 @@ fn peak_graph(cx: &mut Context) {
             Graph::new(cx, Data::peak_buffer, (-32.0, 8.0), ValueScaling::Decibels)
                 .color(Color::rgba(255, 255, 255, 160))
                 .background_color(Color::rgba(255, 255, 255, 60));
+
+            Histogram::new(cx, Data::histogram_buffer, (-32.0, 8.0))
+                .color(Color::rgba(120, 120, 255, 160))
+                .background_color(Color::rgba(120, 120, 255, 100))
+                .width(Pixels(120.));
         })
         .background_color(Color::rgb(16, 16, 16));
 

diff --git a/examples/visualizers/src/lib.rs b/examples/visualizers/src/lib.rs
@@ -1,5 +1,7 @@
 use cyma::prelude::*;
-use cyma::utils::{PeakBuffer, RingBuffer, SpectrumInput, SpectrumOutput, WaveformBuffer};
+use cyma::utils::{
+    HistogramBuffer, PeakBuffer, RingBuffer, SpectrumInput, SpectrumOutput, WaveformBuffer,
+};
 use nih_plug::prelude::*;
 use nih_plug_vizia::ViziaState;
 use std::{
@@ -16,6 +18,7 @@ pub struct VisualizersDemo {
     oscilloscope_buffer: Arc<Mutex<WaveformBuffer>>,
     peak_buffer: Arc<Mutex<PeakBuffer>>,
     lissajous_buffer: Arc<Mutex<RingBuffer<(f32, f32)>>>,
+    histogram_buffer: Arc<Mutex<HistogramBuffer>>,
 
     spectrum_input: SpectrumInput,
     spectrum_output: Arc<Mutex<SpectrumOutput>>,
@@ -37,6 +40,7 @@ impl Default for VisualizersDemo {
             params: Arc::new(DemoParams::default()),
             oscilloscope_buffer: Arc::new(Mutex::new(WaveformBuffer::new(800, 5.0))),
             peak_buffer: Arc::new(Mutex::new(PeakBuffer::new(800, 10.0, 50.))),
+            histogram_buffer: Arc::new(Mutex::new(HistogramBuffer::new(512, 1.0))),
             lissajous_buffer: Arc::new(Mutex::new(RingBuffer::new(2048))),
 
             spectrum_input,
@@ -45,7 +49,6 @@ impl Default for VisualizersDemo {
             // This is just some dummy data that doesn't change.
             waveform: Arc::new(Mutex::new(
                 (0..256)
-                    .into_iter()
                     .map(|x| {
                         let x = 2. * PI * x as f32 / 256.;
                         0.6 * (x).sin() + 0.3 * (x * 2.).sin() + 0.1 * (x * 4.).sin()
@@ -98,6 +101,7 @@ impl Plugin for VisualizersDemo {
             editor::Data::new(
                 self.oscilloscope_buffer.clone(),
                 self.peak_buffer.clone(),
+                self.histogram_buffer.clone(),
                 self.lissajous_buffer.clone(),
                 self.spectrum_output.clone(),
                 self.waveform.clone(),
@@ -124,6 +128,12 @@ impl Plugin for VisualizersDemo {
             }
             Err(_) => return false,
         }
+        match self.histogram_buffer.lock() {
+            Ok(mut buffer) => {
+                buffer.set_sample_rate(buffer_config.sample_rate);
+            }
+            Err(_) => return false,
+        }
 
         self.spectrum_input
             .update_sample_rate(buffer_config.sample_rate);
@@ -147,6 +157,10 @@ impl Plugin for VisualizersDemo {
                 .lock()
                 .unwrap()
                 .enqueue_buffer(buffer, None);
+            self.histogram_buffer
+                .lock()
+                .unwrap()
+                .enqueue_buffer(buffer, None);
 
             if buffer.channels() > 1 {
                 for mut sample in buffer.iter_samples() {