From 4db79db51f6b931066b0185180d5884f6cdfe935 Mon Sep 17 00:00:00 2001 From: "NGnius (Graham)" Date: Sun, 27 Mar 2022 12:04:28 -0400 Subject: [PATCH] Update fork information --- Cargo.toml | 4 ++-- README.md | 15 +++++---------- src/song.rs | 1 - 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0d6e951..6b03d04 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "bliss-audio-symphonia" version = "0.6.5" -authors = ["Polochon-street "] +authors = ["Polochon-street ", "NGnius (Graham) "] edition = "2018" license = "GPL-3.0-only" description = "A song analysis library for making playlists" homepage = "https://lelele.io/bliss.html" -repository = "https://github.com/Polochon-street/bliss-rs" +repository = "https://github.com/NGnius/bliss-rs" keywords = ["audio", "analysis", "MIR", "playlist", "similarity"] readme = "README.md" diff --git a/README.md b/README.md index ce4f16a..fd85847 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +A modified version of the bliss-audio to remove ffmpeg and replace it with Rust's symphonia library. + [![crate](https://img.shields.io/crates/v/bliss-audio.svg)](https://crates.io/crates/bliss-audio) [![build](https://github.com/Polochon-street/bliss-rs/workflows/Rust/badge.svg)](https://github.com/Polochon-street/bliss-rs/actions) [![doc](https://docs.rs/bliss-audio/badge.svg)](https://docs.rs/bliss-audio/) @@ -103,10 +105,9 @@ To cross-compile bliss-rs from linux to x86_64 windows, install the Make sure you have `x86_64-w64-mingw32-gcc` installed on your computer. -Then after downloading and extracting [ffmpeg's prebuilt binaries](https://www.gyan.dev/ffmpeg/builds/), -running: +Then run: - FFMPEG_DIR=/path/to/prebuilt/ffmpeg cargo build --target x86_64-pc-windows-gnu --release + cargo build --target x86_64-pc-windows-gnu --release Will produce a `.rlib` library file. If you want to generate a shared `.dll` library, add: @@ -122,13 +123,7 @@ library, add: You can of course test the examples yourself by compiling them as .exe: - FFMPEG_DIR=/path/to/prebuilt/ffmpeg cargo build --target x86_64-pc-windows-gnu --release --examples - -WARNING: Doing all of the above and making it work on windows requires to have -ffmpeg's dll on your Windows `%PATH%` (`avcodec-59.dll`, etc). -Usually installing ffmpeg on the target windows is enough, but you can also just -extract them from `/path/to/prebuilt/ffmpeg/bin` and put them next to the thing -you generated from cargo (either bliss' dll or executable). + cargo build --target x86_64-pc-windows-gnu --release --examples ## Acknowledgements diff --git a/src/song.rs b/src/song.rs index c80e869..4211420 100644 --- a/src/song.rs +++ b/src/song.rs @@ -497,7 +497,6 @@ impl Song { song.read_tags(revision); } } - let (tx, rx) = mpsc::channel(); let child = std_thread::spawn(move || { resample_buffer(