diff --git a/Cargo.toml b/Cargo.toml index 9017ae1..60b8d9c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ readme = "README.md" exclude = ["index.node"] [lib] -crate-type = ["cdylib"] +crate-type = ["rlib", "cdylib"] [package.metadata.docs.rs] features = ["bliss-audio-aubio-rs/rustdoc", "library"] diff --git a/examples/analyze.rs b/examples/analyze.rs index 2ffab60..49384f1 100644 --- a/examples/analyze.rs +++ b/examples/analyze.rs @@ -1,4 +1,4 @@ -use bliss_audio::Song; +use bliss_rs::bliss_lib::Song; use std::env; /** diff --git a/examples/distance.rs b/examples/distance.rs index 0fa2ac8..80cd483 100644 --- a/examples/distance.rs +++ b/examples/distance.rs @@ -1,4 +1,4 @@ -use bliss_audio::Song; +use bliss_rs::bliss_lib::Song; use std::env; /** diff --git a/src/chroma.rs b/src/chroma.rs index c35c4f9..5a22d3c 100644 --- a/src/chroma.rs +++ b/src/chroma.rs @@ -365,7 +365,7 @@ fn chroma_stft( mod test { use super::*; use crate::utils::stft; - use crate::{Song, SAMPLE_RATE}; + use crate::bliss_lib::{Song, SAMPLE_RATE}; use ndarray::{arr1, arr2, Array2}; use ndarray_npy::ReadNpyExt; use std::fs::File; diff --git a/src/lib.rs b/src/lib.rs index 5d50588..be7742c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -mod bliss_lib; +pub mod bliss_lib; mod chroma; pub mod cue; #[cfg(feature = "library")] diff --git a/src/misc.rs b/src/misc.rs index 1693590..ce032bd 100644 --- a/src/misc.rs +++ b/src/misc.rs @@ -63,7 +63,7 @@ impl Normalize for LoudnessDesc { #[cfg(test)] mod tests { use super::*; - use crate::Song; + use crate::bliss_lib::Song; use std::path::Path; #[test] diff --git a/src/playlist.rs b/src/playlist.rs index 0f9d943..5dc15ce 100644 --- a/src/playlist.rs +++ b/src/playlist.rs @@ -432,7 +432,7 @@ where #[cfg(test)] mod test { use super::*; - use crate::Analysis; + use crate::bliss_lib::Analysis; use ndarray::arr1; use std::path::Path; diff --git a/src/temporal.rs b/src/temporal.rs index 63bff02..a48cc86 100644 --- a/src/temporal.rs +++ b/src/temporal.rs @@ -94,7 +94,7 @@ impl Normalize for BPMDesc { #[cfg(test)] mod tests { use super::*; - use crate::{Song, SAMPLE_RATE}; + use crate::bliss_lib::{Song, SAMPLE_RATE}; use std::path::Path; #[test] diff --git a/src/timbral.rs b/src/timbral.rs index 8a00371..9fa6107 100644 --- a/src/timbral.rs +++ b/src/timbral.rs @@ -258,7 +258,7 @@ impl Normalize for ZeroCrossingRateDesc { #[cfg(test)] mod tests { use super::*; - use crate::Song; + use crate::bliss_lib::Song; use std::path::Path; #[test] diff --git a/src/utils.rs b/src/utils.rs index 609e607..9e9cead 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -165,7 +165,7 @@ pub(crate) fn convolve(input: &Array1, kernel: &Array1) -> Array1 #[cfg(test)] mod tests { use super::*; - use crate::Song; + use crate::bliss_lib::Song; use ndarray::Array2; use ndarray::{arr1, Array}; use ndarray_npy::ReadNpyExt;