cleanup

Author: mherrerarendon

pitch-detector/Cargo.toml

@@ -23,11 +23,7 @@ path = "src/lib.rs"
 
 [features]
 test_utils = ["serde", "serde_json", "float-cmp"]
-plot = ["plotters"]
 
-# [[example]]
-# name = "spectrum_plot"
-# required-features = ["test_utils", "plot"]
 
 [[example]]
 name = "basic_usage"
@@ -42,15 +38,13 @@ itertools = "0.10.3"
 serde_json = {version = "1.0.74", optional = true}
 serde = {version = "1.0.133", features = ["derive"], optional = true}
 peak_finder = {version = "1.0.1"}
-plotters = {version = "0.3.1", optional = true}
 float-cmp = {version = "0.9.0", optional = true}
 ndarray = "0.16.1"
 
 [dev-dependencies]
 float-cmp = "0.9.0"
 serde_json = "1.0.74"
 serde = {version = "1.0.133", features = ["derive"]}
-plotters = "0.3.1"
 criterion = "0.3.5"
 
 [[bench]]

pitch-detector/src/core/test_utils.rs

@@ -31,7 +31,6 @@ pub mod hinted {
     use crate::{
         core::{
             constants::{MAX_FREQ, MIN_FREQ},
-            test_utils::test_signal,
             utils::mixed_wave_signal,
             NoteName,
         },

pitch-detector/src/lib.rs

@@ -90,5 +90,3 @@ pub mod core;
 pub mod note;
 pub mod pitch;
 
-#[cfg(feature = "plot")]
-pub mod plot;

pitch-detector/src/pitch/hanned_fft.rs

@@ -120,10 +120,7 @@ impl PitchDetector for HannedFftDetector {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{
-        core::test_utils::{test_fundamental_freq, test_signal, test_sine_wave},
-        pitch::PitchDetector,
-    };
+    use crate::core::test_utils::{test_fundamental_freq, test_sine_wave};
 
     #[test]
     fn test_from_sample_files() -> anyhow::Result<()> {
@@ -139,17 +136,6 @@ mod tests {
         Ok(())
     }
 
-    // #[test]
-    fn test_noise() -> anyhow::Result<()> {
-        pub const TEST_SAMPLE_RATE: f64 = 44000.0;
-        let signal = test_signal("noise.json")?;
-
-        let mut detector = HannedFftDetector::default();
-        assert!(detector.detect_pitch(&signal, TEST_SAMPLE_RATE).is_err());
-
-        Ok(())
-    }
-
     #[test]
     fn test_from_sine_wave() -> anyhow::Result<()> {
         let mut detector = HannedFftDetector::default();

spectrum-plot/Cargo.toml

@@ -5,6 +5,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.89"
+plotters = {version = "0.3.1"}
 # TODO: why do we need to depend on a test feature?
-pitch-detector = { path = "../pitch-detector", features = ["test_utils", "plot"]}
+pitch-detector = { path = "../pitch-detector", features = ["test_utils"]}
 

spectrum-plot/src/main.rs

@@ -1,10 +1,12 @@
+mod plot;
+
+use crate::plot::plot_spectrum;
 use pitch_detector::{
     core::{
         into_frequency_domain::IntoFrequencyDomain, test_utils::test_signal,
         utils::mixed_wave_signal,
     },
     pitch::{HannedFftDetector, PitchDetector, PowerCepstrum},
-    plot::plot_spectrum,
 };
 
 const TEST_FILE_SAMPLE_RATE: f64 = 44000.;

pitch-detector/src/plot.rs spectrum-plot/src/plot.rspitch-detector/src/plot.rs renamed to spectrum-plot/src/plot.rs

@@ -5,7 +5,7 @@ use plotters::{
     style::{IntoFont, RED, WHITE},
 };
 
-use crate::{core::into_frequency_domain::IntoFrequencyDomain, pitch::PitchDetector};
+use pitch_detector::{core::into_frequency_domain::IntoFrequencyDomain, pitch::PitchDetector};
 
 pub fn plot_spectrum<D>(
     detector: &mut D,

tuner/src/main.rs

@@ -6,7 +6,7 @@ use dasp_sample::ToSample;
 use note_renderers::cmd_line::CmdLineNoteRenderer;
 use note_renderers::NoteRenderer;
 use pitch_detector::note::detect_note_in_range;
-use pitch_detector::pitch::{Cepstrum2, PowerCepstrum};
+use pitch_detector::pitch::Cepstrum2;
 use tokio::select;
 use tokio_util::sync::CancellationToken;