From c50eee67e64d540b6ec01a3784f2fa99198158e9 Mon Sep 17 00:00:00 2001
From: Polochon-street <polochonstreet@gmx.fr>
Date: Sun, 16 May 2021 14:47:42 +0200
Subject: [PATCH] Vendor aubio-rs pt.2

---
 .gitmodules     |  3 ---
 Cargo.lock      | 34 +++++++++++++++++++---------------
 Cargo.toml      |  5 +++--
 aubio-rs        |  1 -
 src/misc.rs     |  2 +-
 src/temporal.rs |  2 +-
 src/timbral.rs  |  4 ++--
 7 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 160000 aubio-rs

diff --git a/.gitmodules b/.gitmodules
index a077bb1..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "aubio-rs"]
-	path = aubio-rs
-	url = https://github.com/Polochon-street/aubio-rs
diff --git a/Cargo.lock b/Cargo.lock
index 1092550..2262dc1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -52,20 +52,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "aubio-rs"
-version = "0.2.0"
-dependencies = [
- "aubio-sys",
-]
-
-[[package]]
-name = "aubio-sys"
-version = "0.2.0"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.0.1"
@@ -98,12 +84,30 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
+[[package]]
+name = "bliss-audio-aubio-rs"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe01698d293ee91e334339d6436f17eac30d94bebaa668c5799c8206384dfeb1"
+dependencies = [
+ "bliss-audio-aubio-sys",
+]
+
+[[package]]
+name = "bliss-audio-aubio-sys"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ef9fab7b922bdd057bb06fa2a2fa79d2a93bec3dd576320511cb3dfe21e78a9"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "bliss-rs"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "aubio-rs",
+ "bliss-audio-aubio-rs",
  "clap",
  "crossbeam",
  "dirs",
diff --git a/Cargo.toml b/Cargo.toml
index d398c61..30cc030 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 # Building ffmpeg until either
 # https://github.com/zmwangx/rust-ffmpeg/pull/60
 # or https://github.com/zmwangx/rust-ffmpeg/pull/62 is in
-default = ["aubio-rs/static", "build-ffmpeg"]
+default = ["bliss-audio-aubio-rs/static", "build-ffmpeg"]
 build-ffmpeg = ["ffmpeg-next/build"]
 bench = []
 
@@ -33,7 +33,8 @@ log = "0.4.14"
 env_logger = "0.8.3"
 thiserror = "1.0.24"
 # Until https://github.com/aubio/aubio/issues/336 is somehow solved
-aubio-rs = {path = "./aubio-rs/aubio-rs"}
+# Hopefully we'll be able to use the official aubio-rs at some point.
+bliss-audio-aubio-rs = "0.2.0"
 
 [dev-dependencies]
 mpd = "0.0.12"
diff --git a/aubio-rs b/aubio-rs
deleted file mode 160000
index 658ee68..0000000
--- a/aubio-rs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 658ee6878737edd1a58ca6164a95bb4a068af2ab
diff --git a/src/misc.rs b/src/misc.rs
index 0110225..63dc2d1 100644
--- a/src/misc.rs
+++ b/src/misc.rs
@@ -3,7 +3,7 @@
 //! Contains various descriptors that don't fit in one of the
 //! existing categories.
 
-use aubio_rs::level_lin;
+use bliss_audio_aubio_rs::level_lin;
 use ndarray::{arr1, Axis};
 
 use super::utils::{mean, Normalize};
diff --git a/src/temporal.rs b/src/temporal.rs
index 7e895e1..8aa41d7 100644
--- a/src/temporal.rs
+++ b/src/temporal.rs
@@ -5,7 +5,7 @@
 
 use crate::utils::Normalize;
 use crate::BlissError;
-use aubio_rs::{OnsetMode, Tempo};
+use bliss_audio_aubio_rs::{OnsetMode, Tempo};
 use log::warn;
 use ndarray::arr1;
 use ndarray_stats::interpolate::Midpoint;
diff --git a/src/timbral.rs b/src/timbral.rs
index d9a9fc8..552184d 100644
--- a/src/timbral.rs
+++ b/src/timbral.rs
@@ -4,8 +4,8 @@
 //! spectral centroid, spectral flatness and spectral roll-off of
 //! a given Song.
 
-use aubio_rs::vec::CVec;
-use aubio_rs::{bin_to_freq, PVoc, SpecDesc, SpecShape};
+use bliss_audio_aubio_rs::vec::CVec;
+use bliss_audio_aubio_rs::{bin_to_freq, PVoc, SpecDesc, SpecShape};
 use ndarray::{arr1, Axis};
 
 use super::utils::{geometric_mean, mean, number_crossings, Normalize};